From c9a2c9e7f01e85f9f889979bd22d21e0affb4b6c Mon Sep 17 00:00:00 2001 From: wumpz Date: Thu, 22 Nov 2018 21:50:54 +0100 Subject: [PATCH 001/266] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5a85f49f..200c4d14 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.github.java-diff-utils java-diff-utils jar - 4.0 + 4.1-SNAPSHOT java-diff-utils The DiffUtils library for computing diffs, applying patches, generationg side-by-side view in Java. https://github.com/java-diff-utils/java-diff-utils @@ -24,7 +24,7 @@ scm:git:https://github.com/java-diff-utils/java-diff-utils.git scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git https://github.com/java-diff-utils/java-diff-utils.git - java-diff-utils-4.0 + HEAD From 785c368f01264ed871578f9b5d7324be6ce4c089 Mon Sep 17 00:00:00 2001 From: Tobias Date: Fri, 23 Nov 2018 08:15:08 +0100 Subject: [PATCH 002/266] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e62f0e5c..e5c731ef 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## Status ## [![Build Status](https://travis-ci.org/wumpz/java-diff-utils.svg?branch=master)](https://travis-ci.org/java-diff-utils/java-diff-utils) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/7eba77f10bed4c2a8d08ac8dc8da4a86)](https://www.codacy.com/app/wumpz/java-diff-utils?utm_source=github.com&utm_medium=referral&utm_content=java-diff-utils/java-diff-utils&utm_campaign=Badge_Grade) -[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.wumpz/diffutils/badge.svg)](http://maven-badges.herokuapp.com/maven-central/com.github.wumpz/diffutils) +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.java-diff-utils/java-diff-utils/badge.svg)](http://maven-badges.herokuapp.com/maven-central/io.github.java-diff-utils/java-diff-utils) ## Intro ## From 5fe7e58f7640cc85c0c9528f4863f75706d4e48d Mon Sep 17 00:00:00 2001 From: Tobias Date: Fri, 23 Nov 2018 08:16:05 +0100 Subject: [PATCH 003/266] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e5c731ef..7cd6ee1b 100644 --- a/README.md +++ b/README.md @@ -109,9 +109,9 @@ This is a valid piece of source code: Just add the code below to your maven dependencies: ``` - com.github.wumpz - diffutils -    3.0 + io.github.java-diff-utils + java-diff-utils +    4.0 ``` From ab05a8bdb4dcdd899d9d7aef3e2e7302476bfbcb Mon Sep 17 00:00:00 2001 From: Tobias Date: Fri, 23 Nov 2018 08:19:56 +0100 Subject: [PATCH 004/266] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7cd6ee1b..c3c335ac 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ # java-diff-utils ## Status ## -[![Build Status](https://travis-ci.org/wumpz/java-diff-utils.svg?branch=master)](https://travis-ci.org/java-diff-utils/java-diff-utils) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/7eba77f10bed4c2a8d08ac8dc8da4a86)](https://www.codacy.com/app/wumpz/java-diff-utils?utm_source=github.com&utm_medium=referral&utm_content=java-diff-utils/java-diff-utils&utm_campaign=Badge_Grade) +[![Build Status](https://travis-ci.org/java-diff-utils/java-diff-utils.svg?branch=master)](https://travis-ci.org/java-diff-utils/java-diff-utils) +[![Codacy Badge](https://api.codacy.com/project/badge/Grade/7eba77f10bed4c2a8d08ac8dc8da4a86)](https://www.codacy.com/app/wumpz/java-diff-utils?utm_source=github.com&utm_medium=referral&utm_content=java-diff-utils/java-diff-utils&utm_campaign=Badge_Grade) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.java-diff-utils/java-diff-utils/badge.svg)](http://maven-badges.herokuapp.com/maven-central/io.github.java-diff-utils/java-diff-utils) From fc1e247de206bf8a6f0b8b05d59d103b2b1e5592 Mon Sep 17 00:00:00 2001 From: heisluft Date: Sat, 8 Dec 2018 14:56:40 +0100 Subject: [PATCH 005/266] Exchange "0 += 1" for "0 = 1" --- src/main/java/com/github/difflib/UnifiedDiffUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/github/difflib/UnifiedDiffUtils.java b/src/main/java/com/github/difflib/UnifiedDiffUtils.java index fe5b6f69..d5812c31 100644 --- a/src/main/java/com/github/difflib/UnifiedDiffUtils.java +++ b/src/main/java/com/github/difflib/UnifiedDiffUtils.java @@ -83,10 +83,10 @@ public static Patch parseUnifiedDiff(List diff) { new_ln = m.group(3) == null ? 1 : Integer.parseInt(m.group(3)); if (old_ln == 0) { - old_ln += 1; + old_ln = 1; } if (new_ln == 0) { - new_ln += 1; + new_ln = 1; } } else { if (line.length() > 0) { From de2f19497a86f1be638890cc443053095a83db52 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 7 Feb 2019 18:51:58 +0100 Subject: [PATCH 006/266] Remove unused DiffException declarations Signed-off-by: Stephen Kitt --- .../com/github/difflib/algorithm/jgit/HistogramDiff.java | 3 +-- .../com/github/difflib/algorithm/jgit/HistogramDiffTest.java | 5 ++--- .../github/difflib/algorithm/jgit/LRHistogramDiffTest.java | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java b/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java index c2e941f2..e3f6cd5b 100644 --- a/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java +++ b/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java @@ -18,7 +18,6 @@ import com.github.difflib.algorithm.Change; import com.github.difflib.algorithm.DiffAlgorithmI; import com.github.difflib.algorithm.DiffAlgorithmListener; -import com.github.difflib.algorithm.DiffException; import com.github.difflib.patch.DeltaType; import java.util.ArrayList; import java.util.List; @@ -37,7 +36,7 @@ public class HistogramDiff implements DiffAlgorithmI { @Override - public List computeDiff(List source, List target, DiffAlgorithmListener progress) throws DiffException { + public List computeDiff(List source, List target, DiffAlgorithmListener progress) { Objects.requireNonNull(source, "source list must not be null"); Objects.requireNonNull(target, "target list must not be null"); if (progress != null) { diff --git a/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java b/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java index 0009f18b..e1030242 100644 --- a/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java +++ b/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java @@ -16,7 +16,6 @@ package com.github.difflib.algorithm.jgit; import com.github.difflib.algorithm.DiffAlgorithmListener; -import com.github.difflib.algorithm.DiffException; import com.github.difflib.patch.Patch; import com.github.difflib.patch.PatchFailedException; import java.util.ArrayList; @@ -58,7 +57,7 @@ public void tearDown() { * Test of diff method, of class HistogramDiff. */ @Test - public void testDiff() throws DiffException, PatchFailedException { + public void testDiff() throws PatchFailedException { List orgList = Arrays.asList("A", "B", "C", "A", "B", "B", "A"); List revList = Arrays.asList("C", "B", "A", "B", "A", "C"); final Patch patch = Patch.generate(orgList, revList, new HistogramDiff().computeDiff(orgList, revList, null)); @@ -72,7 +71,7 @@ public void testDiff() throws DiffException, PatchFailedException { } @Test - public void testDiffWithListener() throws DiffException, PatchFailedException { + public void testDiffWithListener() throws PatchFailedException { List orgList = Arrays.asList("A", "B", "C", "A", "B", "B", "A"); List revList = Arrays.asList("C", "B", "A", "B", "A", "C"); diff --git a/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java b/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java index 5f93570d..9aee685a 100644 --- a/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java +++ b/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java @@ -18,7 +18,6 @@ import static com.github.difflib.DiffUtilsTest.readStringListFromInputStream; import com.github.difflib.TestConstants; import com.github.difflib.algorithm.DiffAlgorithmListener; -import com.github.difflib.algorithm.DiffException; import com.github.difflib.patch.Patch; import com.github.difflib.patch.PatchFailedException; import java.io.IOException; @@ -58,7 +57,7 @@ public void tearDown() { } @Test - public void testPossibleDiffHangOnLargeDatasetDnaumenkoIssue26() throws IOException, DiffException, PatchFailedException { + public void testPossibleDiffHangOnLargeDatasetDnaumenkoIssue26() throws IOException, PatchFailedException { ZipFile zip = new ZipFile(TestConstants.MOCK_FOLDER + "/large_dataset1.zip"); List original = readStringListFromInputStream(zip.getInputStream(zip.getEntry("ta"))); List revised = readStringListFromInputStream(zip.getInputStream(zip.getEntry("tb"))); From 2d116d8c540c472205e5d1fa552f86835fce7920 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 7 Feb 2019 18:55:41 +0100 Subject: [PATCH 007/266] Use String.join instead of streaming/collecting Signed-off-by: Stephen Kitt --- src/main/java/com/github/difflib/DiffUtils.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/github/difflib/DiffUtils.java b/src/main/java/com/github/difflib/DiffUtils.java index 8b144642..b57a0d2f 100644 --- a/src/main/java/com/github/difflib/DiffUtils.java +++ b/src/main/java/com/github/difflib/DiffUtils.java @@ -28,7 +28,6 @@ import java.util.List; import java.util.Objects; import java.util.function.BiPredicate; -import static java.util.stream.Collectors.joining; /** * Implements the difference and patching engine @@ -143,7 +142,7 @@ private static List compressLines(List lines, String delimiter) if (lines.isEmpty()) { return Collections.emptyList(); } - return Collections.singletonList(lines.stream().collect(joining(delimiter))); + return Collections.singletonList(String.join(delimiter, lines)); } /** From 47c6e9b417af69153a64ea27f04de82707fe7ee8 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 7 Feb 2019 18:56:44 +0100 Subject: [PATCH 008/266] Drop unnecessary Integer.toString Signed-off-by: Stephen Kitt --- .../java/com/github/difflib/algorithm/myers/PathNode.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/github/difflib/algorithm/myers/PathNode.java b/src/main/java/com/github/difflib/algorithm/myers/PathNode.java index a3f2070c..f3c153f8 100644 --- a/src/main/java/com/github/difflib/algorithm/myers/PathNode.java +++ b/src/main/java/com/github/difflib/algorithm/myers/PathNode.java @@ -102,9 +102,9 @@ public String toString() { PathNode node = this; while (node != null) { buf.append("("); - buf.append(Integer.toString(node.i)); + buf.append(node.i); buf.append(","); - buf.append(Integer.toString(node.j)); + buf.append(node.j); buf.append(")"); node = node.prev; } From b41e2d5b5a6efbd8deb6a56bfa6e3a478f74faec Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 7 Feb 2019 18:57:00 +0100 Subject: [PATCH 009/266] Use assertEquals for comparison ... instead of assertTrue(a == b) Signed-off-by: Stephen Kitt --- src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java b/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java index 89ab32f6..53aade3e 100644 --- a/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java +++ b/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import org.junit.Test; @@ -114,7 +114,7 @@ private void verify(List origLines, List revLines, List patchedLines; try { patchedLines = (List) fromUnifiedPatch.applyTo(origLines); - assertTrue(revLines.size() == patchedLines.size()); + assertEquals(revLines.size(), patchedLines.size()); for (int i = 0; i < revLines.size(); i++) { String l1 = revLines.get(i); String l2 = patchedLines.get(i); From 3443d55a19ecb2ece0f4fac31bd3273a158e3efe Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 7 Feb 2019 18:59:01 +0100 Subject: [PATCH 010/266] Drop redundant casts Signed-off-by: Stephen Kitt --- src/main/java/com/github/difflib/text/DiffRowGenerator.java | 4 ++-- src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/src/main/java/com/github/difflib/text/DiffRowGenerator.java index 2ed2662e..e7246a4e 100644 --- a/src/main/java/com/github/difflib/text/DiffRowGenerator.java +++ b/src/main/java/com/github/difflib/text/DiffRowGenerator.java @@ -199,7 +199,7 @@ public List generateDiffRows(final List original, Patch // Inserted DiffRow if (delta instanceof InsertDelta) { endPos = orig.last() + 1; - for (String line : (List) rev.getLines()) { + for (String line : rev.getLines()) { diffRows.add(buildDiffRow(Tag.INSERT, "", line)); } continue; @@ -208,7 +208,7 @@ public List generateDiffRows(final List original, Patch // Deleted DiffRow if (delta instanceof DeleteDelta) { endPos = orig.last() + 1; - for (String line : (List) orig.getLines()) { + for (String line : orig.getLines()) { diffRows.add(buildDiffRow(Tag.DELETE, line, "")); } continue; diff --git a/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java b/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java index 53aade3e..49497e33 100644 --- a/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java +++ b/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java @@ -113,7 +113,7 @@ private void verify(List origLines, List revLines, Patch fromUnifiedPatch = UnifiedDiffUtils.parseUnifiedDiff(unifiedDiff); List patchedLines; try { - patchedLines = (List) fromUnifiedPatch.applyTo(origLines); + patchedLines = fromUnifiedPatch.applyTo(origLines); assertEquals(revLines.size(), patchedLines.size()); for (int i = 0; i < revLines.size(); i++) { String l1 = revLines.get(i); From a312ec14ea5d41cf2d249b71afec125f077959fd Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 7 Feb 2019 19:00:02 +0100 Subject: [PATCH 011/266] Use foreach loop Signed-off-by: Stephen Kitt --- src/main/java/com/github/difflib/text/DiffRowGenerator.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/src/main/java/com/github/difflib/text/DiffRowGenerator.java index e7246a4e..1f2d8e02 100644 --- a/src/main/java/com/github/difflib/text/DiffRowGenerator.java +++ b/src/main/java/com/github/difflib/text/DiffRowGenerator.java @@ -187,8 +187,7 @@ public List generateDiffRows(final List original, Patch List diffRows = new ArrayList<>(); int endPos = 0; final List> deltaList = patch.getDeltas(); - for (int i = 0; i < deltaList.size(); i++) { - AbstractDelta delta = deltaList.get(i); + for (AbstractDelta delta : deltaList) { Chunk orig = delta.getSource(); Chunk rev = delta.getTarget(); From 765dc29386a2e0e3cf00cda0cf4c4560d7a8260a Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 7 Feb 2019 19:00:44 +0100 Subject: [PATCH 012/266] Use List.sort instead of Collections.sort Signed-off-by: Stephen Kitt --- src/main/java/com/github/difflib/patch/Patch.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/github/difflib/patch/Patch.java b/src/main/java/com/github/difflib/patch/Patch.java index 9bbb30dc..74e99f81 100644 --- a/src/main/java/com/github/difflib/patch/Patch.java +++ b/src/main/java/com/github/difflib/patch/Patch.java @@ -19,12 +19,9 @@ */ package com.github.difflib.patch; +import static java.util.Comparator.comparing; import com.github.difflib.algorithm.Change; -import static com.github.difflib.patch.DeltaType.DELETE; -import static com.github.difflib.patch.DeltaType.INSERT; import java.util.ArrayList; -import java.util.Collections; -import static java.util.Comparator.comparing; import java.util.List; import java.util.ListIterator; @@ -93,7 +90,7 @@ public void addDelta(AbstractDelta delta) { * @return the deltas */ public List> getDeltas() { - Collections.sort(deltas, comparing(d -> d.getSource().getPosition())); + deltas.sort(comparing(d -> d.getSource().getPosition())); return deltas; } From e8c015a2ec6ec724c417e1125b85b162473a8c7e Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Fri, 8 Feb 2019 09:17:43 +0100 Subject: [PATCH 013/266] Fix Javadoc errors Signed-off-by: Stephen Kitt --- .../difflib/algorithm/DifferentiationFailedException.java | 4 ++-- .../com/github/difflib/algorithm/myers/MyersDiff.java | 2 +- .../java/com/github/difflib/algorithm/myers/PathNode.java | 8 ++------ src/main/java/com/github/difflib/patch/ChangeDelta.java | 2 +- src/main/java/com/github/difflib/patch/Chunk.java | 2 +- src/main/java/com/github/difflib/patch/DeleteDelta.java | 2 +- src/main/java/com/github/difflib/patch/InsertDelta.java | 2 +- src/main/java/com/github/difflib/patch/Patch.java | 2 +- .../java/com/github/difflib/text/DiffRowGenerator.java | 6 ++---- src/test/java/com/github/difflib/TestConstants.java | 2 +- 10 files changed, 13 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/github/difflib/algorithm/DifferentiationFailedException.java b/src/main/java/com/github/difflib/algorithm/DifferentiationFailedException.java index 682a9b48..e201e440 100644 --- a/src/main/java/com/github/difflib/algorithm/DifferentiationFailedException.java +++ b/src/main/java/com/github/difflib/algorithm/DifferentiationFailedException.java @@ -18,8 +18,8 @@ /** * Thrown whenever the differencing engine cannot produce the differences between two revisions of ta text. * - * @see MyersDiff - * @see difflib.DiffAlgorithm + * @see com.github.difflib.algorithm.myers.MyersDiff + * @see DiffAlgorithmI */ public class DifferentiationFailedException extends DiffException { diff --git a/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java b/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java index 8c183411..abcf31e2 100644 --- a/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java +++ b/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java @@ -138,7 +138,7 @@ private PathNode buildPath(final List orig, final List rev, DiffAlgorithmL /** * Constructs a {@link Patch} from a difference path. * - * @param path The path. + * @param actualPath The path. * @param orig The original sequence. * @param rev The revised sequence. * @return A {@link Patch} script corresponding to the path. diff --git a/src/main/java/com/github/difflib/algorithm/myers/PathNode.java b/src/main/java/com/github/difflib/algorithm/myers/PathNode.java index f3c153f8..fe8fd03a 100644 --- a/src/main/java/com/github/difflib/algorithm/myers/PathNode.java +++ b/src/main/java/com/github/difflib/algorithm/myers/PathNode.java @@ -19,10 +19,6 @@ * A node in a diffpath. * * @author Juanco Anez - * - * @see DiffNode - * @see Snake - * */ public final class PathNode { @@ -78,10 +74,10 @@ public boolean isBootstrap() { } /** - * Skips sequences of {@link DiffNode DiffNodes} until a {@link Snake} or bootstrap node is found, or the end of the + * Skips sequences of {@link PathNode PathNodes} until a snake or bootstrap node is found, or the end of the * path is reached. * - * @return The next first {@link Snake} or bootstrap node in the path, or null if none found. + * @return The next first {@link PathNode} or bootstrap node in the path, or null if none found. */ public final PathNode previousSnake() { if (isBootstrap()) { diff --git a/src/main/java/com/github/difflib/patch/ChangeDelta.java b/src/main/java/com/github/difflib/patch/ChangeDelta.java index 43f68b35..7c1cd98b 100644 --- a/src/main/java/com/github/difflib/patch/ChangeDelta.java +++ b/src/main/java/com/github/difflib/patch/ChangeDelta.java @@ -22,7 +22,7 @@ * Describes the change-delta between original and revised texts. * * @author Dmitry Naumenko - * @param T The type of the compared elements in the data 'lines'. + * @param The type of the compared elements in the data 'lines'. */ public final class ChangeDelta extends AbstractDelta { diff --git a/src/main/java/com/github/difflib/patch/Chunk.java b/src/main/java/com/github/difflib/patch/Chunk.java index ed70e20d..6c1a9918 100644 --- a/src/main/java/com/github/difflib/patch/Chunk.java +++ b/src/main/java/com/github/difflib/patch/Chunk.java @@ -29,7 +29,7 @@ *

* * @author Dmitry Naumenko - * @param T The type of the compared elements in the 'lines'. + * @param The type of the compared elements in the 'lines'. */ public final class DeleteDelta extends AbstractDelta { diff --git a/src/main/java/com/github/difflib/patch/InsertDelta.java b/src/main/java/com/github/difflib/patch/InsertDelta.java index 08de5f1f..12164fa4 100644 --- a/src/main/java/com/github/difflib/patch/InsertDelta.java +++ b/src/main/java/com/github/difflib/patch/InsertDelta.java @@ -21,7 +21,7 @@ * Describes the add-delta between original and revised texts. * * @author Dmitry Naumenko - * @param T The type of the compared elements in the 'lines'. + * @param The type of the compared elements in the 'lines'. */ public final class InsertDelta extends AbstractDelta { diff --git a/src/main/java/com/github/difflib/patch/Patch.java b/src/main/java/com/github/difflib/patch/Patch.java index 74e99f81..688e9f16 100644 --- a/src/main/java/com/github/difflib/patch/Patch.java +++ b/src/main/java/com/github/difflib/patch/Patch.java @@ -29,7 +29,7 @@ * Describes the patch holding all deltas between the original and revised texts. * * @author Dmitry Naumenko - * @param T The type of the compared elements in the 'lines'. + * @param The type of the compared elements in the 'lines'. */ public final class Patch { diff --git a/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/src/main/java/com/github/difflib/text/DiffRowGenerator.java index 1f2d8e02..c0267345 100644 --- a/src/main/java/com/github/difflib/text/DiffRowGenerator.java +++ b/src/main/java/com/github/difflib/text/DiffRowGenerator.java @@ -98,8 +98,7 @@ protected final static List splitStringPreserveDelimiter(String str, Pat * * @param startPosition the position from which tag should start. The counting start from a zero. * @param endPosition the position before which tag should should be closed. - * @param tag the tag name without angle brackets, just a word - * @param cssClass the optional css class + * @param tagGenerator the tag generator */ static void wrapInTag(List sequence, int startPosition, int endPosition, Function tagGenerator) { @@ -179,7 +178,6 @@ public List generateDiffRows(List original, List revise * for displaying side-by-side diff. * * @param original the original text - * @param revised the revised text * @param patch the given patch * @return the DiffRows between original and revised texts */ @@ -400,7 +398,7 @@ public Builder reportLinesUnchanged(final boolean val) { /** * Generator for Old-Text-Tags. * - * @param tag the tag to set. Without angle brackets. Default: span. + * @param generator the tag generator * @return builder with configured ignoreBlankLines parameter */ public Builder oldTag(Function generator) { diff --git a/src/test/java/com/github/difflib/TestConstants.java b/src/test/java/com/github/difflib/TestConstants.java index 56f5bf66..ba6d754e 100644 --- a/src/test/java/com/github/difflib/TestConstants.java +++ b/src/test/java/com/github/difflib/TestConstants.java @@ -10,7 +10,7 @@ public final class TestConstants { public static final String BASE_FOLDER_RESOURCES = "target/test-classes/"; /** - * The base folder containing the test files. Ends with {@link #FS}. + * The base folder containing the test files. */ public static final String MOCK_FOLDER = BASE_FOLDER_RESOURCES + "/mocks/"; From c0a1a3777c5fc084e73f8bbc1d2470efc87f1d66 Mon Sep 17 00:00:00 2001 From: wumpz Date: Thu, 28 Feb 2019 23:59:26 +0100 Subject: [PATCH 014/266] first start unified diff --- .../difflib/unifieddiff/UnifiedDiff.java | 44 +++++++++++++ .../difflib/unifieddiff/UnifiedDiffTest.java | 57 +++++++++++++++++ .../unifieddiff/jsqlparser_patch_1.diff | 61 +++++++++++++++++++ 3 files changed, 162 insertions(+) create mode 100644 src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java create mode 100644 src/test/java/com/github/difflib/unifieddiff/UnifiedDiffTest.java create mode 100644 src/test/resources/com/github/difflib/unifieddiff/jsqlparser_patch_1.diff diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java new file mode 100644 index 00000000..9fb51846 --- /dev/null +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java @@ -0,0 +1,44 @@ +/* + * Copyright 2019 java-diff-utils. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.github.difflib.unifieddiff; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.logging.Logger; + +/** + * + * @author Tobias Warneke (t.warneke@gmx.net) + */ +public final class UnifiedDiff { + + private UnifiedDiff(InputStream stream) throws IOException { + try (BufferedReader reader = new BufferedReader(new InputStreamReader(stream));) { + while (reader.ready()) { + String line = reader.readLine(); + LOG.info(line); + } + } + + } + private static final Logger LOG = Logger.getLogger(UnifiedDiff.class.getName()); + + public static UnifiedDiff parse(InputStream stream) throws IOException { + return new UnifiedDiff(stream); + } +} diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffTest.java b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffTest.java new file mode 100644 index 00000000..380eb8e9 --- /dev/null +++ b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffTest.java @@ -0,0 +1,57 @@ +/* + * Copyright 2019 java-diff-utils. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.github.difflib.unifieddiff; + +import java.io.IOException; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * + * @author Tobias Warneke (t.warneke@gmx.net) + */ +public class UnifiedDiffTest { + + public UnifiedDiffTest() { + } + + @BeforeClass + public static void setUpClass() { + } + + @AfterClass + public static void tearDownClass() { + } + + @Before + public void setUp() { + } + + @After + public void tearDown() { + } + + @Test + public void testSimpleParse() throws IOException { + UnifiedDiff diff = UnifiedDiff.parse(UnifiedDiffTest.class.getResourceAsStream("jsqlparser_patch_1.diff")); + + System.out.println(diff); + } + +} diff --git a/src/test/resources/com/github/difflib/unifieddiff/jsqlparser_patch_1.diff b/src/test/resources/com/github/difflib/unifieddiff/jsqlparser_patch_1.diff new file mode 100644 index 00000000..c868759e --- /dev/null +++ b/src/test/resources/com/github/difflib/unifieddiff/jsqlparser_patch_1.diff @@ -0,0 +1,61 @@ +From 3209a16c55c1976d5b772c607fd4b9d5fb9f9483 Mon Sep 17 00:00:00 2001 +From: wumpz +Date: Tue, 19 Feb 2019 01:35:14 +0100 +Subject: [PATCH] fixes #753 + +--- + src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt | 5 +++-- + .../net/sf/jsqlparser/statement/select/SelectTest.java | 7 +++++++ + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt +index cd9bcd1..5f4b2b7 100644 +--- a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt ++++ b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt +@@ -189,6 +189,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */ + | + | + | ++| + | + | + | +@@ -1039,7 +1040,7 @@ String RelObjectNameWithoutValue() : + | tk= | tk= | tk= | tk= + | tk= + | tk= | tk= | tk= | tk= +- | tk= | tk= | tk= ++ | tk= | tk= | tk= | tk= + /* | tk= | tk= | tk= | tk= */ + ) + +@@ -3118,7 +3119,7 @@ Function Function() #Function: + Expression expr1 = null; + } + { +- ["{fn" { retval.setEscaped(true); } ] ++ ["{" { retval.setEscaped(true); } ] + + funcName=RelObjectNameExt() + +diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java +index 7ee9b38..d39bfd3 100644 +--- a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java ++++ b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java +@@ -1063,6 +1063,13 @@ public class SelectTest { + assertSqlCanBeParsedAndDeparsed("SELECT {fn concat(a, b)} AS COL"); + } + ++ @Test ++ public void testEscapedFunctionsIssue753() throws JSQLParserException { ++ Statement stmt = CCJSqlParserUtil.parse("SELECT { fn test(0)} AS COL"); ++ assertEquals("SELECT {fn test(0)} AS COL", stmt.toString()); ++ assertSqlCanBeParsedAndDeparsed("SELECT fn FROM fn"); ++ } ++ + @Test + public void testNamedParametersPR702() throws JSQLParserException { + assertSqlCanBeParsedAndDeparsed("SELECT substring(id, 2, 3), substring(id from 2 for 3), substring(id from 2), trim(BOTH ' ' from 'foo bar '), trim(LEADING ' ' from 'foo bar '), trim(TRAILING ' ' from 'foo bar '), trim(' ' from 'foo bar '), position('foo' in 'bar'), overlay('foo' placing 'bar' from 1), overlay('foo' placing 'bar' from 1 for 2) FROM my table"); +-- +2.17.1.windows.2 + From 4caf63c19370a0f35d3a42764e88aa7b44e50616 Mon Sep 17 00:00:00 2001 From: wumpz Date: Wed, 6 Mar 2019 01:34:39 +0100 Subject: [PATCH 015/266] --- pom.xml | 6 + .../difflib/unifieddiff/UnifiedDiff.java | 35 ++-- .../difflib/unifieddiff/UnifiedDiffFile.java | 60 +++++++ .../unifieddiff/UnifiedDiffParser.java | 167 ++++++++++++++++++ ...ffTest.java => UnifiedDiffParserTest.java} | 13 +- 5 files changed, 262 insertions(+), 19 deletions(-) create mode 100644 src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java create mode 100644 src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java rename src/test/java/com/github/difflib/unifieddiff/{UnifiedDiffTest.java => UnifiedDiffParserTest.java} (62%) diff --git a/pom.xml b/pom.xml index 200c4d14..82ccd481 100644 --- a/pom.xml +++ b/pom.xml @@ -105,6 +105,12 @@ + + org.assertj + assertj-core + 3.11.1 + test + diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java index 9fb51846..76bd2740 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java @@ -15,30 +15,33 @@ */ package com.github.difflib.unifieddiff; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.logging.Logger; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; /** * * @author Tobias Warneke (t.warneke@gmx.net) */ -public final class UnifiedDiff { +public class UnifiedDiff { - private UnifiedDiff(InputStream stream) throws IOException { - try (BufferedReader reader = new BufferedReader(new InputStreamReader(stream));) { - while (reader.ready()) { - String line = reader.readLine(); - LOG.info(line); - } - } + private String header; + private final List files = new ArrayList<>(); + public String getHeader() { + return header; } - private static final Logger LOG = Logger.getLogger(UnifiedDiff.class.getName()); - public static UnifiedDiff parse(InputStream stream) throws IOException { - return new UnifiedDiff(stream); + public void setHeader(String header) { + this.header = header; } + + void addFile(UnifiedDiffFile file) { + files.add(file); + } + + public List getFiles() { + return Collections.unmodifiableList(files); + } + } diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java new file mode 100644 index 00000000..c1faa5ab --- /dev/null +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java @@ -0,0 +1,60 @@ +/* + * Copyright 2019 java-diff-utils. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.github.difflib.unifieddiff; + +/** + * + * @author Tobias Warneke (t.warneke@gmx.net) + */ +public class UnifiedDiffFile { + + private String diffCommand; + private String fromFile; + private String toFile; + private String index; + + public String getDiffCommand() { + return diffCommand; + } + + public void setDiffCommand(String diffCommand) { + this.diffCommand = diffCommand; + } + + public String getFromFile() { + return fromFile; + } + + public void setFromFile(String fromFile) { + this.fromFile = fromFile; + } + + public String getToFile() { + return toFile; + } + + public void setToFile(String toFile) { + this.toFile = toFile; + } + + public void setIndex(String index) { + this.index = index; + } + + public String getIndex() { + return index; + } +} diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java new file mode 100644 index 00000000..26194f12 --- /dev/null +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java @@ -0,0 +1,167 @@ +/* + * Copyright 2019 java-diff-utils. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.github.difflib.unifieddiff; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.util.function.BiConsumer; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.regex.MatchResult; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * + * @author Tobias Warneke (t.warneke@gmx.net) + */ +public final class UnifiedDiffParser { + + private final UnifiedDiffReader READER; + private final UnifiedDiff data = new UnifiedDiff(); + private final UnifiedDiffLine[] PARSER_RULES = new UnifiedDiffLine[]{ + new UnifiedDiffLine("^\\s+", (m, l) -> LOG.info("normal " + l)), + new UnifiedDiffLine(true, "^diff\\s", UnifiedDiffParser::processDiff), + new UnifiedDiffLine(true, "^index\\s[\\da-zA-Z]+\\.\\.[\\da-zA-Z]+(\\s(\\d+))?$", UnifiedDiffParser::processIndex) + }; + private UnifiedDiffFile actualFile; + + UnifiedDiffParser(Reader reader) { + this.READER = new UnifiedDiffReader(reader); + } + + // schema = [[/^\s+/, normal], [/^diff\s/, start], [/^new file mode \d+$/, new_file], + // [/^deleted file mode \d+$/, deleted_file], [/^index\s[\da-zA-Z]+\.\.[\da-zA-Z]+(\s(\d+))?$/, index], + // [/^---\s/, from_file], [/^\+\+\+\s/, to_file], [/^@@\s+\-(\d+),?(\d+)?\s+\+(\d+),?(\d+)?\s@@/, chunk], + // [/^-/, del], [/^\+/, add], [/^\\ No newline at end of file$/, eof]]; + private UnifiedDiff parse() throws IOException { + boolean header = true; + String headerTxt = ""; + while (READER.ready()) { + String line = READER.readLine(); + if (processLine(header, line) == false) { + if (header) { + headerTxt += line + "\n"; + } else { + break; + } + } else { + header = false; + data.setHeader(headerTxt); + } + } + return data; + } + + static String[] parseFileNames(String line) { + String[] split = line.split(" "); + return new String[]{ + split[2].replaceAll("^a/", ""), + split[3].replaceAll("^b/", "") + }; + } + + private static final Logger LOG = Logger.getLogger(UnifiedDiffParser.class.getName()); + + public static UnifiedDiff parseUnifiedDiff(InputStream stream) throws IOException { + UnifiedDiffParser parser = new UnifiedDiffParser(new BufferedReader(new InputStreamReader(stream))); + return parser.parse(); + } + + private boolean processLine(boolean header, String line) { + for (UnifiedDiffLine rule : PARSER_RULES) { + if (header && rule.isStopsHeaderParsing() || !header) { + if (rule.processLine(line)) { + return true; + } + } + } + return false; + } + + private void initFileIfNecessary() { + if (actualFile == null) { + actualFile = new UnifiedDiffFile(); + } + } + + private void processDiff(MatchResult match, String line) { + initFileIfNecessary(); + LOG.log(Level.INFO, "start {0}", line); + String[] fromTo = parseFileNames(READER.lastLine()); + actualFile.setFromFile(fromTo[0]); + actualFile.setToFile(fromTo[1]); + } + + private void processIndex(MatchResult match, String line) { + initFileIfNecessary(); + LOG.log(Level.INFO, "index {0}", line); + actualFile.setIndex(line.substring(6)); + } + + class UnifiedDiffLine { + + private final Pattern pattern; + private final BiConsumer command; + private final boolean stopsHeaderParsing; + + public UnifiedDiffLine(String pattern, BiConsumer command) { + this(false, pattern, command); + } + + public UnifiedDiffLine(boolean stopsHeaderParsing, String pattern, BiConsumer command) { + this.pattern = Pattern.compile(pattern); + this.command = command; + this.stopsHeaderParsing = stopsHeaderParsing; + } + + public boolean processLine(String line) { + Matcher m = pattern.matcher(line); + if (m.find()) { + command.accept(m.toMatchResult(), line); + return true; + } else { + return false; + } + } + + public boolean isStopsHeaderParsing() { + return stopsHeaderParsing; + } + } +} + +class UnifiedDiffReader extends BufferedReader { + + private String lastLine; + + public UnifiedDiffReader(Reader reader) { + super(reader); + } + + @Override + public String readLine() throws IOException { + lastLine = super.readLine(); + return lastLine(); + } + + String lastLine() { + return lastLine; + } +} diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffTest.java b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffParserTest.java similarity index 62% rename from src/test/java/com/github/difflib/unifieddiff/UnifiedDiffTest.java rename to src/test/java/com/github/difflib/unifieddiff/UnifiedDiffParserTest.java index 380eb8e9..9eb6e052 100644 --- a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffTest.java +++ b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffParserTest.java @@ -16,6 +16,7 @@ package com.github.difflib.unifieddiff; import java.io.IOException; +import static org.assertj.core.api.Java6Assertions.assertThat; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -26,9 +27,9 @@ * * @author Tobias Warneke (t.warneke@gmx.net) */ -public class UnifiedDiffTest { +public class UnifiedDiffParserTest { - public UnifiedDiffTest() { + public UnifiedDiffParserTest() { } @BeforeClass @@ -49,9 +50,15 @@ public void tearDown() { @Test public void testSimpleParse() throws IOException { - UnifiedDiff diff = UnifiedDiff.parse(UnifiedDiffTest.class.getResourceAsStream("jsqlparser_patch_1.diff")); + UnifiedDiff diff = UnifiedDiffParser.parseUnifiedDiff(UnifiedDiffParserTest.class.getResourceAsStream("jsqlparser_patch_1.diff")); System.out.println(diff); } + @Test + public void testParseDiffBlock() { + String[] files = UnifiedDiffParser.parseFileNames("diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java"); + assertThat(files).containsExactly("src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java", "src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java"); + } + } From c917f77bbf754b23e454f0ee4c7492f9183ef940 Mon Sep 17 00:00:00 2001 From: wumpz Date: Wed, 6 Mar 2019 01:45:39 +0100 Subject: [PATCH 016/266] --- .../com/github/difflib/unifieddiff/UnifiedDiffParser.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java index 26194f12..77f218d3 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java @@ -37,8 +37,8 @@ public final class UnifiedDiffParser { private final UnifiedDiff data = new UnifiedDiff(); private final UnifiedDiffLine[] PARSER_RULES = new UnifiedDiffLine[]{ new UnifiedDiffLine("^\\s+", (m, l) -> LOG.info("normal " + l)), - new UnifiedDiffLine(true, "^diff\\s", UnifiedDiffParser::processDiff), - new UnifiedDiffLine(true, "^index\\s[\\da-zA-Z]+\\.\\.[\\da-zA-Z]+(\\s(\\d+))?$", UnifiedDiffParser::processIndex) + new UnifiedDiffLine(true, "^diff\\s", this::processDiff), + new UnifiedDiffLine(true, "^index\\s[\\da-zA-Z]+\\.\\.[\\da-zA-Z]+(\\s(\\d+))?$", this::processIndex) }; private UnifiedDiffFile actualFile; @@ -101,7 +101,7 @@ private void initFileIfNecessary() { } } - private void processDiff(MatchResult match, String line) { + public void processDiff(MatchResult match, String line) { initFileIfNecessary(); LOG.log(Level.INFO, "start {0}", line); String[] fromTo = parseFileNames(READER.lastLine()); @@ -109,7 +109,7 @@ private void processDiff(MatchResult match, String line) { actualFile.setToFile(fromTo[1]); } - private void processIndex(MatchResult match, String line) { + public void processIndex(MatchResult match, String line) { initFileIfNecessary(); LOG.log(Level.INFO, "index {0}", line); actualFile.setIndex(line.substring(6)); From 361c27d5e7e472df372894b29e3ebb96ae18b019 Mon Sep 17 00:00:00 2001 From: wumpz Date: Wed, 6 Mar 2019 01:54:39 +0100 Subject: [PATCH 017/266] --- .../java/com/github/difflib/unifieddiff/UnifiedDiffParser.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java index 77f218d3..84ddfc41 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java @@ -98,6 +98,7 @@ private boolean processLine(boolean header, String line) { private void initFileIfNecessary() { if (actualFile == null) { actualFile = new UnifiedDiffFile(); + data.addFile(actualFile); } } From a523ba3a14747c1ca0d6316215052698414d7463 Mon Sep 17 00:00:00 2001 From: wumpz Date: Sun, 10 Mar 2019 19:24:03 +0100 Subject: [PATCH 018/266] --- .../difflib/unifieddiff/UnifiedDiffFile.java | 7 ++ .../unifieddiff/UnifiedDiffParser.java | 66 ++++++++++++++++--- .../UnifiedDiffParserException.java | 43 ++++++++++++ 3 files changed, 108 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParserException.java diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java index c1faa5ab..cd49de57 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java @@ -15,6 +15,8 @@ */ package com.github.difflib.unifieddiff; +import com.github.difflib.patch.Patch; + /** * * @author Tobias Warneke (t.warneke@gmx.net) @@ -25,6 +27,7 @@ public class UnifiedDiffFile { private String fromFile; private String toFile; private String index; + private Patch patch = new Patch<>(); public String getDiffCommand() { return diffCommand; @@ -57,4 +60,8 @@ public void setIndex(String index) { public String getIndex() { return index; } + + public Patch getPatch() { + return patch; + } } diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java index 84ddfc41..7244169b 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java @@ -20,6 +20,8 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; +import java.util.ArrayList; +import java.util.List; import java.util.function.BiConsumer; import java.util.logging.Level; import java.util.logging.Logger; @@ -33,13 +35,18 @@ */ public final class UnifiedDiffParser { + private static final String UNIFIED_DIFF_CHUNK_REGEXP = "^@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@$"; + private final UnifiedDiffReader READER; private final UnifiedDiff data = new UnifiedDiff(); - private final UnifiedDiffLine[] PARSER_RULES = new UnifiedDiffLine[]{ - new UnifiedDiffLine("^\\s+", (m, l) -> LOG.info("normal " + l)), + private final UnifiedDiffLine[] MAIN_PARSER_RULES = new UnifiedDiffLine[]{ new UnifiedDiffLine(true, "^diff\\s", this::processDiff), - new UnifiedDiffLine(true, "^index\\s[\\da-zA-Z]+\\.\\.[\\da-zA-Z]+(\\s(\\d+))?$", this::processIndex) + new UnifiedDiffLine(true, "^index\\s[\\da-zA-Z]+\\.\\.[\\da-zA-Z]+(\\s(\\d+))?$", this::processIndex), + new UnifiedDiffLine(true, "^---\\s", this::processFromFile), + new UnifiedDiffLine(true, "^\\+\\+\\+\\s", this::processToFile), + new UnifiedDiffLine(true, UNIFIED_DIFF_CHUNK_REGEXP, this::processChunk) }; + private UnifiedDiffFile actualFile; UnifiedDiffParser(Reader reader) { @@ -50,7 +57,7 @@ public final class UnifiedDiffParser { // [/^deleted file mode \d+$/, deleted_file], [/^index\s[\da-zA-Z]+\.\.[\da-zA-Z]+(\s(\d+))?$/, index], // [/^---\s/, from_file], [/^\+\+\+\s/, to_file], [/^@@\s+\-(\d+),?(\d+)?\s+\+(\d+),?(\d+)?\s@@/, chunk], // [/^-/, del], [/^\+/, add], [/^\\ No newline at end of file$/, eof]]; - private UnifiedDiff parse() throws IOException { + private UnifiedDiff parse() throws IOException, UnifiedDiffParserException { boolean header = true; String headerTxt = ""; while (READER.ready()) { @@ -79,13 +86,13 @@ static String[] parseFileNames(String line) { private static final Logger LOG = Logger.getLogger(UnifiedDiffParser.class.getName()); - public static UnifiedDiff parseUnifiedDiff(InputStream stream) throws IOException { + public static UnifiedDiff parseUnifiedDiff(InputStream stream) throws IOException, UnifiedDiffParserException { UnifiedDiffParser parser = new UnifiedDiffParser(new BufferedReader(new InputStreamReader(stream))); return parser.parse(); } - private boolean processLine(boolean header, String line) { - for (UnifiedDiffLine rule : PARSER_RULES) { + private boolean processLine(boolean header, String line) throws UnifiedDiffParserException { + for (UnifiedDiffLine rule : MAIN_PARSER_RULES) { if (header && rule.isStopsHeaderParsing() || !header) { if (rule.processLine(line)) { return true; @@ -108,6 +115,35 @@ public void processDiff(MatchResult match, String line) { String[] fromTo = parseFileNames(READER.lastLine()); actualFile.setFromFile(fromTo[0]); actualFile.setToFile(fromTo[1]); + actualFile.setDiffCommand(line); + } + + public void processChunk(MatchResult match, String chunkStart) { + try { + List originalTxt = new ArrayList<>(); + List revisedTxt = new ArrayList<>(); + + int old_ln = match.group(1) == null ? 1 : Integer.parseInt(match.group(1)); + int new_ln = match.group(3) == null ? 1 : Integer.parseInt(match.group(3)); + + while (this.READER.ready()) { + String line = READER.readLine(); + + if (line.startsWith(" ") || line.startsWith("+")) { + revisedTxt.add(line.substring(1)); + } + if (line.startsWith(" ") || line.startsWith("-")) { + originalTxt.add(line.substring(1)); + } + if (line.equals("")) { + break; + } + } + + } catch (IOException ex) { + Logger.getLogger(UnifiedDiffParser.class.getName()).log(Level.SEVERE, null, ex); + throw new UnifiedDiffParserException(ex); + } } public void processIndex(MatchResult match, String line) { @@ -116,6 +152,20 @@ public void processIndex(MatchResult match, String line) { actualFile.setIndex(line.substring(6)); } + private void processFromFile(MatchResult match, String line) { + initFileIfNecessary(); + actualFile.setFromFile(extractFileName(line)); + } + + private void processToFile(MatchResult match, String line) { + initFileIfNecessary(); + actualFile.setToFile(extractFileName(line)); + } + + private String extractFileName(String line) { + return line.substring(4).replaceFirst("^(a|b)\\/", ""); + } + class UnifiedDiffLine { private final Pattern pattern; @@ -132,7 +182,7 @@ public UnifiedDiffLine(boolean stopsHeaderParsing, String pattern, BiConsumer Date: Sun, 10 Mar 2019 19:24:09 +0100 Subject: [PATCH 019/266] From 55e4867e88fdc39e5865f0ef526fb397a7c96ca1 Mon Sep 17 00:00:00 2001 From: wumpz Date: Sun, 10 Mar 2019 23:36:16 +0100 Subject: [PATCH 020/266] --- .../unifieddiff/UnifiedDiffParser.java | 64 +++++++++++++++---- .../unifieddiff/UnifiedDiffParserTest.java | 31 +++++++++ 2 files changed, 82 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java index 7244169b..d43aae0c 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java @@ -15,6 +15,8 @@ */ package com.github.difflib.unifieddiff; +import com.github.difflib.patch.ChangeDelta; +import com.github.difflib.patch.Chunk; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -35,7 +37,7 @@ */ public final class UnifiedDiffParser { - private static final String UNIFIED_DIFF_CHUNK_REGEXP = "^@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@$"; + static final Pattern UNIFIED_DIFF_CHUNK_REGEXP = Pattern.compile("^@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@"); private final UnifiedDiffReader READER; private final UnifiedDiff data = new UnifiedDiff(); @@ -62,6 +64,7 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException { String headerTxt = ""; while (READER.ready()) { String line = READER.readLine(); + LOG.log(Level.INFO, "parsing line {0}", line); if (processLine(header, line) == false) { if (header) { headerTxt += line + "\n"; @@ -118,25 +121,54 @@ public void processDiff(MatchResult match, String line) { actualFile.setDiffCommand(line); } - public void processChunk(MatchResult match, String chunkStart) { + public void processChunk(MatchResult _match, String chunkStart) { + MatchResult match = _match; try { - List originalTxt = new ArrayList<>(); - List revisedTxt = new ArrayList<>(); - int old_ln = match.group(1) == null ? 1 : Integer.parseInt(match.group(1)); - int new_ln = match.group(3) == null ? 1 : Integer.parseInt(match.group(3)); + while (true) { - while (this.READER.ready()) { - String line = READER.readLine(); + List originalTxt = new ArrayList<>(); + List revisedTxt = new ArrayList<>(); - if (line.startsWith(" ") || line.startsWith("+")) { - revisedTxt.add(line.substring(1)); + int old_ln = match.group(1) == null ? 1 : Integer.parseInt(match.group(1)); + int new_ln = match.group(3) == null ? 1 : Integer.parseInt(match.group(3)); + if (old_ln == 0) { + old_ln = 1; } - if (line.startsWith(" ") || line.startsWith("-")) { - originalTxt.add(line.substring(1)); + if (new_ln == 0) { + new_ln = 1; } - if (line.equals("")) { + + while (this.READER.ready()) { + String line = READER.readLine(); + LOG.log(Level.INFO, "processing chunk line {0}", line); + + if (line.startsWith(" ") || line.startsWith("+")) { + revisedTxt.add(line.substring(1)); + } + if (line.startsWith(" ") || line.startsWith("-")) { + originalTxt.add(line.substring(1)); + } + if (line.equals("") || line.startsWith("@@") || line.startsWith("--")) { + break; + } + } + + actualFile.getPatch().addDelta(new ChangeDelta<>(new Chunk<>( + old_ln - 1, originalTxt), new Chunk<>( + new_ln - 1, revisedTxt))); + + if (READER.lastLine().equals("") + || READER.lastLine().startsWith("--") + || !READER.lastLine().startsWith("@@")) { break; + } else { + Matcher m = UNIFIED_DIFF_CHUNK_REGEXP.matcher(READER.lastLine()); + if (m.find()) { + match = m.toMatchResult(); + } else { + break; + } } } @@ -182,6 +214,12 @@ public UnifiedDiffLine(boolean stopsHeaderParsing, String pattern, BiConsumer command) { + this.pattern = pattern; + this.command = command; + this.stopsHeaderParsing = stopsHeaderParsing; + } + public boolean processLine(String line) throws UnifiedDiffParserException { Matcher m = pattern.matcher(line); if (m.find()) { diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffParserTest.java b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffParserTest.java index 9eb6e052..e13eb563 100644 --- a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffParserTest.java +++ b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffParserTest.java @@ -16,9 +16,13 @@ package com.github.difflib.unifieddiff; import java.io.IOException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import static org.assertj.core.api.Java6Assertions.assertThat; import org.junit.After; import org.junit.AfterClass; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -53,6 +57,12 @@ public void testSimpleParse() throws IOException { UnifiedDiff diff = UnifiedDiffParser.parseUnifiedDiff(UnifiedDiffParserTest.class.getResourceAsStream("jsqlparser_patch_1.diff")); System.out.println(diff); + + assertThat(diff.getFiles().size()).isEqualTo(2); + + UnifiedDiffFile file1 = diff.getFiles().get(0); + assertThat(file1.getFromFile()).isEqualTo("src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt"); + assertThat(file1.getPatch().getDeltas().size()).isEqualTo(3); } @Test @@ -61,4 +71,25 @@ public void testParseDiffBlock() { assertThat(files).containsExactly("src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java", "src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java"); } + @Test + public void testChunkHeaderParsing() { + Pattern pattern = UnifiedDiffParser.UNIFIED_DIFF_CHUNK_REGEXP; + Matcher matcher = pattern.matcher("@@ -189,6 +189,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */"); + + assertTrue(matcher.find()); + assertEquals("189", matcher.group(1)); + assertEquals("189", matcher.group(3)); + } + + @Test + public void testChunkHeaderParsing2() { + //"^@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@.*$" + Pattern pattern = UnifiedDiffParser.UNIFIED_DIFF_CHUNK_REGEXP; + Matcher matcher = pattern.matcher("@@ -189,6 +189,7 @@"); + + assertTrue(matcher.find()); + assertEquals("189", matcher.group(1)); + assertEquals("189", matcher.group(3)); + } + } From d2355a8435052f8c508de28835105b822102672d Mon Sep 17 00:00:00 2001 From: wumpz Date: Tue, 12 Mar 2019 00:15:51 +0100 Subject: [PATCH 021/266] --- .../difflib/unifieddiff/UnifiedDiff.java | 8 ++ .../unifieddiff/UnifiedDiffParser.java | 126 ++++++++++-------- .../unifieddiff/UnifiedDiffParserTest.java | 2 + 3 files changed, 77 insertions(+), 59 deletions(-) diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java index 76bd2740..42db0aee 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java @@ -26,6 +26,7 @@ public class UnifiedDiff { private String header; + private String tail; private final List files = new ArrayList<>(); public String getHeader() { @@ -44,4 +45,11 @@ public List getFiles() { return Collections.unmodifiableList(files); } + void setTailTxt(String tailTxt) { + this.tail = tailTxt; + } + + public String getTail() { + return tail; + } } diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java index d43aae0c..77aa614f 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java @@ -46,7 +46,10 @@ public final class UnifiedDiffParser { new UnifiedDiffLine(true, "^index\\s[\\da-zA-Z]+\\.\\.[\\da-zA-Z]+(\\s(\\d+))?$", this::processIndex), new UnifiedDiffLine(true, "^---\\s", this::processFromFile), new UnifiedDiffLine(true, "^\\+\\+\\+\\s", this::processToFile), - new UnifiedDiffLine(true, UNIFIED_DIFF_CHUNK_REGEXP, this::processChunk) + new UnifiedDiffLine(false, UNIFIED_DIFF_CHUNK_REGEXP, this::processChunk), + new UnifiedDiffLine("^\\s+", this::processNormalLine), + new UnifiedDiffLine("^-", this::processDelLine), + new UnifiedDiffLine("^+", this::processAddLine) }; private UnifiedDiffFile actualFile; @@ -62,20 +65,33 @@ public final class UnifiedDiffParser { private UnifiedDiff parse() throws IOException, UnifiedDiffParserException { boolean header = true; String headerTxt = ""; + String tailTxt = ""; while (READER.ready()) { String line = READER.readLine(); - LOG.log(Level.INFO, "parsing line {0}", line); - if (processLine(header, line) == false) { - if (header) { - headerTxt += line + "\n"; + if (line.matches("^\\-\\-\\s+")) { + break; + } else { + LOG.log(Level.INFO, "parsing line {0}", line); + if (processLine(header, line) == false) { + if (header) { + headerTxt += line + "\n"; + } else { + break; + } } else { - break; + header = false; + data.setHeader(headerTxt); } - } else { - header = false; - data.setHeader(headerTxt); } } + + finalizeChunk(); + + while (READER.ready()) { + tailTxt += READER.readLine() + "\n"; + } + data.setTailTxt(tailTxt); + return data; } @@ -106,6 +122,10 @@ private boolean processLine(boolean header, String line) throws UnifiedDiffParse } private void initFileIfNecessary() { + if (!originalTxt.isEmpty() || !revisedTxt.isEmpty()) { + finalizeChunk(); + actualFile = null; + } if (actualFile == null) { actualFile = new UnifiedDiffFile(); data.addFile(actualFile); @@ -121,60 +141,48 @@ public void processDiff(MatchResult match, String line) { actualFile.setDiffCommand(line); } - public void processChunk(MatchResult _match, String chunkStart) { - MatchResult match = _match; - try { - - while (true) { - - List originalTxt = new ArrayList<>(); - List revisedTxt = new ArrayList<>(); - - int old_ln = match.group(1) == null ? 1 : Integer.parseInt(match.group(1)); - int new_ln = match.group(3) == null ? 1 : Integer.parseInt(match.group(3)); - if (old_ln == 0) { - old_ln = 1; - } - if (new_ln == 0) { - new_ln = 1; - } - - while (this.READER.ready()) { - String line = READER.readLine(); - LOG.log(Level.INFO, "processing chunk line {0}", line); + private List originalTxt = new ArrayList<>(); + private List revisedTxt = new ArrayList<>(); + private int old_ln; + private int new_ln; + + private void finalizeChunk() { + if (!originalTxt.isEmpty() || !revisedTxt.isEmpty()) { + actualFile.getPatch().addDelta(new ChangeDelta<>(new Chunk<>( + old_ln - 1, originalTxt), new Chunk<>( + new_ln - 1, revisedTxt))); + old_ln = 0; + new_ln = 0; + originalTxt.clear(); + revisedTxt.clear(); + } + } - if (line.startsWith(" ") || line.startsWith("+")) { - revisedTxt.add(line.substring(1)); - } - if (line.startsWith(" ") || line.startsWith("-")) { - originalTxt.add(line.substring(1)); - } - if (line.equals("") || line.startsWith("@@") || line.startsWith("--")) { - break; - } - } + public void processNormalLine(MatchResult match, String line) { + String cline = line.substring(1); + originalTxt.add(cline); + revisedTxt.add(cline); + } - actualFile.getPatch().addDelta(new ChangeDelta<>(new Chunk<>( - old_ln - 1, originalTxt), new Chunk<>( - new_ln - 1, revisedTxt))); + public void processAddLine(MatchResult match, String line) { + String cline = line.substring(1); + revisedTxt.add(cline); + } - if (READER.lastLine().equals("") - || READER.lastLine().startsWith("--") - || !READER.lastLine().startsWith("@@")) { - break; - } else { - Matcher m = UNIFIED_DIFF_CHUNK_REGEXP.matcher(READER.lastLine()); - if (m.find()) { - match = m.toMatchResult(); - } else { - break; - } - } - } + public void processDelLine(MatchResult match, String line) { + String cline = line.substring(1); + originalTxt.add(cline); + } - } catch (IOException ex) { - Logger.getLogger(UnifiedDiffParser.class.getName()).log(Level.SEVERE, null, ex); - throw new UnifiedDiffParserException(ex); + public void processChunk(MatchResult match, String chunkStart) { + finalizeChunk(); + old_ln = match.group(1) == null ? 1 : Integer.parseInt(match.group(1)); + new_ln = match.group(3) == null ? 1 : Integer.parseInt(match.group(3)); + if (old_ln == 0) { + old_ln = 1; + } + if (new_ln == 0) { + new_ln = 1; } } diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffParserTest.java b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffParserTest.java index e13eb563..6fe916d8 100644 --- a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffParserTest.java +++ b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffParserTest.java @@ -63,6 +63,8 @@ public void testSimpleParse() throws IOException { UnifiedDiffFile file1 = diff.getFiles().get(0); assertThat(file1.getFromFile()).isEqualTo("src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt"); assertThat(file1.getPatch().getDeltas().size()).isEqualTo(3); + + assertThat(diff.getTail()).isEqualTo("2.17.1.windows.2\n\n"); } @Test From 05b5d80d48b338ceaf95f8b2d32c7e77cbda5f23 Mon Sep 17 00:00:00 2001 From: wumpz Date: Mon, 18 Mar 2019 22:34:08 +0100 Subject: [PATCH 022/266] --- .../com/github/difflib/unifieddiff/UnifiedDiff.java | 12 +++++++++++- .../github/difflib/unifieddiff/UnifiedDiffFile.java | 10 +++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java index 42db0aee..e1a52112 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java @@ -23,7 +23,7 @@ * * @author Tobias Warneke (t.warneke@gmx.net) */ -public class UnifiedDiff { +public final class UnifiedDiff { private String header; private String tail; @@ -52,4 +52,14 @@ void setTailTxt(String tailTxt) { public String getTail() { return tail; } + + public static UnifiedDiff from(String header, String tail, UnifiedDiffFile... files) { + UnifiedDiff diff = new UnifiedDiff(); + diff.setHeader(header); + diff.setTailTxt(tail); + for (UnifiedDiffFile file : files) { + diff.addFile(file); + } + return diff; + } } diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java index cd49de57..d57b9233 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java @@ -21,7 +21,7 @@ * * @author Tobias Warneke (t.warneke@gmx.net) */ -public class UnifiedDiffFile { +public final class UnifiedDiffFile { private String diffCommand; private String fromFile; @@ -64,4 +64,12 @@ public String getIndex() { public Patch getPatch() { return patch; } + + public static UnifiedDiffFile from(String fromFile, String toFile, Patch patch) { + UnifiedDiffFile file = new UnifiedDiffFile(); + file.setFromFile(fromFile); + file.setToFile(toFile); + file.patch = patch; + return file; + } } From 983ec680f732dca4f96cf154c2eedddc7405e729 Mon Sep 17 00:00:00 2001 From: wumpz Date: Mon, 18 Mar 2019 22:36:49 +0100 Subject: [PATCH 023/266] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 82ccd481..b7ca5ea3 100644 --- a/pom.xml +++ b/pom.xml @@ -249,7 +249,7 @@ com.puppycrawl.tools checkstyle - 6.19 + 8.18 From 8c86e0f8d7f6d71fcb22f1588aebd73c308b9060 Mon Sep 17 00:00:00 2001 From: wumpz Date: Tue, 26 Mar 2019 07:58:25 +0100 Subject: [PATCH 024/266] upgraded checkstyle plugin (security alert from github) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 200c4d14..4fec1a65 100644 --- a/pom.xml +++ b/pom.xml @@ -243,7 +243,7 @@ com.puppycrawl.tools checkstyle - 6.19 + 8.12 From 4a83032d7e027beaecd106079f8a50427ba080a2 Mon Sep 17 00:00:00 2001 From: wumpz Date: Tue, 26 Mar 2019 21:14:54 +0100 Subject: [PATCH 025/266] --- ...DiffParser.java => UnifiedDiffReader.java} | 16 +++--- .../unifieddiff/UnifiedDiffWriter.java | 29 ++++++++++ ...erTest.java => UnifiedDiffReaderTest.java} | 12 ++-- .../unifieddiff/UnifiedDiffWriterTest.java | 55 +++++++++++++++++++ 4 files changed, 98 insertions(+), 14 deletions(-) rename src/main/java/com/github/difflib/unifieddiff/{UnifiedDiffParser.java => UnifiedDiffReader.java} (95%) create mode 100644 src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java rename src/test/java/com/github/difflib/unifieddiff/{UnifiedDiffParserTest.java => UnifiedDiffReaderTest.java} (87%) create mode 100644 src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java similarity index 95% rename from src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java rename to src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java index 77aa614f..9126ad78 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java @@ -35,11 +35,11 @@ * * @author Tobias Warneke (t.warneke@gmx.net) */ -public final class UnifiedDiffParser { +public final class UnifiedDiffReader { static final Pattern UNIFIED_DIFF_CHUNK_REGEXP = Pattern.compile("^@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@"); - private final UnifiedDiffReader READER; + private final InternalUnifiedDiffReader READER; private final UnifiedDiff data = new UnifiedDiff(); private final UnifiedDiffLine[] MAIN_PARSER_RULES = new UnifiedDiffLine[]{ new UnifiedDiffLine(true, "^diff\\s", this::processDiff), @@ -54,8 +54,8 @@ public final class UnifiedDiffParser { private UnifiedDiffFile actualFile; - UnifiedDiffParser(Reader reader) { - this.READER = new UnifiedDiffReader(reader); + UnifiedDiffReader(Reader reader) { + this.READER = new InternalUnifiedDiffReader(reader); } // schema = [[/^\s+/, normal], [/^diff\s/, start], [/^new file mode \d+$/, new_file], @@ -103,10 +103,10 @@ static String[] parseFileNames(String line) { }; } - private static final Logger LOG = Logger.getLogger(UnifiedDiffParser.class.getName()); + private static final Logger LOG = Logger.getLogger(UnifiedDiffReader.class.getName()); public static UnifiedDiff parseUnifiedDiff(InputStream stream) throws IOException, UnifiedDiffParserException { - UnifiedDiffParser parser = new UnifiedDiffParser(new BufferedReader(new InputStreamReader(stream))); + UnifiedDiffReader parser = new UnifiedDiffReader(new BufferedReader(new InputStreamReader(stream))); return parser.parse(); } @@ -244,11 +244,11 @@ public boolean isStopsHeaderParsing() { } } -class UnifiedDiffReader extends BufferedReader { +class InternalUnifiedDiffReader extends BufferedReader { private String lastLine; - public UnifiedDiffReader(Reader reader) { + public InternalUnifiedDiffReader(Reader reader) { super(reader); } diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java new file mode 100644 index 00000000..4cbf67ff --- /dev/null +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java @@ -0,0 +1,29 @@ +/* + * Copyright 2019 java-diff-utils. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.github.difflib.unifieddiff; + +import java.io.Writer; + +/** + * + * @author Tobias Warneke (t.warneke@gmx.net) + */ +public class UnifiedDiffWriter { + + public static void write(UnifiedDiff diff, Writer writer) { + + } +} diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffParserTest.java b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java similarity index 87% rename from src/test/java/com/github/difflib/unifieddiff/UnifiedDiffParserTest.java rename to src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java index 6fe916d8..38526a8b 100644 --- a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffParserTest.java +++ b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java @@ -31,9 +31,9 @@ * * @author Tobias Warneke (t.warneke@gmx.net) */ -public class UnifiedDiffParserTest { +public class UnifiedDiffReaderTest { - public UnifiedDiffParserTest() { + public UnifiedDiffReaderTest() { } @BeforeClass @@ -54,7 +54,7 @@ public void tearDown() { @Test public void testSimpleParse() throws IOException { - UnifiedDiff diff = UnifiedDiffParser.parseUnifiedDiff(UnifiedDiffParserTest.class.getResourceAsStream("jsqlparser_patch_1.diff")); + UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(UnifiedDiffReaderTest.class.getResourceAsStream("jsqlparser_patch_1.diff")); System.out.println(diff); @@ -69,13 +69,13 @@ public void testSimpleParse() throws IOException { @Test public void testParseDiffBlock() { - String[] files = UnifiedDiffParser.parseFileNames("diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java"); + String[] files = UnifiedDiffReader.parseFileNames("diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java"); assertThat(files).containsExactly("src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java", "src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java"); } @Test public void testChunkHeaderParsing() { - Pattern pattern = UnifiedDiffParser.UNIFIED_DIFF_CHUNK_REGEXP; + Pattern pattern = UnifiedDiffReader.UNIFIED_DIFF_CHUNK_REGEXP; Matcher matcher = pattern.matcher("@@ -189,6 +189,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */"); assertTrue(matcher.find()); @@ -86,7 +86,7 @@ public void testChunkHeaderParsing() { @Test public void testChunkHeaderParsing2() { //"^@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@.*$" - Pattern pattern = UnifiedDiffParser.UNIFIED_DIFF_CHUNK_REGEXP; + Pattern pattern = UnifiedDiffReader.UNIFIED_DIFF_CHUNK_REGEXP; Matcher matcher = pattern.matcher("@@ -189,6 +189,7 @@"); assertTrue(matcher.find()); diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java new file mode 100644 index 00000000..d73dcb7d --- /dev/null +++ b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java @@ -0,0 +1,55 @@ +/* + * Copyright 2019 java-diff-utils. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.github.difflib.unifieddiff; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * + * @author Tobias Warneke (t.warneke@gmx.net) + */ +public class UnifiedDiffWriterTest { + + public UnifiedDiffWriterTest() { + } + + @BeforeClass + public static void setUpClass() { + } + + @AfterClass + public static void tearDownClass() { + } + + @Before + public void setUp() { + } + + @After + public void tearDown() { + } + + @Test + public void testSomeMethod() { + // TODO review the generated test code and remove the default call to fail. + fail("The test case is a prototype."); + } + +} From 61a21cbca91ddda3337d315d8768fc0d31482b26 Mon Sep 17 00:00:00 2001 From: wumpz Date: Tue, 26 Mar 2019 21:36:31 +0100 Subject: [PATCH 026/266] --- .../github/difflib/unifieddiff/UnifiedDiffWriterTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java index d73dcb7d..7b8e1576 100644 --- a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java +++ b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java @@ -47,9 +47,8 @@ public void tearDown() { } @Test - public void testSomeMethod() { - // TODO review the generated test code and remove the default call to fail. - fail("The test case is a prototype."); + public void testWrite() { + } } From 535ecf3e2a55811769a19fbe977bc89fc637168b Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Sun, 31 Mar 2019 14:18:24 +0200 Subject: [PATCH 027/266] Move CHANGELOG to separte file CHANGELOG.md For more information on that format see http://keepachangelog.com/ --- CHANGELOG.md | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 33 --------------------- 2 files changed, 82 insertions(+), 33 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..dda5b33e --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,82 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +This project uses a custom versioning scheme (and not [Semantic Versioning](https://semver.org/spec/v2.0.0.html)). + +## [Unreleased] + +### Changed + +* Exchange `0 += 1` for `0 = 1` in UnifiedDiffUtils + +## [4.0] – 2019-01-09 + +### Changed + +* moved to organisation **java-diff-utils** +* changed groupid to **io.github.java-diff-utils** and artifact id to **java-diff-utils** + +## [3.0] – 2018-10-18 + +### Added + +* Introduced a process listener to diff algorithms. For long running + diffs one could implement some progress information. +* automatic module name for JDK 9 and higher usage + +### Changed + +* changed generation of inline diffes, if there are different linefeeds within one diff, then these are excluded from the diff block. + +### Removed + +* Due to licensing issues Delta.java and DiffAlgorithm.java were removed. + +## [2.2] – 2017-11-09 + +### Added + +* released at maven central +* included checkstyle source code conventions +* allow configurable splitting of lines to define the blocks to compare (words, characters, phrases). + +### Changed + +* groupid changed to **com.github.wumpz**, due to maven central releasing + +## [2.0] – 2017-08-14 + +### Added + +* support for inline merge +* integrated JGit (Eclipse Licensed) to provide HistogramDiff to gain speed for large datasets + +### Changed + +* switch to maven and removed other artifacts +* changed groupid to **com.github.java-diff-utils** due to different forks at github +* updated maven plugins +* JDK 1.8 compatibility, sorry if you have to stick with older versions +* restructured packages heavily +* changed API +* changed Algorithm to provide only cursor positions + +### Removed + +* removed all kinds of helper classes in favour of new JDK 8 function classes like Predicate + +## 1.2 + +### Added + +* JDK 1.5 compatibility +* Ant build script +* Generate output in unified diff format (thanks for Bill James) + +[Unreleased]: https://github.com/java-diff-utils/java-diff-utils/compare/java-diff-utils-4.0...HEAD +[4.0]: https://github.com/java-diff-utils/java-diff-utils/compare/diff-utils-3.0...java-diff-utils-4.0 +[3.0]: https://github.com/java-diff-utils/java-diff-utils/compare/diff-utils-2.2...diff-utils-3.0 +[2.2]: https://github.com/java-diff-utils/java-diff-utils/compare/diff-utils-2.0...diff-utils-2.2 + diff --git a/README.md b/README.md index c3c335ac..ebc61bd8 100644 --- a/README.md +++ b/README.md @@ -52,39 +52,6 @@ This is a test ~senctence~**for diffutils**. But it can easily replaced by any other which is better for handing your texts. I have plan to add implementation of some in future. -### Changelog ### - * Version 4.0-SNAPSHOT - * moved to organisation **java-diff-utils** - * changed groupid to **io.github.java-diff-utils** and artifact id to **java-diff-utils** - * Version 3.0 - * changed generation of inline diffes, if there are different linefeeds within one diff, then these are excluded - from the diff block. - * Due to licensing issues Delta.java and DiffAlgorithm.java were removed. - * Version 2.3-SNAPSHOT - * Introduced a process listener to diff algorithms. For long running - diffs one could implement some progress information. - * automatic module name for JDK 9 and higher usage - * Version 2.2 - * released at maven central - * included checkstyle source code conventions - * groupid changed to **com.github.wumpz**, due to maven central releasing - * allow configurable splitting of lines to define the blocks to compare (words, characters, phrases). - * Version 2.0 - * switch to maven and removed other artifacts - * changed groupid to **com.github.java-diff-utils** due to different forks at github - * updated maven plugins - * JDK 1.8 compatibility, sorry if you have to stick with older versions - * support for inline merge - * restructured packages heavily - * changed API - * changed Algorithm to provide only cursor positions - * integrated JGit (Eclipse Licensed) to provide HistogramDiff to gain speed for large datasets - * removed all kinds of helper classes in favour of new JDK 8 function classes like Predicate - * Version 1.2 - * JDK 1.5 compatibility - * Ant build script - * Generate output in unified diff format (thanks for Bill James) - ## Source Code conventions Recently a checkstyle process was integrated into the build process. java-diff-utils follows the sun java format convention. There are no TABs allowed. Use spaces. From a4bb85bab1e9984d2fa996f5d5b9417795aa7d33 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Sun, 31 Mar 2019 14:29:09 +0200 Subject: [PATCH 028/266] Fix linting issues in README.md --- README.md | 58 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index c3c335ac..2522bf42 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,22 @@ # java-diff-utils -## Status ## +## Status + [![Build Status](https://travis-ci.org/java-diff-utils/java-diff-utils.svg?branch=master)](https://travis-ci.org/java-diff-utils/java-diff-utils) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/7eba77f10bed4c2a8d08ac8dc8da4a86)](https://www.codacy.com/app/wumpz/java-diff-utils?utm_source=github.com&utm_medium=referral&utm_content=java-diff-utils/java-diff-utils&utm_campaign=Badge_Grade) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.java-diff-utils/java-diff-utils/badge.svg)](http://maven-badges.herokuapp.com/maven-central/io.github.java-diff-utils/java-diff-utils) +## Intro -## Intro ## Diff Utils library is an OpenSource library for performing the comparison operations between texts: computing diffs, applying patches, generating unified diffs or parsing them, generating diff output for easy future displaying (like side-by-side view) and so on. Main reason to build this library was the lack of easy-to-use libraries with all the usual stuff you need while working with diff files. Originally it was inspired by JRCS library and it's nice design of diff module. **This is originally a fork of java-diff-utils from Google Code Archive.** -## Examples ## +## Examples -Look [here](https://github.com/wumpz/java-diff-utils/wiki) to find more helpful informations and examples. +Look [here](https://github.com/wumpz/java-diff-utils/wiki) to find more helpful informations and examples. These two outputs are generated using this java-diff-utils. The source code can also be found at the *Examples* page: @@ -23,7 +24,6 @@ These two outputs are generated using this java-diff-utils. The source code can This is a test ~senctence~**for diffutils**. - **Producing a side by side view of computed differences.** |original|new| @@ -32,23 +32,22 @@ This is a test ~senctence~**for diffutils**. |This is the second line.|This is the second line.| |~And here is the finish.~|| +## Main Features -## Main Features ## - - * computing the difference between two texts. - * capable to hand more than plain ascci. Arrays or List of any type that implements hashCode() and equals() correctly can be subject to differencing using this library - * patch and unpatch the text with the given patch - * parsing the unified diff format - * producing human-readable differences - * inline difference construction - * Algorithms: - * Myer - * HistogramDiff using JGit Library +* computing the difference between two texts. +* capable to hand more than plain ascci. Arrays or List of any type that implements hashCode() and equals() correctly can be subject to differencing using this library +* patch and unpatch the text with the given patch +* parsing the unified diff format +* producing human-readable differences +* inline difference construction +* Algorithms: + * Myer + * HistogramDiff using JGit Library -### Algoritms ### +### Algoritms * Myer's diff -* HistogramDiff +* HistogramDiff But it can easily replaced by any other which is better for handing your texts. I have plan to add implementation of some in future. @@ -91,24 +90,26 @@ Recently a checkstyle process was integrated into the build process. java-diff-u ```java public static Patch diff(List original, List revised, - BiPredicate equalizer) throws DiffException { - if (equalizer != null) { - return DiffUtils.diff(original, revised, - new MyersDiff<>(equalizer)); - } - return DiffUtils.diff(original, revised, new MyersDiff<>()); + BiPredicate equalizer) throws DiffException { + if (equalizer != null) { + return DiffUtils.diff(original, revised, + new MyersDiff<>(equalizer)); + } + return DiffUtils.diff(original, revised, new MyersDiff<>()); } ``` This is a valid piece of source code: + * blocks without braces are not allowed * after control statements (if, while, for) a whitespace is expected * the opening brace should be in the same line as the control statement -### To Install ### +### To Install Just add the code below to your maven dependencies: -``` + +```xml io.github.java-diff-utils java-diff-utils @@ -118,7 +119,7 @@ Just add the code below to your maven dependencies: Attention. We changed groupid and artifactid. Starting with version 4 you have to use: -``` +```xml io.github.java-diff-utils java-diff-utils @@ -127,7 +128,8 @@ Attention. We changed groupid and artifactid. Starting with version 4 you have t ``` or using gradle: -``` + +```groovy // https://mvnrepository.com/artifact/com.github.wumpz/diffutils compile group: 'com.github.wumpz', name: 'diffutils', version: '2.2' ``` From 6321d5327c50e8a4516bbd254798035f940e84af Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Sun, 31 Mar 2019 14:33:54 +0200 Subject: [PATCH 029/266] Add support for IntelliJ to .gitignore --- .gitignore | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0643ce7d..54a9c8ca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ -/target/ -/nbproject/ \ No newline at end of file +.idea/ +build/ +nbproject/ +target/ From 13f2f5ede1aac32a3079836d0451cd03033dd507 Mon Sep 17 00:00:00 2001 From: 0xflotus <0xflotus@gmail.com> Date: Tue, 2 Apr 2019 18:00:59 +0200 Subject: [PATCH 030/266] fixed Algorithms and Ascii --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 445729c4..03d4d100 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ This is a test ~senctence~**for diffutils**. ## Main Features * computing the difference between two texts. -* capable to hand more than plain ascci. Arrays or List of any type that implements hashCode() and equals() correctly can be subject to differencing using this library +* capable to hand more than plain ascii. Arrays or List of any type that implements hashCode() and equals() correctly can be subject to differencing using this library * patch and unpatch the text with the given patch * parsing the unified diff format * producing human-readable differences @@ -44,7 +44,7 @@ This is a test ~senctence~**for diffutils**. * Myer * HistogramDiff using JGit Library -### Algoritms +### Algorithms * Myer's diff * HistogramDiff From 4c1a0bc07288b2c5752f2f9ac1dc343cedb3985d Mon Sep 17 00:00:00 2001 From: wumpz Date: Mon, 15 Apr 2019 00:17:53 +0200 Subject: [PATCH 031/266] --- .../unifieddiff/UnifiedDiffWriter.java | 25 +++++++++++- .../unifieddiff/UnifiedDiffReaderTest.java | 23 ----------- .../unifieddiff/UnifiedDiffWriterTest.java | 40 +++++++++---------- 3 files changed, 43 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java index 4cbf67ff..6c552bc6 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java @@ -15,6 +15,7 @@ */ package com.github.difflib.unifieddiff; +import java.io.IOException; import java.io.Writer; /** @@ -23,7 +24,29 @@ */ public class UnifiedDiffWriter { - public static void write(UnifiedDiff diff, Writer writer) { + public static void write(UnifiedDiff diff, Writer writer) throws IOException { + writer.write(diff.getHeader()); + for (UnifiedDiffFile file : diff.getFiles()) { + writeOrNothing(writer, file.getDiffCommand()); + if (file.getIndex() != null) { + writer.write("index " + file.getIndex() + "\n"); + } + if (file.getFromFile() != null) { + writer.write("--- " + file.getFromFile() + "\n"); + } + if (file.getToFile() != null) { + writer.write("+++ " + file.getToFile() + "\n"); + } + + } + + writer.write(diff.getTail()); + } + + private static void writeOrNothing(Writer writer, String str) throws IOException { + if (str != null) { + writer.append(str).append("\n"); + } } } diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java index 38526a8b..cd94f2ae 100644 --- a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java +++ b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java @@ -19,12 +19,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import static org.assertj.core.api.Java6Assertions.assertThat; -import org.junit.After; -import org.junit.AfterClass; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; /** @@ -33,25 +29,6 @@ */ public class UnifiedDiffReaderTest { - public UnifiedDiffReaderTest() { - } - - @BeforeClass - public static void setUpClass() { - } - - @AfterClass - public static void tearDownClass() { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } - @Test public void testSimpleParse() throws IOException { UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(UnifiedDiffReaderTest.class.getResourceAsStream("jsqlparser_patch_1.diff")); diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java index 7b8e1576..782b35d7 100644 --- a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java +++ b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java @@ -15,10 +15,14 @@ */ package com.github.difflib.unifieddiff; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.StringWriter; +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.charset.Charset; +import java.nio.file.Files; +import java.nio.file.Paths; import org.junit.Test; /** @@ -30,25 +34,19 @@ public class UnifiedDiffWriterTest { public UnifiedDiffWriterTest() { } - @BeforeClass - public static void setUpClass() { - } - - @AfterClass - public static void tearDownClass() { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } - @Test - public void testWrite() { + public void testWrite() throws URISyntaxException, IOException { + String str = readFile(UnifiedDiffReaderTest.class.getResource("jsqlparser_patch_1.diff").toURI(), Charset.defaultCharset()); + UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(new ByteArrayInputStream(str.getBytes())); + StringWriter writer = new StringWriter(); + UnifiedDiffWriter.write(diff, writer); + System.out.println(writer.toString()); } + static String readFile(URI path, Charset encoding) + throws IOException { + byte[] encoded = Files.readAllBytes(Paths.get(path)); + return new String(encoded, encoding); + } } From 8c6679e2950ffa53ce988e38fa017fa04e2b3451 Mon Sep 17 00:00:00 2001 From: wumpz Date: Mon, 15 Apr 2019 00:51:14 +0200 Subject: [PATCH 032/266] --- .../com/github/difflib/unifieddiff/UnifiedDiffWriter.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java index 6c552bc6..5645e191 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java @@ -40,8 +40,9 @@ public static void write(UnifiedDiff diff, Writer writer) throws IOException { } } - - writer.write(diff.getTail()); + if (diff.getTail() != null) { + writer.write("--\n" + diff.getTail()); + } } private static void writeOrNothing(Writer writer, String str) throws IOException { From ecd834f3f53c00f4d55baa75fbada4aa338014db Mon Sep 17 00:00:00 2001 From: wumpz Date: Tue, 30 Apr 2019 23:55:38 +0200 Subject: [PATCH 033/266] --- .../java/com/github/difflib/patch/Chunk.java | 10 +- .../unifieddiff/UnifiedDiffWriter.java | 162 +++++++++++++++++- .../unifieddiff/UnifiedDiffReaderTest.java | 21 +++ 3 files changed, 182 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/github/difflib/patch/Chunk.java b/src/main/java/com/github/difflib/patch/Chunk.java index 6c1a9918..70b57223 100644 --- a/src/main/java/com/github/difflib/patch/Chunk.java +++ b/src/main/java/com/github/difflib/patch/Chunk.java @@ -15,6 +15,7 @@ */ package com.github.difflib.patch; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Objects; @@ -23,9 +24,10 @@ * Holds the information about the part of text involved in the diff process * *

- * Text is represented as Object[] 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. + * Text is represented as Object[] 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. *

* * @author writer) throws IOException { + writer.accept(diff.getHeader()); for (UnifiedDiffFile file : diff.getFiles()) { writeOrNothing(writer, file.getDiffCommand()); if (file.getIndex() != null) { - writer.write("index " + file.getIndex() + "\n"); + writer.accept("index " + file.getIndex()); } if (file.getFromFile() != null) { - writer.write("--- " + file.getFromFile() + "\n"); + writer.accept("--- " + file.getFromFile()); } if (file.getToFile() != null) { - writer.write("+++ " + file.getToFile() + "\n"); + writer.accept("+++ " + file.getToFile()); } + List> patchDeltas = new ArrayList<>( + file.getPatch().getDeltas()); + + List> deltas = new ArrayList<>(); + + int contextSize = 0; + List originalLines = new ArrayList<>(); + + AbstractDelta delta = patchDeltas.get(0); + deltas.add(delta); // add the first Delta to the current set + // if there's more than 1 Delta, we may need to output them together + if (patchDeltas.size() > 1) { + for (int i = 1; i < patchDeltas.size(); i++) { + int position = delta.getSource().getPosition(); + + // Check if the next Delta is too close to the current + // position. + // And if it is, add it to the current set + AbstractDelta nextDelta = patchDeltas.get(i); + if ((position + delta.getSource().size() + contextSize) >= (nextDelta + .getSource().getPosition() - contextSize)) { + deltas.add(nextDelta); + } else { + // if it isn't, output the current set, + // then create a new set and add the current Delta to + // it. + processDeltas(writer, originalLines, deltas, contextSize); + deltas.clear(); + deltas.add(nextDelta); + } + delta = nextDelta; + } + + } + // don't forget to process the last set of Deltas + processDeltas(writer, originalLines, deltas, contextSize); + } if (diff.getTail() != null) { - writer.write("--\n" + diff.getTail()); + writer.accept("--"); + writer.accept(diff.getTail()); + } + } + + private static void processDeltas(Consumer writer, + List origLines, + List> deltas, int contextSize) { + List buffer = new ArrayList<>(); + int origTotal = 0; // counter for total lines output from Original + int revTotal = 0; // counter for total lines output from Original + int line; + + AbstractDelta curDelta = deltas.get(0); + + // NOTE: +1 to overcome the 0-offset Position + int origStart = curDelta.getSource().getPosition() + 1 - contextSize; + if (origStart < 1) { + origStart = 1; + } + + int revStart = curDelta.getTarget().getPosition() + 1 - contextSize; + if (revStart < 1) { + revStart = 1; + } + + // find the start of the wrapper context code + int contextStart = curDelta.getSource().getPosition() - contextSize; + if (contextStart < 0) { + contextStart = 0; // clamp to the start of the file + } + + // output the context before the first Delta + for (line = contextStart; line < curDelta.getSource().getPosition(); line++) { // + buffer.add(" " + origLines.get(line)); + origTotal++; + revTotal++; + } + + // output the first Delta + getDeltaText(txt -> buffer.add(txt), curDelta); + origTotal += curDelta.getSource().getLines().size(); + revTotal += curDelta.getTarget().getLines().size(); + + int deltaIndex = 1; + while (deltaIndex < deltas.size()) { // for each of the other Deltas + AbstractDelta nextDelta = deltas.get(deltaIndex); + int intermediateStart = curDelta.getSource().getPosition() + + curDelta.getSource().getLines().size(); + for (line = intermediateStart; line < nextDelta.getSource() + .getPosition(); line++) { + // output the code between the last Delta and this one + buffer.add(" " + origLines.get(line)); + origTotal++; + revTotal++; + } + getDeltaText(txt -> buffer.add(txt), nextDelta); // output the Delta + origTotal += nextDelta.getSource().getLines().size(); + revTotal += nextDelta.getTarget().getLines().size(); + curDelta = nextDelta; + deltaIndex++; + } + + // Now output the post-Delta context code, clamping the end of the file + contextStart = curDelta.getSource().getPosition() + + curDelta.getSource().getLines().size(); + for (line = contextStart; (line < (contextStart + contextSize)) + && (line < origLines.size()); line++) { + buffer.add(" " + origLines.get(line)); + origTotal++; + revTotal++; + } + + // Create and insert the block header, conforming to the Unified Diff + // standard + writer.accept("@@ -" + origStart + "," + origTotal + " +" + revStart + "," + revTotal + " @@"); + buffer.forEach(txt -> { + writer.accept(txt); + }); + } + + /** + * getDeltaText returns the lines to be added to the Unified Diff text from the Delta parameter + * + * @param delta - the Delta to output + * @return list of String lines of code. + * @author Bill James (tankerbay@gmail.com) + */ + private static void getDeltaText(Consumer writer, AbstractDelta delta) { + for (String line : delta.getSource().getLines()) { + writer.accept("-" + line); + } + for (String line : delta.getTarget().getLines()) { + writer.accept("+" + line); } } - private static void writeOrNothing(Writer writer, String str) throws IOException { + private static void writeOrNothing(Consumer writer, String str) throws IOException { if (str != null) { - writer.append(str).append("\n"); + writer.accept(str); } } } diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java index cd94f2ae..ac372fa4 100644 --- a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java +++ b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java @@ -15,6 +15,7 @@ */ package com.github.difflib.unifieddiff; +import com.github.difflib.patch.AbstractDelta; import java.io.IOException; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -71,4 +72,24 @@ public void testChunkHeaderParsing2() { assertEquals("189", matcher.group(3)); } + @Test + public void testSimpleParse2() throws IOException { + UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(UnifiedDiffReaderTest.class.getResourceAsStream("jsqlparser_patch_1.diff")); + + System.out.println(diff); + + assertThat(diff.getFiles().size()).isEqualTo(2); + + UnifiedDiffFile file1 = diff.getFiles().get(0); + assertThat(file1.getFromFile()).isEqualTo("src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt"); + assertThat(file1.getPatch().getDeltas().size()).isEqualTo(3); + + AbstractDelta first = file1.getPatch().getDeltas().get(0); + + assertThat(first.getSource().size()).isGreaterThan(0); + assertThat(first.getTarget().size()).isGreaterThan(0); + + assertThat(diff.getTail()).isEqualTo("2.17.1.windows.2\n\n"); + } + } From 9704b62970e232e654a0b1230e32aece51b799c8 Mon Sep 17 00:00:00 2001 From: Adrian Kunz Date: Fri, 3 May 2019 10:27:38 +0200 Subject: [PATCH 034/266] Update Gradle Installation Updated the Group, Name, Version and Link in the Gradle Installation snippet. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 03d4d100..8287302a 100644 --- a/README.md +++ b/README.md @@ -97,6 +97,6 @@ Attention. We changed groupid and artifactid. Starting with version 4 you have t or using gradle: ```groovy -// https://mvnrepository.com/artifact/com.github.wumpz/diffutils -compile group: 'com.github.wumpz', name: 'diffutils', version: '2.2' +// https://mvnrepository.com/artifact/io.github.java-diff-utils/java-diff-utils +compile group: 'io.github.java-diff-utils', name: 'java-diff-utils', version: '4.0' ``` From 89f2659dd70a3020b84e9a9c72113b3dd1ce7f19 Mon Sep 17 00:00:00 2001 From: wumpz Date: Tue, 7 May 2019 09:09:34 +0200 Subject: [PATCH 035/266] fixes #41 --- .../github/difflib/text/DiffRowGenerator.java | 30 +++++++++++++++---- .../com/github/difflib/text/StringUtils.java | 6 ---- .../difflib/text/DiffRowGeneratorTest.java | 30 +++++++++++++++++++ .../github/difflib/text/StringUtilsTest.java | 9 ------ 4 files changed, 55 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/src/main/java/com/github/difflib/text/DiffRowGenerator.java index c0267345..c2734211 100644 --- a/src/main/java/com/github/difflib/text/DiffRowGenerator.java +++ b/src/main/java/com/github/difflib/text/DiffRowGenerator.java @@ -29,6 +29,7 @@ import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern; +import static java.util.stream.Collectors.toList; /** * This class for generating DiffRows for side-by-sidy view. You can customize the way of generating. For example, show @@ -42,13 +43,16 @@ * ignoreWhiteSpaces(true).columnWidth(100).build(); * */ -public class DiffRowGenerator { +public final class DiffRowGenerator { public static final BiPredicate DEFAULT_EQUALIZER = Object::equals; public static final BiPredicate IGNORE_WHITESPACE_EQUALIZER = (original, revised) -> adjustWhitespace(original).equals(adjustWhitespace(revised)); + public static final Function LINE_NORMALIZER_FOR_HTML = StringUtils::normalize; + + /** * Splitting lines by character to achieve char by char diff checking. */ @@ -60,6 +64,7 @@ public class DiffRowGenerator { return list; }; public static final Pattern SPLIT_BY_WORD_PATTERN = Pattern.compile("\\s+|[,.\\[\\](){}/\\\\*+\\-#]"); + /** * Splitting lines by word to achieve word by word diff checking. */ @@ -144,6 +149,7 @@ static void wrapInTag(List sequence, int startPosition, private final Function newTag; private final Function oldTag; private final boolean reportLinesUnchanged; + private final Function lineNormalizer; private final boolean showInlineDiffs; @@ -157,8 +163,10 @@ private DiffRowGenerator(Builder builder) { inlineDiffSplitter = builder.inlineDiffSplitter; equalizer = ignoreWhiteSpaces ? IGNORE_WHITESPACE_EQUALIZER : DEFAULT_EQUALIZER; reportLinesUnchanged = builder.reportLinesUnchanged; + lineNormalizer = builder.lineNormalizer; Objects.requireNonNull(inlineDiffSplitter); + Objects.requireNonNull(lineNormalizer); } /** @@ -258,14 +266,20 @@ private DiffRow buildDiffRowWithoutNormalizing(Tag type, String orgline, String StringUtils.wrapText(newline, columnWidth)); } + List normalizeLines(List list) { + return list.stream() + .map(lineNormalizer::apply) + .collect(toList()); + } + /** * Add the inline diffs for given delta * * @param delta the given delta */ private List generateInlineDiffs(AbstractDelta delta) throws DiffException { - List orig = StringUtils.normalize(delta.getSource().getLines()); - List rev = StringUtils.normalize(delta.getTarget().getLines()); + List orig = normalizeLines(delta.getSource().getLines()); + List rev = normalizeLines(delta.getTarget().getLines()); List origList; List revList; String joinedOrig = String.join("\n", orig); @@ -334,9 +348,9 @@ private List generateInlineDiffs(AbstractDelta delta) throws Di private String preprocessLine(String line) { if (columnWidth == 0) { - return StringUtils.normalize(line); + return lineNormalizer.apply(line); } else { - return StringUtils.wrapText(StringUtils.normalize(line), columnWidth); + return StringUtils.wrapText(lineNormalizer.apply(line), columnWidth); } } @@ -358,6 +372,7 @@ public static class Builder { private boolean mergeOriginalRevised = false; private boolean reportLinesUnchanged = false; private Function> inlineDiffSplitter = SPLITTER_BY_CHARACTER; + private Function lineNormalizer = LINE_NORMALIZER_FOR_HTML; private Builder() { } @@ -463,5 +478,10 @@ public Builder inlineDiffBySplitter(Function> inlineDiffSpl this.inlineDiffSplitter = inlineDiffSplitter; return this; } + + public Builder lineNormalizer(Function lineNormalizer) { + this.lineNormalizer = lineNormalizer; + return this; + } } } diff --git a/src/main/java/com/github/difflib/text/StringUtils.java b/src/main/java/com/github/difflib/text/StringUtils.java index 3a2dab05..a1425488 100644 --- a/src/main/java/com/github/difflib/text/StringUtils.java +++ b/src/main/java/com/github/difflib/text/StringUtils.java @@ -34,12 +34,6 @@ public static String normalize(String str) { return htmlEntites(str).replace("\t", " "); } - public static List normalize(List list) { - return list.stream() - .map(StringUtils::normalize) - .collect(toList()); - } - public static List wrapText(List list, int columnWidth) { return list.stream() .map(line -> wrapText(line, columnWidth)) diff --git a/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java index f9e5c710..752560b2 100644 --- a/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java +++ b/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java @@ -5,6 +5,7 @@ import java.io.IOException; import java.nio.file.Files; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.regex.Pattern; import static java.util.stream.Collectors.toList; @@ -28,6 +29,16 @@ public void testGenerator_Default() throws DiffException { assertEquals(3, rows.size()); } + /** + * Test of normalize method, of class StringUtils. + */ + @Test + public void testNormalize_List() { + DiffRowGenerator generator = DiffRowGenerator.create() + .build(); + assertEquals(Collections.singletonList(" test"), generator.normalizeLines(Collections.singletonList("\ttest"))); + } + @Test public void testGenerator_Default2() throws DiffException { String first = "anything \n \nother"; @@ -375,4 +386,23 @@ public void testGeneratorIssue22_3() throws DiffException { assertEquals("[[CHANGE,This is a test ~senctence~.,This is a test **for diffutils**.], [CHANGE,,**This is the second line.**], [CHANGE,,**And one more.**]]", rows.toString()); } + + @Test + public void testGeneratorIssue41DefaultNormalizer() throws DiffException { + DiffRowGenerator generator = DiffRowGenerator.create() + .build(); + List rows = generator.generateDiffRows(Arrays.asList("<"), Arrays.asList("<")); + assertEquals("[[EQUAL,<,<]]", rows.toString()); + } + + @Test + public void testGeneratorIssue41UserNormalizer() throws DiffException { + DiffRowGenerator generator = DiffRowGenerator.create() + .lineNormalizer(str -> str.replace("\t", " ")) + .build(); + List rows = generator.generateDiffRows(Arrays.asList("<"), Arrays.asList("<")); + assertEquals("[[EQUAL,<,<]]", rows.toString()); + rows = generator.generateDiffRows(Arrays.asList("\t<"), Arrays.asList("<")); + assertEquals("[[CHANGE, <,<]]", rows.toString()); + } } diff --git a/src/test/java/com/github/difflib/text/StringUtilsTest.java b/src/test/java/com/github/difflib/text/StringUtilsTest.java index 2b120d09..93076cc1 100644 --- a/src/test/java/com/github/difflib/text/StringUtilsTest.java +++ b/src/test/java/com/github/difflib/text/StringUtilsTest.java @@ -15,7 +15,6 @@ */ package com.github.difflib.text; -import java.util.Collections; import static org.junit.Assert.*; import org.junit.Test; @@ -41,14 +40,6 @@ public void testNormalize_String() { assertEquals(" test", StringUtils.normalize("\ttest")); } - /** - * Test of normalize method, of class StringUtils. - */ - @Test - public void testNormalize_List() { - assertEquals(Collections.singletonList(" test"), StringUtils.normalize(Collections.singletonList("\ttest"))); - } - /** * Test of wrapText method, of class StringUtils. */ From a8d968cc1dc3a1363eed00e6b8bbd7d794d4af81 Mon Sep 17 00:00:00 2001 From: wumpz Date: Tue, 7 May 2019 09:57:52 +0200 Subject: [PATCH 036/266] added some documentation --- .../github/difflib/text/DiffRowGenerator.java | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/src/main/java/com/github/difflib/text/DiffRowGenerator.java index c2734211..90babc71 100644 --- a/src/main/java/com/github/difflib/text/DiffRowGenerator.java +++ b/src/main/java/com/github/difflib/text/DiffRowGenerator.java @@ -400,7 +400,8 @@ public Builder ignoreWhiteSpaces(boolean val) { } /** - * Give the originial old and new text lines to Diffrow without any additional processing. + * Give the originial old and new text lines to Diffrow without any additional processing and without any tags to + * highlight the change. * * @param val the value to set. Default: false. * @return builder with configured reportLinesUnWrapped parameter @@ -433,7 +434,7 @@ public Builder newTag(Function generator) { } /** - * Set the column with of generated lines of original and revised texts. + * Set the column width of generated lines of original and revised texts. * * @param width the width to set. Making it < 0 doesn't have any sense. Default 80. @return builder with config * ured ignoreBlankLines parameter @@ -466,19 +467,38 @@ public Builder mergeOriginalRevised(boolean mergeOriginalRevised) { } /** - * Per default each character is separatly processed. This variant introduces processing by word, which should - * deliver no in word changes. + * Per default each character is separatly processed. This variant introduces processing by word, which does not + * deliver in word changes. Therefore the whole word will be tagged as changed: + * + * 
+         * false:    (aBa : aba) --  changed: a(B)a : a(b)a
+         * true:     (aBa : aba) --  changed: (aBa) : (aba)
+         *
*/ public Builder inlineDiffByWord(boolean inlineDiffByWord) { inlineDiffSplitter = inlineDiffByWord ? SPLITTER_BY_WORD : SPLITTER_BY_CHARACTER; return this; } + /** + * To provide some customized splitting a splitter can be provided. Here someone could think about sentence splitter, + * comma splitter or stuff like that. + * + * @param inlineDiffSplitter + * @return + */ public Builder inlineDiffBySplitter(Function> inlineDiffSplitter) { this.inlineDiffSplitter = inlineDiffSplitter; return this; } + /** + * By default DiffRowGenerator preprocesses lines for HTML output. Tabs and special HTML characters like "<" + * are replaced with its encoded value. To change this you can provide a customized line normalizer here. + * + * @param lineNormalizer + * @return + */ public Builder lineNormalizer(Function lineNormalizer) { this.lineNormalizer = lineNormalizer; return this; From a34c185a44a391626c40a9c6f8d3a331a2dfc598 Mon Sep 17 00:00:00 2001 From: wumpz Date: Wed, 8 May 2019 23:31:52 +0200 Subject: [PATCH 037/266] --- .../unifieddiff/UnifiedDiffWriter.java | 52 +++++++++---------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java index 46b84ac1..004d914d 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java @@ -83,7 +83,7 @@ public static void write(UnifiedDiff diff, Consumer writer) throws IOExc // if it isn't, output the current set, // then create a new set and add the current Delta to // it. - processDeltas(writer, originalLines, deltas, contextSize); + processDeltas(writer, deltas); deltas.clear(); deltas.add(nextDelta); } @@ -92,7 +92,7 @@ public static void write(UnifiedDiff diff, Consumer writer) throws IOExc } // don't forget to process the last set of Deltas - processDeltas(writer, originalLines, deltas, contextSize); + processDeltas(writer, deltas); } if (diff.getTail() != null) { @@ -102,8 +102,7 @@ public static void write(UnifiedDiff diff, Consumer writer) throws IOExc } private static void processDeltas(Consumer writer, - List origLines, - List> deltas, int contextSize) { + List> deltas) { List buffer = new ArrayList<>(); int origTotal = 0; // counter for total lines output from Original int revTotal = 0; // counter for total lines output from Original @@ -112,29 +111,28 @@ private static void processDeltas(Consumer writer, AbstractDelta curDelta = deltas.get(0); // NOTE: +1 to overcome the 0-offset Position - int origStart = curDelta.getSource().getPosition() + 1 - contextSize; + int origStart = curDelta.getSource().getPosition() + 1; if (origStart < 1) { origStart = 1; } - int revStart = curDelta.getTarget().getPosition() + 1 - contextSize; + int revStart = curDelta.getTarget().getPosition() + 1; if (revStart < 1) { revStart = 1; } // find the start of the wrapper context code - int contextStart = curDelta.getSource().getPosition() - contextSize; + int contextStart = curDelta.getSource().getPosition(); if (contextStart < 0) { contextStart = 0; // clamp to the start of the file } - // output the context before the first Delta - for (line = contextStart; line < curDelta.getSource().getPosition(); line++) { // - buffer.add(" " + origLines.get(line)); - origTotal++; - revTotal++; - } - +// // output the context before the first Delta +// for (line = contextStart; line < curDelta.getSource().getPosition(); line++) { // +// buffer.add(" " + curDelta.getSource().getLines().get(line - contextStart)); +// origTotal++; +// revTotal++; +// } // output the first Delta getDeltaText(txt -> buffer.add(txt), curDelta); origTotal += curDelta.getSource().getLines().size(); @@ -145,13 +143,13 @@ private static void processDeltas(Consumer writer, AbstractDelta nextDelta = deltas.get(deltaIndex); int intermediateStart = curDelta.getSource().getPosition() + curDelta.getSource().getLines().size(); - for (line = intermediateStart; line < nextDelta.getSource() - .getPosition(); line++) { - // output the code between the last Delta and this one - buffer.add(" " + origLines.get(line)); - origTotal++; - revTotal++; - } +// for (line = intermediateStart; line < nextDelta.getSource() +// .getPosition(); line++) { +// // output the code between the last Delta and this one +// buffer.add(" " + origLines.get(line)); +// origTotal++; +// revTotal++; +// } getDeltaText(txt -> buffer.add(txt), nextDelta); // output the Delta origTotal += nextDelta.getSource().getLines().size(); revTotal += nextDelta.getTarget().getLines().size(); @@ -162,12 +160,12 @@ private static void processDeltas(Consumer writer, // Now output the post-Delta context code, clamping the end of the file contextStart = curDelta.getSource().getPosition() + curDelta.getSource().getLines().size(); - for (line = contextStart; (line < (contextStart + contextSize)) - && (line < origLines.size()); line++) { - buffer.add(" " + origLines.get(line)); - origTotal++; - revTotal++; - } +// for (line = contextStart; (line < (contextStart + contextSize)) +// && (line < origLines.size()); line++) { +// buffer.add(" " + origLines.get(line)); +// origTotal++; +// revTotal++; +// } // Create and insert the block header, conforming to the Unified Diff // standard From 16cd9c6484e4625f6e3f245e5785067dad586b59 Mon Sep 17 00:00:00 2001 From: wumpz Date: Wed, 5 Jun 2019 00:05:40 +0200 Subject: [PATCH 038/266] --- .../unifieddiff/UnifiedDiffReader.java | 12 +- .../unifieddiff/UnifiedDiffWriter.java | 49 +++---- .../difflib/GenerateUnifiedDiffTest.java | 2 +- .../unifieddiff/UnifiedDiffRoundTripTest.java | 134 ++++++++++++++++++ .../unifieddiff/UnifiedDiffWriterTest.java | 4 +- 5 files changed, 168 insertions(+), 33 deletions(-) create mode 100644 src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java index 9126ad78..94841e1c 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java @@ -132,7 +132,7 @@ private void initFileIfNecessary() { } } - public void processDiff(MatchResult match, String line) { + private void processDiff(MatchResult match, String line) { initFileIfNecessary(); LOG.log(Level.INFO, "start {0}", line); String[] fromTo = parseFileNames(READER.lastLine()); @@ -158,23 +158,23 @@ private void finalizeChunk() { } } - public void processNormalLine(MatchResult match, String line) { + private void processNormalLine(MatchResult match, String line) { String cline = line.substring(1); originalTxt.add(cline); revisedTxt.add(cline); } - public void processAddLine(MatchResult match, String line) { + private void processAddLine(MatchResult match, String line) { String cline = line.substring(1); revisedTxt.add(cline); } - public void processDelLine(MatchResult match, String line) { + private void processDelLine(MatchResult match, String line) { String cline = line.substring(1); originalTxt.add(cline); } - public void processChunk(MatchResult match, String chunkStart) { + private void processChunk(MatchResult match, String chunkStart) { finalizeChunk(); old_ln = match.group(1) == null ? 1 : Integer.parseInt(match.group(1)); new_ln = match.group(3) == null ? 1 : Integer.parseInt(match.group(3)); @@ -186,7 +186,7 @@ public void processChunk(MatchResult match, String chunkStart) { } } - public void processIndex(MatchResult match, String line) { + private void processIndex(MatchResult match, String line) { initFileIfNecessary(); LOG.log(Level.INFO, "index {0}", line); actualFile.setIndex(line.substring(6)); diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java index 004d914d..5ed92f66 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java @@ -21,28 +21,29 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; +import java.util.function.Function; import java.util.logging.Level; import java.util.logging.Logger; /** - * + * @todo use an instance to store contextSize and originalLinesProvider. * @author Tobias Warneke (t.warneke@gmx.net) */ public class UnifiedDiffWriter { private static final Logger LOG = Logger.getLogger(UnifiedDiffWriter.class.getName()); - public static void write(UnifiedDiff diff, Writer writer) throws IOException { - write(diff, line -> { + public static void write(UnifiedDiff diff, Function> originalLinesProvider, Writer writer, int contextSize) throws IOException { + write(diff, originalLinesProvider, line -> { try { writer.append(line).append("\n"); } catch (IOException ex) { LOG.log(Level.SEVERE, null, ex); } - }); + }, contextSize); } - public static void write(UnifiedDiff diff, Consumer writer) throws IOException { + public static void write(UnifiedDiff diff, Function> originalLinesProvider, Consumer writer, int contextSize) throws IOException { writer.accept(diff.getHeader()); for (UnifiedDiffFile file : diff.getFiles()) { @@ -57,14 +58,13 @@ public static void write(UnifiedDiff diff, Consumer writer) throws IOExc writer.accept("+++ " + file.getToFile()); } + List originalLines = originalLinesProvider.apply(file.getFromFile()); + List> patchDeltas = new ArrayList<>( file.getPatch().getDeltas()); List> deltas = new ArrayList<>(); - int contextSize = 0; - List originalLines = new ArrayList<>(); - AbstractDelta delta = patchDeltas.get(0); deltas.add(delta); // add the first Delta to the current set // if there's more than 1 Delta, we may need to output them together @@ -83,7 +83,7 @@ public static void write(UnifiedDiff diff, Consumer writer) throws IOExc // if it isn't, output the current set, // then create a new set and add the current Delta to // it. - processDeltas(writer, deltas); + processDeltas(writer, originalLines, deltas, contextSize); deltas.clear(); deltas.add(nextDelta); } @@ -92,7 +92,7 @@ public static void write(UnifiedDiff diff, Consumer writer) throws IOExc } // don't forget to process the last set of Deltas - processDeltas(writer, deltas); + processDeltas(writer, originalLines, deltas, contextSize); } if (diff.getTail() != null) { @@ -102,7 +102,8 @@ public static void write(UnifiedDiff diff, Consumer writer) throws IOExc } private static void processDeltas(Consumer writer, - List> deltas) { + List origLines, List> deltas, + int contextSize) { List buffer = new ArrayList<>(); int origTotal = 0; // counter for total lines output from Original int revTotal = 0; // counter for total lines output from Original @@ -143,13 +144,13 @@ private static void processDeltas(Consumer writer, AbstractDelta nextDelta = deltas.get(deltaIndex); int intermediateStart = curDelta.getSource().getPosition() + curDelta.getSource().getLines().size(); -// for (line = intermediateStart; line < nextDelta.getSource() -// .getPosition(); line++) { -// // output the code between the last Delta and this one -// buffer.add(" " + origLines.get(line)); -// origTotal++; -// revTotal++; -// } + for (line = intermediateStart; line < nextDelta.getSource() + .getPosition(); line++) { + // output the code between the last Delta and this one + buffer.add(" " + origLines.get(line)); + origTotal++; + revTotal++; + } getDeltaText(txt -> buffer.add(txt), nextDelta); // output the Delta origTotal += nextDelta.getSource().getLines().size(); revTotal += nextDelta.getTarget().getLines().size(); @@ -160,12 +161,12 @@ private static void processDeltas(Consumer writer, // Now output the post-Delta context code, clamping the end of the file contextStart = curDelta.getSource().getPosition() + curDelta.getSource().getLines().size(); -// for (line = contextStart; (line < (contextStart + contextSize)) -// && (line < origLines.size()); line++) { -// buffer.add(" " + origLines.get(line)); -// origTotal++; -// revTotal++; -// } + for (line = contextStart; (line < (contextStart + contextSize)) + && (line < origLines.size()); line++) { + buffer.add(" " + origLines.get(line)); + origTotal++; + revTotal++; + } // Create and insert the block header, conforming to the Unified Diff // standard diff --git a/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java b/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java index 49497e33..3fb2082a 100644 --- a/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java +++ b/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java @@ -16,7 +16,7 @@ public class GenerateUnifiedDiffTest { - private static List fileToLines(String filename) throws FileNotFoundException, IOException { + public static List fileToLines(String filename) throws FileNotFoundException, IOException { List lines = new ArrayList<>(); String line = ""; try (BufferedReader in = new BufferedReader(new FileReader(filename))) { diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java new file mode 100644 index 00000000..f873795d --- /dev/null +++ b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java @@ -0,0 +1,134 @@ +package com.github.difflib.unifieddiff; + +import com.github.difflib.DiffUtils; +import com.github.difflib.algorithm.DiffException; +import com.github.difflib.patch.Patch; +import java.io.BufferedReader; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.junit.Test; + +public class UnifiedDiffRoundTripTest { + + public static List fileToLines(String filename) throws FileNotFoundException, IOException { + List lines = new ArrayList<>(); + String line = ""; + try (BufferedReader in = new BufferedReader(new FileReader(filename))) { + while ((line = in.readLine()) != null) { + lines.add(line); + } + } + return lines; + } + +// @Test +// public void testGenerateUnified() throws DiffException, IOException { +// List origLines = fileToLines(TestConstants.MOCK_FOLDER + "original.txt"); +// List revLines = fileToLines(TestConstants.MOCK_FOLDER + "revised.txt"); +// +// verify(origLines, revLines, "original.txt", "revised.txt"); +// } +// +// @Test +// public void testGenerateUnifiedWithOneDelta() throws DiffException, IOException { +// List origLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_original.txt"); +// List revLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_revised.txt"); +// +// verify(origLines, revLines, "one_delta_test_original.txt", "one_delta_test_revised.txt"); +// } + @Test + public void testGenerateUnifiedDiffWithoutAnyDeltas() throws DiffException, IOException { + List test = Arrays.asList("abc"); + Patch patch = DiffUtils.diff(test, test); + StringWriter writer = new StringWriter(); + + UnifiedDiffWriter.write( + UnifiedDiff.from("header", "tail", UnifiedDiffFile.from("abc", "abc", patch)), + name -> test, + writer, 0); + + System.out.println(writer); + } + +// @Test +// public void testDiff_Issue10() throws IOException { +// final List baseLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_base.txt"); +// final List patchLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_patch.txt"); +// final Patch p = UnifiedDiffUtils.parseUnifiedDiff(patchLines); +// try { +// DiffUtils.patch(baseLines, p); +// } catch (PatchFailedException e) { +// fail(e.getMessage()); +// } +// } +// +// /** +// * Issue 12 +// */ +// @Test +// public void testPatchWithNoDeltas() throws DiffException, IOException { +// final List lines1 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_1.txt"); +// final List lines2 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_2.txt"); +// verify(lines1, lines2, "issue11_1.txt", "issue11_2.txt"); +// } +// +// @Test +// public void testDiff5() throws DiffException, IOException { +// final List lines1 = fileToLines(TestConstants.MOCK_FOLDER + "5A.txt"); +// final List lines2 = fileToLines(TestConstants.MOCK_FOLDER + "5B.txt"); +// verify(lines1, lines2, "5A.txt", "5B.txt"); +// } +// +// /** +// * Issue 19 +// */ +// @Test +// public void testDiffWithHeaderLineInText() throws DiffException { +// List original = new ArrayList<>(); +// List revised = new ArrayList<>(); +// +// original.add("test line1"); +// original.add("test line2"); +// original.add("test line 4"); +// original.add("test line 5"); +// +// revised.add("test line1"); +// revised.add("test line2"); +// revised.add("@@ -2,6 +2,7 @@"); +// revised.add("test line 4"); +// revised.add("test line 5"); +// +// Patch patch = DiffUtils.diff(original, revised); +// List udiff = UnifiedDiffUtils.generateUnifiedDiff("original", "revised", +// original, patch, 10); +// UnifiedDiffUtils.parseUnifiedDiff(udiff); +// } +// +// private void verify(List origLines, List revLines, +// String originalFile, String revisedFile) throws DiffException { +// Patch patch = DiffUtils.diff(origLines, revLines); +// List unifiedDiff = UnifiedDiffUtils.generateUnifiedDiff(originalFile, revisedFile, +// origLines, patch, 10); +// +// Patch fromUnifiedPatch = UnifiedDiffUtils.parseUnifiedDiff(unifiedDiff); +// List patchedLines; +// try { +// patchedLines = fromUnifiedPatch.applyTo(origLines); +// assertEquals(revLines.size(), patchedLines.size()); +// for (int i = 0; i < revLines.size(); i++) { +// String l1 = revLines.get(i); +// String l2 = patchedLines.get(i); +// if (!l1.equals(l2)) { +// fail("Line " + (i + 1) + " of the patched file did not match the revised original"); +// } +// } +// } catch (PatchFailedException e) { +// fail(e.getMessage()); +// } +// } +} diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java index 782b35d7..1972ab39 100644 --- a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java +++ b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java @@ -40,8 +40,8 @@ public void testWrite() throws URISyntaxException, IOException { UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(new ByteArrayInputStream(str.getBytes())); StringWriter writer = new StringWriter(); - UnifiedDiffWriter.write(diff, writer); - System.out.println(writer.toString()); +// UnifiedDiffWriter.write(diff, writer); +// System.out.println(writer.toString()); } static String readFile(URI path, Charset encoding) From 7d620c825c57115541046252f8330524398791f1 Mon Sep 17 00:00:00 2001 From: wumpz Date: Wed, 5 Jun 2019 00:10:02 +0200 Subject: [PATCH 039/266] --- .../unifieddiff/UnifiedDiffWriter.java | 56 ++++++++++--------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java index 5ed92f66..8af5d9e8 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java @@ -63,36 +63,38 @@ public static void write(UnifiedDiff diff, Function> origin List> patchDeltas = new ArrayList<>( file.getPatch().getDeltas()); - List> deltas = new ArrayList<>(); - - AbstractDelta delta = patchDeltas.get(0); - deltas.add(delta); // add the first Delta to the current set - // if there's more than 1 Delta, we may need to output them together - if (patchDeltas.size() > 1) { - for (int i = 1; i < patchDeltas.size(); i++) { - int position = delta.getSource().getPosition(); - - // Check if the next Delta is too close to the current - // position. - // And if it is, add it to the current set - AbstractDelta nextDelta = patchDeltas.get(i); - if ((position + delta.getSource().size() + contextSize) >= (nextDelta - .getSource().getPosition() - contextSize)) { - deltas.add(nextDelta); - } else { - // if it isn't, output the current set, - // then create a new set and add the current Delta to - // it. - processDeltas(writer, originalLines, deltas, contextSize); - deltas.clear(); - deltas.add(nextDelta); + if (!patchDeltas.isEmpty()) { + List> deltas = new ArrayList<>(); + + AbstractDelta delta = patchDeltas.get(0); + deltas.add(delta); // add the first Delta to the current set + // if there's more than 1 Delta, we may need to output them together + if (patchDeltas.size() > 1) { + for (int i = 1; i < patchDeltas.size(); i++) { + int position = delta.getSource().getPosition(); + + // Check if the next Delta is too close to the current + // position. + // And if it is, add it to the current set + AbstractDelta nextDelta = patchDeltas.get(i); + if ((position + delta.getSource().size() + contextSize) >= (nextDelta + .getSource().getPosition() - contextSize)) { + deltas.add(nextDelta); + } else { + // if it isn't, output the current set, + // then create a new set and add the current Delta to + // it. + processDeltas(writer, originalLines, deltas, contextSize); + deltas.clear(); + deltas.add(nextDelta); + } + delta = nextDelta; } - delta = nextDelta; - } + } + // don't forget to process the last set of Deltas + processDeltas(writer, originalLines, deltas, contextSize); } - // don't forget to process the last set of Deltas - processDeltas(writer, originalLines, deltas, contextSize); } if (diff.getTail() != null) { From d30d9ca23a17f60cdc703b90c405f1887b11e4cd Mon Sep 17 00:00:00 2001 From: wumpz Date: Wed, 5 Jun 2019 23:28:13 +0200 Subject: [PATCH 040/266] --- .../unifieddiff/UnifiedDiffWriter.java | 18 ++--- .../difflib/GenerateUnifiedDiffTest.java | 3 + .../unifieddiff/UnifiedDiffRoundTripTest.java | 72 +++++++++++-------- 3 files changed, 55 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java index 8af5d9e8..c61f83bc 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java @@ -114,28 +114,28 @@ private static void processDeltas(Consumer writer, AbstractDelta curDelta = deltas.get(0); // NOTE: +1 to overcome the 0-offset Position - int origStart = curDelta.getSource().getPosition() + 1; + int origStart = curDelta.getSource().getPosition() + 1 - contextSize; if (origStart < 1) { origStart = 1; } - int revStart = curDelta.getTarget().getPosition() + 1; + int revStart = curDelta.getTarget().getPosition() + 1 - contextSize; if (revStart < 1) { revStart = 1; } // find the start of the wrapper context code - int contextStart = curDelta.getSource().getPosition(); + int contextStart = curDelta.getSource().getPosition() - contextSize; if (contextStart < 0) { contextStart = 0; // clamp to the start of the file } -// // output the context before the first Delta -// for (line = contextStart; line < curDelta.getSource().getPosition(); line++) { // -// buffer.add(" " + curDelta.getSource().getLines().get(line - contextStart)); -// origTotal++; -// revTotal++; -// } + // output the context before the first Delta + for (line = contextStart; line < curDelta.getSource().getPosition(); line++) { // + buffer.add(" " + origLines.get(line)); + origTotal++; + revTotal++; + } // output the first Delta getDeltaText(txt -> buffer.add(txt), curDelta); origTotal += curDelta.getSource().getLines().size(); diff --git a/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java b/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java index 3fb2082a..c6bfc4ec 100644 --- a/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java +++ b/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import static java.util.stream.Collectors.joining; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import org.junit.Test; @@ -110,6 +111,8 @@ private void verify(List origLines, List revLines, List unifiedDiff = UnifiedDiffUtils.generateUnifiedDiff(originalFile, revisedFile, origLines, patch, 10); + System.out.println(unifiedDiff.stream().collect(joining("\n"))); + Patch fromUnifiedPatch = UnifiedDiffUtils.parseUnifiedDiff(unifiedDiff); List patchedLines; try { diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java index f873795d..0a982033 100644 --- a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java +++ b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java @@ -1,9 +1,12 @@ package com.github.difflib.unifieddiff; import com.github.difflib.DiffUtils; +import com.github.difflib.TestConstants; import com.github.difflib.algorithm.DiffException; import com.github.difflib.patch.Patch; +import com.github.difflib.patch.PatchFailedException; import java.io.BufferedReader; +import java.io.ByteArrayInputStream; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; @@ -11,6 +14,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import org.junit.Test; public class UnifiedDiffRoundTripTest { @@ -26,13 +31,13 @@ public static List fileToLines(String filename) throws FileNotFoundExcep return lines; } -// @Test -// public void testGenerateUnified() throws DiffException, IOException { -// List origLines = fileToLines(TestConstants.MOCK_FOLDER + "original.txt"); -// List revLines = fileToLines(TestConstants.MOCK_FOLDER + "revised.txt"); -// -// verify(origLines, revLines, "original.txt", "revised.txt"); -// } + @Test + public void testGenerateUnified() throws DiffException, IOException { + List origLines = fileToLines(TestConstants.MOCK_FOLDER + "original.txt"); + List revLines = fileToLines(TestConstants.MOCK_FOLDER + "revised.txt"); + + verify(origLines, revLines, "original.txt", "revised.txt"); + } // // @Test // public void testGenerateUnifiedWithOneDelta() throws DiffException, IOException { @@ -41,6 +46,7 @@ public static List fileToLines(String filename) throws FileNotFoundExcep // // verify(origLines, revLines, "one_delta_test_original.txt", "one_delta_test_revised.txt"); // } + @Test public void testGenerateUnifiedDiffWithoutAnyDeltas() throws DiffException, IOException { List test = Arrays.asList("abc"); @@ -109,26 +115,34 @@ public void testGenerateUnifiedDiffWithoutAnyDeltas() throws DiffException, IOEx // UnifiedDiffUtils.parseUnifiedDiff(udiff); // } // -// private void verify(List origLines, List revLines, -// String originalFile, String revisedFile) throws DiffException { -// Patch patch = DiffUtils.diff(origLines, revLines); -// List unifiedDiff = UnifiedDiffUtils.generateUnifiedDiff(originalFile, revisedFile, -// origLines, patch, 10); -// -// Patch fromUnifiedPatch = UnifiedDiffUtils.parseUnifiedDiff(unifiedDiff); -// List patchedLines; -// try { -// patchedLines = fromUnifiedPatch.applyTo(origLines); -// assertEquals(revLines.size(), patchedLines.size()); -// for (int i = 0; i < revLines.size(); i++) { -// String l1 = revLines.get(i); -// String l2 = patchedLines.get(i); -// if (!l1.equals(l2)) { -// fail("Line " + (i + 1) + " of the patched file did not match the revised original"); -// } -// } -// } catch (PatchFailedException e) { -// fail(e.getMessage()); -// } -// } + private void verify(List origLines, List revLines, + String originalFile, String revisedFile) throws DiffException, IOException { + Patch patch = DiffUtils.diff(origLines, revLines); + + StringWriter writer = new StringWriter(); + UnifiedDiffWriter.write( + UnifiedDiff.from("header", "tail", UnifiedDiffFile.from(originalFile, revisedFile, patch)), + name -> origLines, + writer, 10); + + System.out.println(writer.toString()); + + UnifiedDiff unifiedDiff = UnifiedDiffReader.parseUnifiedDiff(new ByteArrayInputStream(writer.toString().getBytes())); + + Patch fromUnifiedPatch = unifiedDiff.getFiles().get(0).getPatch(); + List patchedLines; + try { + patchedLines = fromUnifiedPatch.applyTo(origLines); + assertEquals(revLines.size(), patchedLines.size()); + for (int i = 0; i < revLines.size(); i++) { + String l1 = revLines.get(i); + String l2 = patchedLines.get(i); + if (!l1.equals(l2)) { + fail("Line " + (i + 1) + " of the patched file did not match the revised original"); + } + } + } catch (PatchFailedException e) { + fail(e.getMessage()); + } + } } From a018e9c432056e4ee1e79474aa7af6591ae2f9d7 Mon Sep 17 00:00:00 2001 From: wumpz Date: Thu, 6 Jun 2019 00:01:22 +0200 Subject: [PATCH 041/266] --- .../unifieddiff/UnifiedDiffWriter.java | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java index c61f83bc..c9488f9c 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java @@ -47,23 +47,22 @@ public static void write(UnifiedDiff diff, Function> origin writer.accept(diff.getHeader()); for (UnifiedDiffFile file : diff.getFiles()) { - writeOrNothing(writer, file.getDiffCommand()); - if (file.getIndex() != null) { - writer.accept("index " + file.getIndex()); - } - if (file.getFromFile() != null) { - writer.accept("--- " + file.getFromFile()); - } - if (file.getToFile() != null) { - writer.accept("+++ " + file.getToFile()); - } - - List originalLines = originalLinesProvider.apply(file.getFromFile()); - List> patchDeltas = new ArrayList<>( file.getPatch().getDeltas()); - if (!patchDeltas.isEmpty()) { + writeOrNothing(writer, file.getDiffCommand()); + if (file.getIndex() != null) { + writer.accept("index " + file.getIndex()); + } + if (file.getFromFile() != null) { + writer.accept("--- " + file.getFromFile()); + } + if (file.getToFile() != null) { + writer.accept("+++ " + file.getToFile()); + } + + List originalLines = originalLinesProvider.apply(file.getFromFile()); + List> deltas = new ArrayList<>(); AbstractDelta delta = patchDeltas.get(0); From 630eed340b0abe4714d4944411dd6079bea4823e Mon Sep 17 00:00:00 2001 From: wumpz Date: Fri, 7 Jun 2019 00:27:54 +0200 Subject: [PATCH 042/266] --- .../difflib/unifieddiff/UnifiedDiff.java | 13 ++ .../unifieddiff/UnifiedDiffReader.java | 15 +- .../unifieddiff/UnifiedDiffReaderTest.java | 19 +++ .../unifieddiff/UnifiedDiffRoundTripTest.java | 145 ++++++++++-------- 4 files changed, 125 insertions(+), 67 deletions(-) diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java index e1a52112..bdabc589 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java @@ -15,9 +15,11 @@ */ package com.github.difflib.unifieddiff; +import com.github.difflib.patch.PatchFailedException; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.function.Predicate; /** * @@ -53,6 +55,17 @@ public String getTail() { return tail; } + public List spplyPatchTo(Predicate findFile, List originalLines) throws PatchFailedException { + UnifiedDiffFile file = files.stream() + .filter(diff -> findFile.test(diff.getFromFile())) + .findFirst().orElse(null); + if (file != null) { + return file.getPatch().applyTo(originalLines); + } else { + return originalLines; + } + } + public static UnifiedDiff from(String header, String tail, UnifiedDiffFile... files) { UnifiedDiff diff = new UnifiedDiff(); diff.setHeader(header); diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java index 94841e1c..ba4966d1 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java @@ -68,7 +68,7 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException { String tailTxt = ""; while (READER.ready()) { String line = READER.readLine(); - if (line.matches("^\\-\\-\\s+")) { + if (line.equals("--")) { break; } else { LOG.log(Level.INFO, "parsing line {0}", line); @@ -79,8 +79,10 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException { break; } } else { - header = false; - data.setHeader(headerTxt); + if (header) { + header = false; + data.setHeader(headerTxt); + } } } } @@ -114,10 +116,12 @@ private boolean processLine(boolean header, String line) throws UnifiedDiffParse for (UnifiedDiffLine rule : MAIN_PARSER_RULES) { if (header && rule.isStopsHeaderParsing() || !header) { if (rule.processLine(line)) { + LOG.info(" >>> processed rule " + rule.toString()); return true; } } } + LOG.info(" >>> no rule matched " + line); return false; } @@ -241,6 +245,11 @@ public boolean processLine(String line) throws UnifiedDiffParserException { public boolean isStopsHeaderParsing() { return stopsHeaderParsing; } + + @Override + public String toString() { + return "UnifiedDiffLine{" + "pattern=" + pattern + ", stopsHeaderParsing=" + stopsHeaderParsing + '}'; + } } } diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java index ac372fa4..dcd52d78 100644 --- a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java +++ b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java @@ -72,6 +72,17 @@ public void testChunkHeaderParsing2() { assertEquals("189", matcher.group(3)); } + @Test + public void testChunkHeaderParsing3() { + //"^@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@.*$" + Pattern pattern = UnifiedDiffReader.UNIFIED_DIFF_CHUNK_REGEXP; + Matcher matcher = pattern.matcher("@@ -1,27 +1,27 @@"); + + assertTrue(matcher.find()); + assertEquals("1", matcher.group(1)); + assertEquals("1", matcher.group(3)); + } + @Test public void testSimpleParse2() throws IOException { UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(UnifiedDiffReaderTest.class.getResourceAsStream("jsqlparser_patch_1.diff")); @@ -92,4 +103,12 @@ public void testSimpleParse2() throws IOException { assertThat(diff.getTail()).isEqualTo("2.17.1.windows.2\n\n"); } + @Test + public void testSimplePattern() { + Pattern pattern = Pattern.compile("^\\+\\+\\+\\s"); + + Matcher m = pattern.matcher("+++ revised.txt"); + assertTrue(m.find()); + } + } diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java index 0a982033..8c3cb86f 100644 --- a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java +++ b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import static java.util.stream.Collectors.joining; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import org.junit.Test; @@ -38,14 +39,14 @@ public void testGenerateUnified() throws DiffException, IOException { verify(origLines, revLines, "original.txt", "revised.txt"); } -// -// @Test -// public void testGenerateUnifiedWithOneDelta() throws DiffException, IOException { -// List origLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_original.txt"); -// List revLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_revised.txt"); -// -// verify(origLines, revLines, "one_delta_test_original.txt", "one_delta_test_revised.txt"); -// } + + @Test + public void testGenerateUnifiedWithOneDelta() throws DiffException, IOException { + List origLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_original.txt"); + List revLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_revised.txt"); + + verify(origLines, revLines, "one_delta_test_original.txt", "one_delta_test_revised.txt"); + } @Test public void testGenerateUnifiedDiffWithoutAnyDeltas() throws DiffException, IOException { @@ -61,60 +62,71 @@ public void testGenerateUnifiedDiffWithoutAnyDeltas() throws DiffException, IOEx System.out.println(writer); } -// @Test -// public void testDiff_Issue10() throws IOException { -// final List baseLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_base.txt"); -// final List patchLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_patch.txt"); -// final Patch p = UnifiedDiffUtils.parseUnifiedDiff(patchLines); -// try { -// DiffUtils.patch(baseLines, p); -// } catch (PatchFailedException e) { -// fail(e.getMessage()); -// } -// } -// -// /** -// * Issue 12 -// */ -// @Test -// public void testPatchWithNoDeltas() throws DiffException, IOException { -// final List lines1 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_1.txt"); -// final List lines2 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_2.txt"); -// verify(lines1, lines2, "issue11_1.txt", "issue11_2.txt"); -// } -// -// @Test -// public void testDiff5() throws DiffException, IOException { -// final List lines1 = fileToLines(TestConstants.MOCK_FOLDER + "5A.txt"); -// final List lines2 = fileToLines(TestConstants.MOCK_FOLDER + "5B.txt"); -// verify(lines1, lines2, "5A.txt", "5B.txt"); -// } -// -// /** -// * Issue 19 -// */ -// @Test -// public void testDiffWithHeaderLineInText() throws DiffException { -// List original = new ArrayList<>(); -// List revised = new ArrayList<>(); -// -// original.add("test line1"); -// original.add("test line2"); -// original.add("test line 4"); -// original.add("test line 5"); -// -// revised.add("test line1"); -// revised.add("test line2"); -// revised.add("@@ -2,6 +2,7 @@"); -// revised.add("test line 4"); -// revised.add("test line 5"); -// -// Patch patch = DiffUtils.diff(original, revised); -// List udiff = UnifiedDiffUtils.generateUnifiedDiff("original", "revised", -// original, patch, 10); -// UnifiedDiffUtils.parseUnifiedDiff(udiff); -// } -// + @Test + public void testDiff_Issue10() throws IOException { + final List baseLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_base.txt"); + final List patchLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_patch.txt"); + + UnifiedDiff unifiedDiff = UnifiedDiffReader.parseUnifiedDiff( + new ByteArrayInputStream(patchLines.stream().collect(joining("\n")).getBytes()) + ); + + final Patch p = unifiedDiff.getFiles().get(0).getPatch(); + try { + DiffUtils.patch(baseLines, p); + } catch (PatchFailedException e) { + fail(e.getMessage()); + } + } + + /** + * Issue 12 + */ + @Test + public void testPatchWithNoDeltas() throws DiffException, IOException { + final List lines1 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_1.txt"); + final List lines2 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_2.txt"); + verify(lines1, lines2, "issue11_1.txt", "issue11_2.txt"); + } + + @Test + public void testDiff5() throws DiffException, IOException { + final List lines1 = fileToLines(TestConstants.MOCK_FOLDER + "5A.txt"); + final List lines2 = fileToLines(TestConstants.MOCK_FOLDER + "5B.txt"); + verify(lines1, lines2, "5A.txt", "5B.txt"); + } + + /** + * Issue 19 + */ + @Test + public void testDiffWithHeaderLineInText() throws DiffException, IOException { + List original = new ArrayList<>(); + List revised = new ArrayList<>(); + + original.add("test line1"); + original.add("test line2"); + original.add("test line 4"); + original.add("test line 5"); + + revised.add("test line1"); + revised.add("test line2"); + revised.add("@@ -2,6 +2,7 @@"); + revised.add("test line 4"); + revised.add("test line 5"); + + Patch patch = DiffUtils.diff(original, revised); + StringWriter writer = new StringWriter(); + UnifiedDiffWriter.write( + UnifiedDiff.from("header", "tail", UnifiedDiffFile.from("original", "revised", patch)), + name -> original, + writer, 10); + + System.out.println(writer.toString()); + + UnifiedDiff unifiedDiff = UnifiedDiffReader.parseUnifiedDiff(new ByteArrayInputStream(writer.toString().getBytes())); + } + private void verify(List origLines, List revLines, String originalFile, String revisedFile) throws DiffException, IOException { Patch patch = DiffUtils.diff(origLines, revLines); @@ -129,10 +141,15 @@ private void verify(List origLines, List revLines, UnifiedDiff unifiedDiff = UnifiedDiffReader.parseUnifiedDiff(new ByteArrayInputStream(writer.toString().getBytes())); - Patch fromUnifiedPatch = unifiedDiff.getFiles().get(0).getPatch(); List patchedLines; try { - patchedLines = fromUnifiedPatch.applyTo(origLines); +// if (unifiedDiff.getFiles().isEmpty()) { +// patchedLines = new ArrayList<>(origLines); +// } else { +// Patch fromUnifiedPatch = unifiedDiff.getFiles().get(0).getPatch(); +// patchedLines = fromUnifiedPatch.applyTo(origLines); +// } + patchedLines = unifiedDiff.spplyPatchTo(file -> originalFile.equals(file), origLines); assertEquals(revLines.size(), patchedLines.size()); for (int i = 0; i < revLines.size(); i++) { String l1 = revLines.get(i); From 47275578142f5cbd288ed66d0f93bdc6f52a17cd Mon Sep 17 00:00:00 2001 From: wumpz Date: Fri, 7 Jun 2019 00:30:17 +0200 Subject: [PATCH 043/266] --- .../difflib/unifieddiff/package-info.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/main/java/com/github/difflib/unifieddiff/package-info.java diff --git a/src/main/java/com/github/difflib/unifieddiff/package-info.java b/src/main/java/com/github/difflib/unifieddiff/package-info.java new file mode 100644 index 00000000..e412e12f --- /dev/null +++ b/src/main/java/com/github/difflib/unifieddiff/package-info.java @@ -0,0 +1,20 @@ +/* + * Copyright 2019 java-diff-utils. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/** + * This is the fiest test version of a multifile diff parser. The Api is still subject + * of change. + */ +package com.github.difflib.unifieddiff; From 470064735116f1fd3b760139c83951b87c50d4a2 Mon Sep 17 00:00:00 2001 From: wumpz Date: Mon, 10 Jun 2019 00:19:52 +0200 Subject: [PATCH 044/266] --- README.md | 3 +++ .../java/com/github/difflib/unifieddiff/UnifiedDiffReader.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c3c335ac..ce9eb51c 100644 --- a/README.md +++ b/README.md @@ -53,6 +53,9 @@ This is a test ~senctence~**for diffutils**. But it can easily replaced by any other which is better for handing your texts. I have plan to add implementation of some in future. ### Changelog ### + * Version 4.1-SNAPSHOT + * preview of new Unified Diff Reader / Writer. This is not yet feature complete but passes the + tests of the old version. * Version 4.0-SNAPSHOT * moved to organisation **java-diff-utils** * changed groupid to **io.github.java-diff-utils** and artifact id to **java-diff-utils** diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java index ba4966d1..7adccbf8 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java @@ -68,7 +68,7 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException { String tailTxt = ""; while (READER.ready()) { String line = READER.readLine(); - if (line.equals("--")) { + if (line.matches("--\\s*")) { break; } else { LOG.log(Level.INFO, "parsing line {0}", line); From de227395cd6f977f924ec06cd5c1228e67309887 Mon Sep 17 00:00:00 2001 From: wumpz Date: Mon, 10 Jun 2019 00:41:27 +0200 Subject: [PATCH 045/266] Merge master into unified-diff-parser Conflicts: README.md pom.xml --- src/main/java/com/github/difflib/unifieddiff/package-info.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/github/difflib/unifieddiff/package-info.java b/src/main/java/com/github/difflib/unifieddiff/package-info.java index e412e12f..49edc687 100644 --- a/src/main/java/com/github/difflib/unifieddiff/package-info.java +++ b/src/main/java/com/github/difflib/unifieddiff/package-info.java @@ -14,7 +14,7 @@ * limitations under the License. */ /** - * This is the fiest test version of a multifile diff parser. The Api is still subject + * This is the first test version of a multifile diff parser. The Api is still subject * of change. */ package com.github.difflib.unifieddiff; From e520ee2f2015ed75d68754e0273f16e2d8ce476f Mon Sep 17 00:00:00 2001 From: wumpz Date: Mon, 10 Jun 2019 00:43:41 +0200 Subject: [PATCH 046/266] Merge master into unified-diff-parser Conflicts: README.md pom.xml --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d55b058b..520ba856 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ This project uses a custom versioning scheme (and not [Semantic Versioning](http * Exchange `0 += 1` for `0 = 1` in UnifiedDiffUtils * preview of new Unified Diff Reader / Writer. This is not yet feature complete but passes the tests of the old version. + * feel free to issue some change requests for the api. ## [4.0] – 2019-01-09 From 5cc9625275e865a0db105a3cd1eb1edb93a0a001 Mon Sep 17 00:00:00 2001 From: wumpz Date: Sun, 30 Jun 2019 21:05:40 +0200 Subject: [PATCH 047/266] fixes #43 --- README.md | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/README.md b/README.md index 8287302a..3c093342 100644 --- a/README.md +++ b/README.md @@ -80,17 +80,7 @@ Just add the code below to your maven dependencies: io.github.java-diff-utils java-diff-utils -    4.0 - -``` - -Attention. We changed groupid and artifactid. Starting with version 4 you have to use: - -```xml - - io.github.java-diff-utils - java-diff-utils - 4.0-SNAPSHOT + 4.0 ``` From 0c75b43d888dba3703071f1d1d8123e6e7e63b8d Mon Sep 17 00:00:00 2001 From: Tobias Date: Sat, 3 Aug 2019 21:26:01 +0200 Subject: [PATCH 048/266] Update .travis.yml removed oracle jdk --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e68631bc..a4870deb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: java jdk: - - oraclejdk8 + - openjdk8 + - openjdk11 after_success: - - mvn clean \ No newline at end of file + - mvn clean From 69cb8c520ddde8f4708e56d68fc20fb250d1b63d Mon Sep 17 00:00:00 2001 From: Tobias Date: Fri, 9 Aug 2019 11:28:27 +0200 Subject: [PATCH 049/266] Delete ISSUE_TEMPLATE.md --- ISSUE_TEMPLATE.md | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 ISSUE_TEMPLATE.md diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md deleted file mode 100644 index 057f67a4..00000000 --- a/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,17 +0,0 @@ -### Expected Behavior - - -### Actual Behavior - - -### Steps to Reproduce the Problem - - 1. - 1. - 1. - -### Specifications - - - Version: - - Platform: - - Subsystem: From a3663002bb1b467fbb93dd68c36ff8f734cc9a80 Mon Sep 17 00:00:00 2001 From: Tobias Date: Fri, 9 Aug 2019 11:31:03 +0200 Subject: [PATCH 050/266] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 00000000..041b5c51 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,24 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: '' +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Example data +2. simple programm snippet +3. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**System** + - Java version + - Version [e.g. 22] From a40c39667844d87aca9478d1303a75ee512f41a8 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Wed, 14 Aug 2019 23:38:12 +0200 Subject: [PATCH 051/266] --- .../difflib/unifieddiff/UnifiedDiffReader.java | 2 +- .../unifieddiff/UnifiedDiffReaderTest.java | 15 +++++++++++++++ .../difflib/unifieddiff/problem_diff_issue46.diff | 8 ++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue46.diff diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java index 7adccbf8..9ac696c4 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java @@ -46,7 +46,7 @@ public final class UnifiedDiffReader { new UnifiedDiffLine(true, "^index\\s[\\da-zA-Z]+\\.\\.[\\da-zA-Z]+(\\s(\\d+))?$", this::processIndex), new UnifiedDiffLine(true, "^---\\s", this::processFromFile), new UnifiedDiffLine(true, "^\\+\\+\\+\\s", this::processToFile), - new UnifiedDiffLine(false, UNIFIED_DIFF_CHUNK_REGEXP, this::processChunk), + new UnifiedDiffLine(true, UNIFIED_DIFF_CHUNK_REGEXP, this::processChunk), new UnifiedDiffLine("^\\s+", this::processNormalLine), new UnifiedDiffLine("^-", this::processDelLine), new UnifiedDiffLine("^+", this::processAddLine) diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java index dcd52d78..de618ad1 100644 --- a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java +++ b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java @@ -111,4 +111,19 @@ public void testSimplePattern() { assertTrue(m.find()); } + @Test + public void testParseIssue46() throws IOException { + UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff( + UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue46.diff")); +--- comment + System.out.println(diff); + + assertThat(diff.getFiles().size()).isEqualTo(1); + + UnifiedDiffFile file1 = diff.getFiles().get(0); + assertThat(file1.getFromFile()).isEqualTo("src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt"); + assertThat(file1.getPatch().getDeltas().size()).isEqualTo(3); + + assertThat(diff.getTail()).isEqualTo("2.17.1.windows.2\n\n"); + } } diff --git a/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue46.diff b/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue46.diff new file mode 100644 index 00000000..ecb72ae9 --- /dev/null +++ b/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue46.diff @@ -0,0 +1,8 @@ +--- a.vhd 2019-04-18 13:49:39.516149751 +0200 ++++ b.vhd 2019-04-18 11:33:08.372563078 +0200 +@@ -2819,3 +2819,3 @@ +--- some comment +-bla +-bla ++ ++ \ No newline at end of file From 4a5a39cf96c7bd2bc7d80dfb597cd1711bb81590 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Wed, 14 Aug 2019 23:39:30 +0200 Subject: [PATCH 052/266] --- .../com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java index de618ad1..e1dab21c 100644 --- a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java +++ b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java @@ -115,7 +115,7 @@ public void testSimplePattern() { public void testParseIssue46() throws IOException { UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff( UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue46.diff")); ---- comment +-- comment System.out.println(diff); assertThat(diff.getFiles().size()).isEqualTo(1); From bb79a9b4fece71d6f096b8b4369ebe7ba21bc8b8 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Wed, 14 Aug 2019 23:53:55 +0200 Subject: [PATCH 053/266] --- .../com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java index e1dab21c..ec6e0a72 100644 --- a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java +++ b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java @@ -115,7 +115,7 @@ public void testSimplePattern() { public void testParseIssue46() throws IOException { UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff( UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue46.diff")); --- comment + System.out.println(diff); assertThat(diff.getFiles().size()).isEqualTo(1); From 865a46490603c11f71125871d31a0175d19afb79 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Wed, 4 Sep 2019 20:50:56 +0200 Subject: [PATCH 054/266] --- .../java/com/github/difflib/unifieddiff/UnifiedDiffReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java index 9ac696c4..7adccbf8 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java @@ -46,7 +46,7 @@ public final class UnifiedDiffReader { new UnifiedDiffLine(true, "^index\\s[\\da-zA-Z]+\\.\\.[\\da-zA-Z]+(\\s(\\d+))?$", this::processIndex), new UnifiedDiffLine(true, "^---\\s", this::processFromFile), new UnifiedDiffLine(true, "^\\+\\+\\+\\s", this::processToFile), - new UnifiedDiffLine(true, UNIFIED_DIFF_CHUNK_REGEXP, this::processChunk), + new UnifiedDiffLine(false, UNIFIED_DIFF_CHUNK_REGEXP, this::processChunk), new UnifiedDiffLine("^\\s+", this::processNormalLine), new UnifiedDiffLine("^-", this::processDelLine), new UnifiedDiffLine("^+", this::processAddLine) From 5ab1882df87e76a04cb2ea6ea489331c4248cd85 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Wed, 4 Sep 2019 23:19:23 +0200 Subject: [PATCH 055/266] --- .../unifieddiff/UnifiedDiffReader.java | 76 ++++++++++--------- 1 file changed, 42 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java index 7adccbf8..e5e2ae67 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java @@ -41,16 +41,16 @@ public final class UnifiedDiffReader { private final InternalUnifiedDiffReader READER; private final UnifiedDiff data = new UnifiedDiff(); - private final UnifiedDiffLine[] MAIN_PARSER_RULES = new UnifiedDiffLine[]{ - new UnifiedDiffLine(true, "^diff\\s", this::processDiff), - new UnifiedDiffLine(true, "^index\\s[\\da-zA-Z]+\\.\\.[\\da-zA-Z]+(\\s(\\d+))?$", this::processIndex), - new UnifiedDiffLine(true, "^---\\s", this::processFromFile), - new UnifiedDiffLine(true, "^\\+\\+\\+\\s", this::processToFile), - new UnifiedDiffLine(false, UNIFIED_DIFF_CHUNK_REGEXP, this::processChunk), - new UnifiedDiffLine("^\\s+", this::processNormalLine), - new UnifiedDiffLine("^-", this::processDelLine), - new UnifiedDiffLine("^+", this::processAddLine) - }; + + private final UnifiedDiffLine DIFF_COMMAND = new UnifiedDiffLine(true, "^diff\\s", this::processDiff); + private final UnifiedDiffLine INDEX = new UnifiedDiffLine(true, "^index\\s[\\da-zA-Z]+\\.\\.[\\da-zA-Z]+(\\s(\\d+))?$", this::processIndex); + private final UnifiedDiffLine FROM_FILE = new UnifiedDiffLine(true, "^---\\s", this::processFromFile); + private final UnifiedDiffLine TO_FILE = new UnifiedDiffLine(true, "^\\+\\+\\+\\s", this::processToFile); + + private final UnifiedDiffLine CHUNK = new UnifiedDiffLine(false, UNIFIED_DIFF_CHUNK_REGEXP, this::processChunk); + private final UnifiedDiffLine LINE_NORMAL = new UnifiedDiffLine("^\\s+", this::processNormalLine); + private final UnifiedDiffLine LINE_DEL = new UnifiedDiffLine("^-", this::processDelLine); + private final UnifiedDiffLine LINE_ADD = new UnifiedDiffLine("^+", this::processAddLine); private UnifiedDiffFile actualFile; @@ -63,32 +63,37 @@ public final class UnifiedDiffReader { // [/^---\s/, from_file], [/^\+\+\+\s/, to_file], [/^@@\s+\-(\d+),?(\d+)?\s+\+(\d+),?(\d+)?\s@@/, chunk], // [/^-/, del], [/^\+/, add], [/^\\ No newline at end of file$/, eof]]; private UnifiedDiff parse() throws IOException, UnifiedDiffParserException { - boolean header = true; String headerTxt = ""; - String tailTxt = ""; + LOG.log(Level.INFO, "header parsing"); + String line = null; while (READER.ready()) { - String line = READER.readLine(); - if (line.matches("--\\s*")) { + line = READER.readLine(); + LOG.log(Level.INFO, "parsing line {0}", line); + if (DIFF_COMMAND.validLine(line) || INDEX.validLine(line) + || FROM_FILE.validLine(line) || TO_FILE.validLine(line)) { break; } else { - LOG.log(Level.INFO, "parsing line {0}", line); - if (processLine(header, line) == false) { - if (header) { - headerTxt += line + "\n"; - } else { - break; - } - } else { - if (header) { - header = false; - data.setHeader(headerTxt); - } + headerTxt += line + "\n"; + } + } + data.setHeader(headerTxt); + + while (line != null) { + if (!CHUNK.validLine(line)) { + if (processLine(line, DIFF_COMMAND, INDEX, FROM_FILE, TO_FILE) == false) { + throw new UnifiedDiffParserException("parsing error at line " + line); + } + } else { + if (processLine(line, CHUNK) == false) { + throw new UnifiedDiffParserException("parsing error at line " + line); } } + line = READER.readLine(); } finalizeChunk(); + String tailTxt = ""; while (READER.ready()) { tailTxt += READER.readLine() + "\n"; } @@ -112,13 +117,11 @@ public static UnifiedDiff parseUnifiedDiff(InputStream stream) throws IOExceptio return parser.parse(); } - private boolean processLine(boolean header, String line) throws UnifiedDiffParserException { - for (UnifiedDiffLine rule : MAIN_PARSER_RULES) { - if (header && rule.isStopsHeaderParsing() || !header) { - if (rule.processLine(line)) { - LOG.info(" >>> processed rule " + rule.toString()); - return true; - } + private boolean processLine(String line, UnifiedDiffLine... rules) throws UnifiedDiffParserException { + for (UnifiedDiffLine rule : rules) { + if (rule.processLine(line)) { + LOG.info(" >>> processed rule " + rule.toString()); + return true; } } LOG.info(" >>> no rule matched " + line); @@ -210,7 +213,7 @@ private String extractFileName(String line) { return line.substring(4).replaceFirst("^(a|b)\\/", ""); } - class UnifiedDiffLine { + final class UnifiedDiffLine { private final Pattern pattern; private final BiConsumer command; @@ -232,6 +235,11 @@ public UnifiedDiffLine(boolean stopsHeaderParsing, Pattern pattern, BiConsumer Date: Wed, 4 Sep 2019 23:46:58 +0200 Subject: [PATCH 056/266] --- .../unifieddiff/UnifiedDiffReader.java | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java index e5e2ae67..4879cd7e 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java @@ -24,6 +24,7 @@ import java.io.Reader; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.function.BiConsumer; import java.util.logging.Level; import java.util.logging.Logger; @@ -80,13 +81,9 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException { while (line != null) { if (!CHUNK.validLine(line)) { - if (processLine(line, DIFF_COMMAND, INDEX, FROM_FILE, TO_FILE) == false) { - throw new UnifiedDiffParserException("parsing error at line " + line); - } + processLine(line, DIFF_COMMAND, INDEX, FROM_FILE, TO_FILE); } else { - if (processLine(line, CHUNK) == false) { - throw new UnifiedDiffParserException("parsing error at line " + line); - } + processLine(line, CHUNK); } line = READER.readLine(); } @@ -117,15 +114,15 @@ public static UnifiedDiff parseUnifiedDiff(InputStream stream) throws IOExceptio return parser.parse(); } - private boolean processLine(String line, UnifiedDiffLine... rules) throws UnifiedDiffParserException { + private void processLine(String line, UnifiedDiffLine... rules) throws UnifiedDiffParserException { for (UnifiedDiffLine rule : rules) { if (rule.processLine(line)) { LOG.info(" >>> processed rule " + rule.toString()); - return true; + return; } } LOG.info(" >>> no rule matched " + line); - return false; + throw new UnifiedDiffParserException("parsing error at line " + line); } private void initFileIfNecessary() { @@ -151,7 +148,9 @@ private void processDiff(MatchResult match, String line) { private List originalTxt = new ArrayList<>(); private List revisedTxt = new ArrayList<>(); private int old_ln; + private int old_size; private int new_ln; + private int new_size; private void finalizeChunk() { if (!originalTxt.isEmpty() || !revisedTxt.isEmpty()) { @@ -183,8 +182,10 @@ private void processDelLine(MatchResult match, String line) { private void processChunk(MatchResult match, String chunkStart) { finalizeChunk(); - old_ln = match.group(1) == null ? 1 : Integer.parseInt(match.group(1)); - new_ln = match.group(3) == null ? 1 : Integer.parseInt(match.group(3)); + old_ln = toInteger(match, 1, 1); + old_size = toInteger(match, 2, 0); + new_ln = toInteger(match, 3, 1); + new_size = toInteger(match, 4, 0); if (old_ln == 0) { old_ln = 1; } @@ -193,6 +194,10 @@ private void processChunk(MatchResult match, String chunkStart) { } } + private static Integer toInteger(MatchResult match, int group, int defValue) throws NumberFormatException { + return Integer.valueOf(Objects.toString( match.group(group) , "" + defValue)); + } + private void processIndex(MatchResult match, String line) { initFileIfNecessary(); LOG.log(Level.INFO, "index {0}", line); From a46d44643f8e3368abac0fdc92822105884e6279 Mon Sep 17 00:00:00 2001 From: wumpz Date: Fri, 20 Sep 2019 14:35:29 +0200 Subject: [PATCH 057/266] --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 520ba856..2ba1be15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ This project uses a custom versioning scheme (and not [Semantic Versioning](http * Exchange `0 += 1` for `0 = 1` in UnifiedDiffUtils * preview of new Unified Diff Reader / Writer. This is not yet feature complete but passes the tests of the old version. * feel free to issue some change requests for the api. +* introduces lineNormalizer extension point to e.g. change html code encoding. (issue #41) ## [4.0] – 2019-01-09 From 73263b41cf064dfbb39fcfcbca466251769e7360 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Sat, 21 Sep 2019 11:03:21 +0200 Subject: [PATCH 058/266] fixes #46 --- .../difflib/unifieddiff/UnifiedDiffFile.java | 20 +++++ .../unifieddiff/UnifiedDiffReader.java | 83 +++++++++++++------ .../unifieddiff/UnifiedDiffReaderTest.java | 6 +- .../unifieddiff/problem_diff_issue46.diff | 2 +- 4 files changed, 83 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java index d57b9233..c244184f 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java @@ -25,7 +25,9 @@ public final class UnifiedDiffFile { private String diffCommand; private String fromFile; + private String fromTimestamp; private String toFile; + private String toTimestamp; private String index; private Patch patch = new Patch<>(); @@ -65,6 +67,24 @@ public Patch getPatch() { return patch; } + public String getFromTimestamp() { + return fromTimestamp; + } + + public void setFromTimestamp(String fromTimestamp) { + this.fromTimestamp = fromTimestamp; + } + + public String getToTimestamp() { + return toTimestamp; + } + + public void setToTimestamp(String toTimestamp) { + this.toTimestamp = toTimestamp; + } + + + public static UnifiedDiffFile from(String fromFile, String toFile, Patch patch) { UnifiedDiffFile file = new UnifiedDiffFile(); file.setFromFile(fromFile); diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java index 4879cd7e..db14116f 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java @@ -39,6 +39,7 @@ public final class UnifiedDiffReader { static final Pattern UNIFIED_DIFF_CHUNK_REGEXP = Pattern.compile("^@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@"); + static final Pattern TIMESTAMP_REGEXP = Pattern.compile("(\\d{4}-\\d{2}-\\d{2}[T ]\\d{2}:\\d{2}:\\d{2}\\.\\d{3,})"); private final InternalUnifiedDiffReader READER; private final UnifiedDiff data = new UnifiedDiff(); @@ -49,9 +50,9 @@ public final class UnifiedDiffReader { private final UnifiedDiffLine TO_FILE = new UnifiedDiffLine(true, "^\\+\\+\\+\\s", this::processToFile); private final UnifiedDiffLine CHUNK = new UnifiedDiffLine(false, UNIFIED_DIFF_CHUNK_REGEXP, this::processChunk); - private final UnifiedDiffLine LINE_NORMAL = new UnifiedDiffLine("^\\s+", this::processNormalLine); + private final UnifiedDiffLine LINE_NORMAL = new UnifiedDiffLine("^\\s", this::processNormalLine); private final UnifiedDiffLine LINE_DEL = new UnifiedDiffLine("^-", this::processDelLine); - private final UnifiedDiffLine LINE_ADD = new UnifiedDiffLine("^+", this::processAddLine); + private final UnifiedDiffLine LINE_ADD = new UnifiedDiffLine("^\\+", this::processAddLine); private UnifiedDiffFile actualFile; @@ -81,20 +82,37 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException { while (line != null) { if (!CHUNK.validLine(line)) { - processLine(line, DIFF_COMMAND, INDEX, FROM_FILE, TO_FILE); - } else { - processLine(line, CHUNK); + initFileIfNecessary(); + while (!CHUNK.validLine(line)) { + if (processLine(line, DIFF_COMMAND, INDEX, FROM_FILE, TO_FILE) == false) { + throw new UnifiedDiffParserException("expected file start line not found"); + } + line = READER.readLine(); + } + } + processLine(line, CHUNK); + while ((line = READER.readLine()) != null) { + if (processLine(line, LINE_NORMAL, LINE_ADD, LINE_DEL) == false) { + throw new UnifiedDiffParserException("expected data line not found"); + } + if (originalTxt.size() == old_size && revisedTxt.size() == new_size) { + finalizeChunk(); + break; + } } line = READER.readLine(); + if (line == null || line.startsWith("--")) { + break; + } } - finalizeChunk(); - - String tailTxt = ""; - while (READER.ready()) { - tailTxt += READER.readLine() + "\n"; + if (READER.ready()) { + String tailTxt = ""; + while (READER.ready()) { + tailTxt += READER.readLine() + "\n"; + } + data.setTailTxt(tailTxt); } - data.setTailTxt(tailTxt); return data; } @@ -114,22 +132,23 @@ public static UnifiedDiff parseUnifiedDiff(InputStream stream) throws IOExceptio return parser.parse(); } - private void processLine(String line, UnifiedDiffLine... rules) throws UnifiedDiffParserException { + private boolean processLine(String line, UnifiedDiffLine... rules) throws UnifiedDiffParserException { for (UnifiedDiffLine rule : rules) { if (rule.processLine(line)) { LOG.info(" >>> processed rule " + rule.toString()); - return; + return true; } } LOG.info(" >>> no rule matched " + line); - throw new UnifiedDiffParserException("parsing error at line " + line); + return false; + //throw new UnifiedDiffParserException("parsing error at line " + line); } private void initFileIfNecessary() { if (!originalTxt.isEmpty() || !revisedTxt.isEmpty()) { - finalizeChunk(); - actualFile = null; + throw new IllegalStateException(); } + actualFile = null; if (actualFile == null) { actualFile = new UnifiedDiffFile(); data.addFile(actualFile); @@ -137,7 +156,7 @@ private void initFileIfNecessary() { } private void processDiff(MatchResult match, String line) { - initFileIfNecessary(); + //initFileIfNecessary(); LOG.log(Level.INFO, "start {0}", line); String[] fromTo = parseFileNames(READER.lastLine()); actualFile.setFromFile(fromTo[0]); @@ -181,7 +200,7 @@ private void processDelLine(MatchResult match, String line) { } private void processChunk(MatchResult match, String chunkStart) { - finalizeChunk(); + // finalizeChunk(); old_ln = toInteger(match, 1, 1); old_size = toInteger(match, 2, 0); new_ln = toInteger(match, 3, 1); @@ -195,27 +214,43 @@ private void processChunk(MatchResult match, String chunkStart) { } private static Integer toInteger(MatchResult match, int group, int defValue) throws NumberFormatException { - return Integer.valueOf(Objects.toString( match.group(group) , "" + defValue)); + return Integer.valueOf(Objects.toString(match.group(group), "" + defValue)); } private void processIndex(MatchResult match, String line) { - initFileIfNecessary(); + //initFileIfNecessary(); LOG.log(Level.INFO, "index {0}", line); actualFile.setIndex(line.substring(6)); } private void processFromFile(MatchResult match, String line) { - initFileIfNecessary(); + //initFileIfNecessary(); actualFile.setFromFile(extractFileName(line)); + actualFile.setFromTimestamp(extractTimestamp(line)); } private void processToFile(MatchResult match, String line) { - initFileIfNecessary(); + //initFileIfNecessary(); actualFile.setToFile(extractFileName(line)); + actualFile.setToTimestamp(extractTimestamp(line)); + } + + private String extractFileName(String _line) { + Matcher matcher = TIMESTAMP_REGEXP.matcher(_line); + String line = _line; + if (matcher.find()) { + line = line.substring(1, matcher.start()); + } + return line.substring(4).replaceFirst("^(a|b)\\/", "") + .replace(TIMESTAMP_REGEXP.toString(), "").trim(); } - private String extractFileName(String line) { - return line.substring(4).replaceFirst("^(a|b)\\/", ""); + private String extractTimestamp(String line) { + Matcher matcher = TIMESTAMP_REGEXP.matcher(line); + if (matcher.find()) { + return matcher.group(); + } + return null; } final class UnifiedDiffLine { diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java index ec6e0a72..905cb24a 100644 --- a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java +++ b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java @@ -121,9 +121,9 @@ public void testParseIssue46() throws IOException { assertThat(diff.getFiles().size()).isEqualTo(1); UnifiedDiffFile file1 = diff.getFiles().get(0); - assertThat(file1.getFromFile()).isEqualTo("src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt"); - assertThat(file1.getPatch().getDeltas().size()).isEqualTo(3); + assertThat(file1.getFromFile()).isEqualTo(".vhd"); + assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1); - assertThat(diff.getTail()).isEqualTo("2.17.1.windows.2\n\n"); + assertThat(diff.getTail()).isNull(); } } diff --git a/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue46.diff b/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue46.diff index ecb72ae9..ef688694 100644 --- a/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue46.diff +++ b/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue46.diff @@ -1,6 +1,6 @@ --- a.vhd 2019-04-18 13:49:39.516149751 +0200 +++ b.vhd 2019-04-18 11:33:08.372563078 +0200 -@@ -2819,3 +2819,3 @@ +@@ -2819,3 +2819,2 @@ --- some comment -bla -bla From 93a5255007bd9c9ef4015e1cbf59ef7ab4f8fee4 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Sat, 21 Sep 2019 11:08:09 +0200 Subject: [PATCH 059/266] fixes #46 --- .../github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java index 8c3cb86f..c8fc82fc 100644 --- a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java +++ b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java @@ -17,6 +17,7 @@ import static java.util.stream.Collectors.joining; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; +import org.junit.Ignore; import org.junit.Test; public class UnifiedDiffRoundTripTest { @@ -83,6 +84,7 @@ public void testDiff_Issue10() throws IOException { * Issue 12 */ @Test + @Ignore public void testPatchWithNoDeltas() throws DiffException, IOException { final List lines1 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_1.txt"); final List lines2 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_2.txt"); From f3ff104a9cf316bd709b0abd05db0836a9fd6791 Mon Sep 17 00:00:00 2001 From: wumpz Date: Sat, 21 Sep 2019 13:59:21 +0200 Subject: [PATCH 060/266] fixes #33 --- .../difflib/unifieddiff/UnifiedDiffReader.java | 4 +++- .../unifieddiff/UnifiedDiffReaderTest.java | 15 +++++++++++++++ .../difflib/unifieddiff/problem_diff_issue33.diff | 6 ++++++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue33.diff diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java index db14116f..c208786c 100644 --- a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java +++ b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java @@ -78,7 +78,9 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException { headerTxt += line + "\n"; } } - data.setHeader(headerTxt); + if (!"".equals(headerTxt)) { + data.setHeader(headerTxt); + } while (line != null) { if (!CHUNK.validLine(line)) { diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java index 905cb24a..eb0280db 100644 --- a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java +++ b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java @@ -126,4 +126,19 @@ public void testParseIssue46() throws IOException { assertThat(diff.getTail()).isNull(); } + + @Test + public void testParseIssue33() throws IOException { + UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff( + UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue33.diff")); + + assertThat(diff.getFiles().size()).isEqualTo(1); + + UnifiedDiffFile file1 = diff.getFiles().get(0); + assertThat(file1.getFromFile()).isEqualTo("Main.java"); + assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1); + + assertThat(diff.getTail()).isNull(); + assertThat(diff.getHeader()).isNull(); + } } diff --git a/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue33.diff b/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue33.diff new file mode 100644 index 00000000..a78344dd --- /dev/null +++ b/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue33.diff @@ -0,0 +1,6 @@ +--- a/Main.java ++++ b/Main.java +@@ -2,2 +2,3 @@ public class Main { + public static void main(String[] args) { ++ System.out.println("Hello, world!"); + } \ No newline at end of file From c5b88e02dbf5113c53a7d83fa57639544a66cb2c Mon Sep 17 00:00:00 2001 From: rosta Date: Sat, 21 Sep 2019 14:05:24 +0200 Subject: [PATCH 061/266] Proposal/issue 44 (#45) * Correction of problem It appears that the configuration reportLinesUnchanged has no effect when showInlineDiffs is true. That is '<' and '>' characters are converted to HTML entities regardless. * Implement rawValues option * Revert "Implement rawValues option" This reverts commit d9c302cec8836eac38ec65db07ead1c29176dc86. --- .../com/github/difflib/text/DiffRowGenerator.java | 8 +++++--- .../github/difflib/text/DiffRowGeneratorTest.java | 12 ++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/src/main/java/com/github/difflib/text/DiffRowGenerator.java index 90babc71..4f963cd7 100644 --- a/src/main/java/com/github/difflib/text/DiffRowGenerator.java +++ b/src/main/java/com/github/difflib/text/DiffRowGenerator.java @@ -267,9 +267,11 @@ private DiffRow buildDiffRowWithoutNormalizing(Tag type, String orgline, String } List normalizeLines(List list) { - return list.stream() - .map(lineNormalizer::apply) - .collect(toList()); + return reportLinesUnchanged + ? list + : list.stream() + .map(lineNormalizer::apply) + .collect(toList()); } /** diff --git a/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java index 752560b2..c667b251 100644 --- a/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java +++ b/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java @@ -405,4 +405,16 @@ public void testGeneratorIssue41UserNormalizer() throws DiffException { rows = generator.generateDiffRows(Arrays.asList("\t<"), Arrays.asList("<")); assertEquals("[[CHANGE, <,<]]", rows.toString()); } + + @Test + public void testGenerationIssue44reportLinesUnchangedProblem() throws DiffException { + DiffRowGenerator generator = DiffRowGenerator.create() + .showInlineDiffs(true) + .reportLinesUnchanged(true) + .oldTag(f -> "~~") + .newTag(f -> "**") + .build(); + List rows = generator.generateDiffRows(Arrays.asList("
To do
"), Arrays.asList("
Done
")); + assertEquals("[[CHANGE,
~~T~~o~~ do~~
,
**D**o**ne**
]]", rows.toString()); + } } From 156f4f2986392a8e633fc4c2e5619a3b1e4e6457 Mon Sep 17 00:00:00 2001 From: "David R. Smith" Date: Mon, 23 Sep 2019 01:21:43 -0400 Subject: [PATCH 062/266] Update README.md (#50) Updated README.md with current Gradle artifact, as "compile" has been deprecated --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3c093342..e0d8f122 100644 --- a/README.md +++ b/README.md @@ -88,5 +88,5 @@ or using gradle: ```groovy // https://mvnrepository.com/artifact/io.github.java-diff-utils/java-diff-utils -compile group: 'io.github.java-diff-utils', name: 'java-diff-utils', version: '4.0' +implementation "io.github.java-diff-utils:java-diff-utils:4.0" ``` From c534ebae98a31fd654f7cfc815e10a41c476428d Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Sun, 20 Oct 2019 00:05:22 +0200 Subject: [PATCH 063/266] fixes #57 --- .../com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java b/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java index 9aee685a..cf68cb38 100644 --- a/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java +++ b/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java @@ -85,7 +85,7 @@ public void diffEnd() { List created = patch.applyTo(original); assertArrayEquals(revised.toArray(), created.toArray()); - assertEquals(50, logdata.size()); + assertEquals(246579, logdata.size()); } } From 7d17c6088ad43bf6c18689cd62e16f0e88c189a4 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Sat, 2 Nov 2019 22:03:28 +0100 Subject: [PATCH 064/266] Introduced a multi module java-diff-utils. The core project now has no more external dependencies. --- java-diff-utils-jgit/nb-configuration.xml | 19 + java-diff-utils-jgit/pom.xml | 58 ++ .../difflib/algorithm/jgit/HistogramDiff.java | 0 .../algorithm/jgit/HistogramDiffTest.java | 0 .../algorithm/jgit/LRHistogramDiffTest.java | 17 +- .../test/resources/mocks/large_dataset1.zip | Bin java-diff-utils/pom.xml | 60 ++ .../java/com/github/difflib/DiffUtils.java | 0 .../com/github/difflib/UnifiedDiffUtils.java | 0 .../com/github/difflib/algorithm/Change.java | 0 .../difflib/algorithm/DiffAlgorithmI.java | 0 .../algorithm/DiffAlgorithmListener.java | 0 .../difflib/algorithm/DiffException.java | 0 .../DifferentiationFailedException.java | 0 .../difflib/algorithm/myers/MyersDiff.java | 0 .../difflib/algorithm/myers/PathNode.java | 0 .../github/difflib/patch/AbstractDelta.java | 0 .../com/github/difflib/patch/ChangeDelta.java | 0 .../java/com/github/difflib/patch/Chunk.java | 0 .../com/github/difflib/patch/DeleteDelta.java | 0 .../com/github/difflib/patch/DeltaType.java | 0 .../github/difflib/patch/DiffException.java | 0 .../com/github/difflib/patch/InsertDelta.java | 0 .../java/com/github/difflib/patch/Patch.java | 0 .../difflib/patch/PatchFailedException.java | 0 .../java/com/github/difflib/text/DiffRow.java | 0 .../github/difflib/text/DiffRowGenerator.java | 0 .../com/github/difflib/text/StringUtils.java | 0 .../difflib/unifieddiff/UnifiedDiff.java | 0 .../difflib/unifieddiff/UnifiedDiffFile.java | 0 .../UnifiedDiffParserException.java | 0 .../unifieddiff/UnifiedDiffReader.java | 0 .../unifieddiff/UnifiedDiffWriter.java | 0 .../difflib/unifieddiff/package-info.java | 0 .../com/github/difflib/DiffUtilsTest.java | 0 .../difflib/GenerateUnifiedDiffTest.java | 0 .../com/github/difflib/TestConstants.java | 0 .../algorithm/myers/MyersDiffTest.java | 0 .../github/difflib/examples/ApplyPatch.java | 0 .../difflib/examples/ComputeDifference.java | 0 .../com/github/difflib/patch/PatchTest.java | 0 .../difflib/text/DiffRowGeneratorTest.java | 0 .../github/difflib/text/StringUtilsTest.java | 0 .../unifieddiff/UnifiedDiffReaderTest.java | 0 .../unifieddiff/UnifiedDiffRoundTripTest.java | 0 .../unifieddiff/UnifiedDiffWriterTest.java | 0 .../unifieddiff/jsqlparser_patch_1.diff | 0 .../unifieddiff/problem_diff_issue33.diff | 0 .../unifieddiff/problem_diff_issue46.diff | 0 .../src}/test/resources/mocks/5A.txt | 744 ++++++++--------- .../src}/test/resources/mocks/5B.txt | 762 +++++++++--------- .../test/resources/mocks/issue10_base.txt | 0 .../test/resources/mocks/issue10_patch.txt | 0 .../src}/test/resources/mocks/issue11_1.txt | 0 .../src}/test/resources/mocks/issue11_2.txt | 0 .../src}/test/resources/mocks/issue15_1.txt | 0 .../src}/test/resources/mocks/issue15_2.txt | 0 .../mocks/one_delta_test_original.txt | 0 .../mocks/one_delta_test_revised.txt | 0 .../src}/test/resources/mocks/original.txt | 0 .../src}/test/resources/mocks/revised.txt | 0 pom.xml | 142 +--- 62 files changed, 930 insertions(+), 872 deletions(-) create mode 100644 java-diff-utils-jgit/nb-configuration.xml create mode 100644 java-diff-utils-jgit/pom.xml rename {src => java-diff-utils-jgit/src}/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java (100%) rename {src => java-diff-utils-jgit/src}/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java (100%) rename {src => java-diff-utils-jgit/src}/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java (80%) rename {src => java-diff-utils-jgit/src}/test/resources/mocks/large_dataset1.zip (100%) create mode 100644 java-diff-utils/pom.xml rename {src => java-diff-utils/src}/main/java/com/github/difflib/DiffUtils.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/UnifiedDiffUtils.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/algorithm/Change.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/algorithm/DiffAlgorithmI.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/algorithm/DiffAlgorithmListener.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/algorithm/DiffException.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/algorithm/DifferentiationFailedException.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/algorithm/myers/MyersDiff.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/algorithm/myers/PathNode.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/patch/AbstractDelta.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/patch/ChangeDelta.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/patch/Chunk.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/patch/DeleteDelta.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/patch/DeltaType.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/patch/DiffException.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/patch/InsertDelta.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/patch/Patch.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/patch/PatchFailedException.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/text/DiffRow.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/text/DiffRowGenerator.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/text/StringUtils.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/unifieddiff/UnifiedDiffParserException.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java (100%) rename {src => java-diff-utils/src}/main/java/com/github/difflib/unifieddiff/package-info.java (100%) rename {src => java-diff-utils/src}/test/java/com/github/difflib/DiffUtilsTest.java (100%) rename {src => java-diff-utils/src}/test/java/com/github/difflib/GenerateUnifiedDiffTest.java (100%) rename {src => java-diff-utils/src}/test/java/com/github/difflib/TestConstants.java (100%) rename {src => java-diff-utils/src}/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java (100%) rename {src => java-diff-utils/src}/test/java/com/github/difflib/examples/ApplyPatch.java (100%) rename {src => java-diff-utils/src}/test/java/com/github/difflib/examples/ComputeDifference.java (100%) rename {src => java-diff-utils/src}/test/java/com/github/difflib/patch/PatchTest.java (100%) rename {src => java-diff-utils/src}/test/java/com/github/difflib/text/DiffRowGeneratorTest.java (100%) rename {src => java-diff-utils/src}/test/java/com/github/difflib/text/StringUtilsTest.java (100%) rename {src => java-diff-utils/src}/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java (100%) rename {src => java-diff-utils/src}/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java (100%) rename {src => java-diff-utils/src}/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java (100%) rename {src => java-diff-utils/src}/test/resources/com/github/difflib/unifieddiff/jsqlparser_patch_1.diff (100%) rename {src => java-diff-utils/src}/test/resources/com/github/difflib/unifieddiff/problem_diff_issue33.diff (100%) rename {src => java-diff-utils/src}/test/resources/com/github/difflib/unifieddiff/problem_diff_issue46.diff (100%) rename {src => java-diff-utils/src}/test/resources/mocks/5A.txt (96%) rename {src => java-diff-utils/src}/test/resources/mocks/5B.txt (96%) rename {src => java-diff-utils/src}/test/resources/mocks/issue10_base.txt (100%) rename {src => java-diff-utils/src}/test/resources/mocks/issue10_patch.txt (100%) rename {src => java-diff-utils/src}/test/resources/mocks/issue11_1.txt (100%) rename {src => java-diff-utils/src}/test/resources/mocks/issue11_2.txt (100%) rename {src => java-diff-utils/src}/test/resources/mocks/issue15_1.txt (100%) rename {src => java-diff-utils/src}/test/resources/mocks/issue15_2.txt (100%) rename {src => java-diff-utils/src}/test/resources/mocks/one_delta_test_original.txt (100%) rename {src => java-diff-utils/src}/test/resources/mocks/one_delta_test_revised.txt (100%) rename {src => java-diff-utils/src}/test/resources/mocks/original.txt (100%) rename {src => java-diff-utils/src}/test/resources/mocks/revised.txt (100%) diff --git a/java-diff-utils-jgit/nb-configuration.xml b/java-diff-utils-jgit/nb-configuration.xml new file mode 100644 index 00000000..ca588fa8 --- /dev/null +++ b/java-diff-utils-jgit/nb-configuration.xml @@ -0,0 +1,19 @@ + + + + + + none + JDK_1.8 + + diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml new file mode 100644 index 00000000..6a7f281b --- /dev/null +++ b/java-diff-utils-jgit/pom.xml @@ -0,0 +1,58 @@ + + + 4.0.0 + + io.github.java-diff-utils + java-diff-utils-parent + 4.1-SNAPSHOT + + java-diff-utils-jgit + jar + This is an extension of java-diff-utils using jgit to use its implementation of +some difference algorithms. + + + junit + junit + 4.12 + jar + test + + + org.eclipse.jgit + org.eclipse.jgit + 4.4.1.201607150455-r + + + com.googlecode.javaewah + JavaEWAH + + + commons-codec + commons-codec + + + commons-logging + commons-logging + + + org.apache.httpcomponents + httpclient + + + com.jcraft + jsch + + + org.slf4j + slf4j-api + + + + + ${project.groupId} + java-diff-utils + ${project.version} + + + \ No newline at end of file diff --git a/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java b/java-diff-utils-jgit/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java similarity index 100% rename from src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java rename to java-diff-utils-jgit/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java diff --git a/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java b/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java similarity index 100% rename from src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java rename to java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java diff --git a/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java b/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java similarity index 80% rename from src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java rename to java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java index cf68cb38..02dfe85d 100644 --- a/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java +++ b/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java @@ -15,14 +15,18 @@ */ package com.github.difflib.algorithm.jgit; -import static com.github.difflib.DiffUtilsTest.readStringListFromInputStream; -import com.github.difflib.TestConstants; import com.github.difflib.algorithm.DiffAlgorithmListener; import com.github.difflib.patch.Patch; import com.github.difflib.patch.PatchFailedException; +import java.io.BufferedReader; import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; +import static java.util.stream.Collectors.toList; import java.util.zip.ZipFile; import org.junit.After; import org.junit.AfterClass; @@ -58,7 +62,7 @@ public void tearDown() { @Test public void testPossibleDiffHangOnLargeDatasetDnaumenkoIssue26() throws IOException, PatchFailedException { - ZipFile zip = new ZipFile(TestConstants.MOCK_FOLDER + "/large_dataset1.zip"); + ZipFile zip = new ZipFile("target/test-classes/mocks/large_dataset1.zip"); List original = readStringListFromInputStream(zip.getInputStream(zip.getEntry("ta"))); List revised = readStringListFromInputStream(zip.getInputStream(zip.getEntry("tb"))); @@ -88,4 +92,11 @@ public void diffEnd() { assertEquals(246579, logdata.size()); } + public static List readStringListFromInputStream(InputStream is) throws IOException { + try (BufferedReader reader = new BufferedReader( + new InputStreamReader(is, Charset.forName(StandardCharsets.UTF_8.name())))) { + + return reader.lines().collect(toList()); + } + } } diff --git a/src/test/resources/mocks/large_dataset1.zip b/java-diff-utils-jgit/src/test/resources/mocks/large_dataset1.zip similarity index 100% rename from src/test/resources/mocks/large_dataset1.zip rename to java-diff-utils-jgit/src/test/resources/mocks/large_dataset1.zip diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml new file mode 100644 index 00000000..7ffe5d33 --- /dev/null +++ b/java-diff-utils/pom.xml @@ -0,0 +1,60 @@ + + 4.0.0 + io.github.java-diff-utils + java-diff-utils + jar + java-diff-utils + + io.github.java-diff-utils + java-diff-utils-parent + 4.1-SNAPSHOT + + + UTF-8 + + + + + junit + junit + 4.12 + jar + test + + + org.assertj + assertj-core + 3.11.1 + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.1 + + 1.8 + 1.8 + UTF-8 + + + + maven-jar-plugin + 3.0.2 + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + io.github.java-diff-utils + + + + + + + + diff --git a/src/main/java/com/github/difflib/DiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java similarity index 100% rename from src/main/java/com/github/difflib/DiffUtils.java rename to java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java diff --git a/src/main/java/com/github/difflib/UnifiedDiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java similarity index 100% rename from src/main/java/com/github/difflib/UnifiedDiffUtils.java rename to java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java diff --git a/src/main/java/com/github/difflib/algorithm/Change.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/Change.java similarity index 100% rename from src/main/java/com/github/difflib/algorithm/Change.java rename to java-diff-utils/src/main/java/com/github/difflib/algorithm/Change.java diff --git a/src/main/java/com/github/difflib/algorithm/DiffAlgorithmI.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmI.java similarity index 100% rename from src/main/java/com/github/difflib/algorithm/DiffAlgorithmI.java rename to java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmI.java diff --git a/src/main/java/com/github/difflib/algorithm/DiffAlgorithmListener.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmListener.java similarity index 100% rename from src/main/java/com/github/difflib/algorithm/DiffAlgorithmListener.java rename to java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmListener.java diff --git a/src/main/java/com/github/difflib/algorithm/DiffException.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffException.java similarity index 100% rename from src/main/java/com/github/difflib/algorithm/DiffException.java rename to java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffException.java diff --git a/src/main/java/com/github/difflib/algorithm/DifferentiationFailedException.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/DifferentiationFailedException.java similarity index 100% rename from src/main/java/com/github/difflib/algorithm/DifferentiationFailedException.java rename to java-diff-utils/src/main/java/com/github/difflib/algorithm/DifferentiationFailedException.java diff --git a/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java similarity index 100% rename from src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java rename to java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java diff --git a/src/main/java/com/github/difflib/algorithm/myers/PathNode.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/PathNode.java similarity index 100% rename from src/main/java/com/github/difflib/algorithm/myers/PathNode.java rename to java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/PathNode.java diff --git a/src/main/java/com/github/difflib/patch/AbstractDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java similarity index 100% rename from src/main/java/com/github/difflib/patch/AbstractDelta.java rename to java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java diff --git a/src/main/java/com/github/difflib/patch/ChangeDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java similarity index 100% rename from src/main/java/com/github/difflib/patch/ChangeDelta.java rename to java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java diff --git a/src/main/java/com/github/difflib/patch/Chunk.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java similarity index 100% rename from src/main/java/com/github/difflib/patch/Chunk.java rename to java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java diff --git a/src/main/java/com/github/difflib/patch/DeleteDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java similarity index 100% rename from src/main/java/com/github/difflib/patch/DeleteDelta.java rename to java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java diff --git a/src/main/java/com/github/difflib/patch/DeltaType.java b/java-diff-utils/src/main/java/com/github/difflib/patch/DeltaType.java similarity index 100% rename from src/main/java/com/github/difflib/patch/DeltaType.java rename to java-diff-utils/src/main/java/com/github/difflib/patch/DeltaType.java diff --git a/src/main/java/com/github/difflib/patch/DiffException.java b/java-diff-utils/src/main/java/com/github/difflib/patch/DiffException.java similarity index 100% rename from src/main/java/com/github/difflib/patch/DiffException.java rename to java-diff-utils/src/main/java/com/github/difflib/patch/DiffException.java diff --git a/src/main/java/com/github/difflib/patch/InsertDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java similarity index 100% rename from src/main/java/com/github/difflib/patch/InsertDelta.java rename to java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java diff --git a/src/main/java/com/github/difflib/patch/Patch.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java similarity index 100% rename from src/main/java/com/github/difflib/patch/Patch.java rename to java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java diff --git a/src/main/java/com/github/difflib/patch/PatchFailedException.java b/java-diff-utils/src/main/java/com/github/difflib/patch/PatchFailedException.java similarity index 100% rename from src/main/java/com/github/difflib/patch/PatchFailedException.java rename to java-diff-utils/src/main/java/com/github/difflib/patch/PatchFailedException.java diff --git a/src/main/java/com/github/difflib/text/DiffRow.java b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRow.java similarity index 100% rename from src/main/java/com/github/difflib/text/DiffRow.java rename to java-diff-utils/src/main/java/com/github/difflib/text/DiffRow.java diff --git a/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java similarity index 100% rename from src/main/java/com/github/difflib/text/DiffRowGenerator.java rename to java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java diff --git a/src/main/java/com/github/difflib/text/StringUtils.java b/java-diff-utils/src/main/java/com/github/difflib/text/StringUtils.java similarity index 100% rename from src/main/java/com/github/difflib/text/StringUtils.java rename to java-diff-utils/src/main/java/com/github/difflib/text/StringUtils.java diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java similarity index 100% rename from src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java rename to java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java similarity index 100% rename from src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java rename to java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParserException.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParserException.java similarity index 100% rename from src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParserException.java rename to java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParserException.java diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java similarity index 100% rename from src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java rename to java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java similarity index 100% rename from src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java rename to java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java diff --git a/src/main/java/com/github/difflib/unifieddiff/package-info.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/package-info.java similarity index 100% rename from src/main/java/com/github/difflib/unifieddiff/package-info.java rename to java-diff-utils/src/main/java/com/github/difflib/unifieddiff/package-info.java diff --git a/src/test/java/com/github/difflib/DiffUtilsTest.java b/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java similarity index 100% rename from src/test/java/com/github/difflib/DiffUtilsTest.java rename to java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java diff --git a/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java similarity index 100% rename from src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java rename to java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java diff --git a/src/test/java/com/github/difflib/TestConstants.java b/java-diff-utils/src/test/java/com/github/difflib/TestConstants.java similarity index 100% rename from src/test/java/com/github/difflib/TestConstants.java rename to java-diff-utils/src/test/java/com/github/difflib/TestConstants.java diff --git a/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java similarity index 100% rename from src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java rename to java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java diff --git a/src/test/java/com/github/difflib/examples/ApplyPatch.java b/java-diff-utils/src/test/java/com/github/difflib/examples/ApplyPatch.java similarity index 100% rename from src/test/java/com/github/difflib/examples/ApplyPatch.java rename to java-diff-utils/src/test/java/com/github/difflib/examples/ApplyPatch.java diff --git a/src/test/java/com/github/difflib/examples/ComputeDifference.java b/java-diff-utils/src/test/java/com/github/difflib/examples/ComputeDifference.java similarity index 100% rename from src/test/java/com/github/difflib/examples/ComputeDifference.java rename to java-diff-utils/src/test/java/com/github/difflib/examples/ComputeDifference.java diff --git a/src/test/java/com/github/difflib/patch/PatchTest.java b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java similarity index 100% rename from src/test/java/com/github/difflib/patch/PatchTest.java rename to java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java diff --git a/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java similarity index 100% rename from src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java rename to java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java diff --git a/src/test/java/com/github/difflib/text/StringUtilsTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/StringUtilsTest.java similarity index 100% rename from src/test/java/com/github/difflib/text/StringUtilsTest.java rename to java-diff-utils/src/test/java/com/github/difflib/text/StringUtilsTest.java diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java similarity index 100% rename from src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java rename to java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java similarity index 100% rename from src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java rename to java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java similarity index 100% rename from src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java rename to java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java diff --git a/src/test/resources/com/github/difflib/unifieddiff/jsqlparser_patch_1.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/jsqlparser_patch_1.diff similarity index 100% rename from src/test/resources/com/github/difflib/unifieddiff/jsqlparser_patch_1.diff rename to java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/jsqlparser_patch_1.diff diff --git a/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue33.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue33.diff similarity index 100% rename from src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue33.diff rename to java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue33.diff diff --git a/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue46.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue46.diff similarity index 100% rename from src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue46.diff rename to java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue46.diff diff --git a/src/test/resources/mocks/5A.txt b/java-diff-utils/src/test/resources/mocks/5A.txt similarity index 96% rename from src/test/resources/mocks/5A.txt rename to java-diff-utils/src/test/resources/mocks/5A.txt index 96e51b80..69eafd8b 100644 --- a/src/test/resources/mocks/5A.txt +++ b/java-diff-utils/src/test/resources/mocks/5A.txt @@ -1,372 +1,372 @@ -#!/bin/sh -# -# Copyright (c) 2006 Johannes E. Schindelin -# - -test_description='Test special whitespace in diff engine. - -' -. ./test-lib.sh -. ../diff-lib.sh - -# Ray Lehtiniemi's example - -cat << EOF > x -do { - nothing; -} while (0); -EOF - -git update-index --add x - -cat << EOF > x -do -{ - nothing; -} -while (0); -EOF - -cat << EOF > expect -diff --git a/x b/x -index adf3937..6edc172 100644 ---- a/x -+++ b/x -@@ -1,3 +1,5 @@ --do { -+do -+{ - nothing; --} while (0); -+} -+while (0); -EOF - -git diff > out -test_expect_success "Ray's example without options" 'test_cmp expect out' - -git diff -w > out -test_expect_success "Ray's example with -w" 'test_cmp expect out' - -git diff -b > out -test_expect_success "Ray's example with -b" 'test_cmp expect out' - -tr 'Q' '\015' << EOF > x -whitespace at beginning -whitespace change -whitespace in the middle -whitespace at end -unchanged line -CR at endQ -EOF - -git update-index x - -tr '_' ' ' << EOF > x - whitespace at beginning -whitespace change -white space in the middle -whitespace at end__ -unchanged line -CR at end -EOF - -tr 'Q_' '\015 ' << EOF > expect -diff --git a/x b/x -index d99af23..8b32fb5 100644 ---- a/x -+++ b/x -@@ -1,6 +1,6 @@ --whitespace at beginning --whitespace change --whitespace in the middle --whitespace at end -+ whitespace at beginning -+whitespace change -+white space in the middle -+whitespace at end__ -unchanged line --CR at endQ -+CR at end -EOF -git diff > out -test_expect_success 'another test, without options' 'test_cmp expect out' - -cat << EOF > expect -diff --git a/x b/x -index d99af23..8b32fb5 100644 -EOF -git diff -w > out -test_expect_success 'another test, with -w' 'test_cmp expect out' - -tr 'Q' '\015' << EOF > expect -diff --git a/x b/x -index d99af23..8b32fb5 100644 ---- a/x -+++ b/x -@@ -1,6 +1,6 @@ --whitespace at beginning -+ whitespace at beginning -whitespace change --whitespace in the middle -+white space in the middle -whitespace at end -unchanged line -CR at endQ -EOF -git diff -b > out -test_expect_success 'another test, with -b' 'test_cmp expect out' - -test_expect_success 'check mixed spaces and tabs in indent' ' - - # This is indented with SP HT SP. - echo " foo();" > x && - git diff --check | grep "space before tab in indent" - -' - -test_expect_success 'check mixed tabs and spaces in indent' ' - - # This is indented with HT SP HT. - echo " foo();" > x && - git diff --check | grep "space before tab in indent" - -' - -test_expect_success 'check with no whitespace errors' ' - - git commit -m "snapshot" && - echo "foo();" > x && - git diff --check - -' - -test_expect_success 'check with trailing whitespace' ' - - echo "foo(); " > x && - test_must_fail git diff --check - -' - -test_expect_success 'check with space before tab in indent' ' - - # indent has space followed by hard tab - echo " foo();" > x && - test_must_fail git diff --check - -' - -test_expect_success '--check and --exit-code are not exclusive' ' - - git checkout x && - git diff --check --exit-code - -' - -test_expect_success '--check and --quiet are not exclusive' ' - - git diff --check --quiet - -' - -test_expect_success 'check staged with no whitespace errors' ' - - echo "foo();" > x && - git add x && - git diff --cached --check - -' - -test_expect_success 'check staged with trailing whitespace' ' - - echo "foo(); " > x && - git add x && - test_must_fail git diff --cached --check - -' - -test_expect_success 'check staged with space before tab in indent' ' - - # indent has space followed by hard tab - echo " foo();" > x && - git add x && - test_must_fail git diff --cached --check - -' - -test_expect_success 'check with no whitespace errors (diff-index)' ' - - echo "foo();" > x && - git add x && - git diff-index --check HEAD - -' - -test_expect_success 'check with trailing whitespace (diff-index)' ' - - echo "foo(); " > x && - git add x && - test_must_fail git diff-index --check HEAD - -' - -test_expect_success 'check with space before tab in indent (diff-index)' ' - - # indent has space followed by hard tab - echo " foo();" > x && - git add x && - test_must_fail git diff-index --check HEAD - -' - -test_expect_success 'check staged with no whitespace errors (diff-index)' ' - - echo "foo();" > x && - git add x && - git diff-index --cached --check HEAD - -' - -test_expect_success 'check staged with trailing whitespace (diff-index)' ' - - echo "foo(); " > x && - git add x && - test_must_fail git diff-index --cached --check HEAD - -' - -test_expect_success 'check staged with space before tab in indent (diff-index)' ' - - # indent has space followed by hard tab - echo " foo();" > x && - git add x && - test_must_fail git diff-index --cached --check HEAD - -' - -test_expect_success 'check with no whitespace errors (diff-tree)' ' - - echo "foo();" > x && - git commit -m "new commit" x && - git diff-tree --check HEAD^ HEAD - -' - -test_expect_success 'check with trailing whitespace (diff-tree)' ' - - echo "foo(); " > x && - git commit -m "another commit" x && - test_must_fail git diff-tree --check HEAD^ HEAD - -' - -test_expect_success 'check with space before tab in indent (diff-tree)' ' - - # indent has space followed by hard tab - echo " foo();" > x && - git commit -m "yet another" x && - test_must_fail git diff-tree --check HEAD^ HEAD - -' - -test_expect_success 'check trailing whitespace (trailing-space: off)' ' - - git config core.whitespace "-trailing-space" && - echo "foo (); " > x && - git diff --check - -' - -test_expect_success 'check trailing whitespace (trailing-space: on)' ' - - git config core.whitespace "trailing-space" && - echo "foo (); " > x && - test_must_fail git diff --check - -' - -test_expect_success 'check space before tab in indent (space-before-tab: off)' ' - - # indent contains space followed by HT - git config core.whitespace "-space-before-tab" && - echo " foo ();" > x && - git diff --check - -' - -test_expect_success 'check space before tab in indent (space-before-tab: on)' ' - - # indent contains space followed by HT - git config core.whitespace "space-before-tab" && - echo " foo (); " > x && - test_must_fail git diff --check - -' - -test_expect_success 'check spaces as indentation (indent-with-non-tab: off)' ' - - git config core.whitespace "-indent-with-non-tab" - echo " foo ();" > x && - git diff --check - -' - -test_expect_success 'check spaces as indentation (indent-with-non-tab: on)' ' - - git config core.whitespace "indent-with-non-tab" && - echo " foo ();" > x && - test_must_fail git diff --check - -' - -test_expect_success 'check tabs and spaces as indentation (indent-with-non-tab: on)' ' - - git config core.whitespace "indent-with-non-tab" && - echo " foo ();" > x && - test_must_fail git diff --check - -' - -test_expect_success 'line numbers in --check output are correct' ' - - echo "" > x && - echo "foo(); " >> x && - git diff --check | grep "x:2:" - -' - -test_expect_success 'checkdiff detects trailing blank lines' ' - echo "foo();" >x && - echo "" >>x && - git diff --check | grep "ends with blank" -' - -test_expect_success 'checkdiff allows new blank lines' ' - git checkout x && - mv x y && - ( - echo "/* This is new */" && - echo "" && - cat y - ) >x && - git diff --check -' - -test_expect_success 'combined diff with autocrlf conversion' ' - - git reset --hard && - echo >x hello && - git commit -m "one side" x && - git checkout HEAD^ && - echo >x goodbye && - git commit -m "the other side" x && - git config core.autocrlf true && - test_must_fail git merge master && - - git diff | sed -e "1,/^@@@/d" >actual && - ! grep "^-" actual - -' - -test_done - +#!/bin/sh +# +# Copyright (c) 2006 Johannes E. Schindelin +# + +test_description='Test special whitespace in diff engine. + +' +. ./test-lib.sh +. ../diff-lib.sh + +# Ray Lehtiniemi's example + +cat << EOF > x +do { + nothing; +} while (0); +EOF + +git update-index --add x + +cat << EOF > x +do +{ + nothing; +} +while (0); +EOF + +cat << EOF > expect +diff --git a/x b/x +index adf3937..6edc172 100644 +--- a/x ++++ b/x +@@ -1,3 +1,5 @@ +-do { ++do ++{ + nothing; +-} while (0); ++} ++while (0); +EOF + +git diff > out +test_expect_success "Ray's example without options" 'test_cmp expect out' + +git diff -w > out +test_expect_success "Ray's example with -w" 'test_cmp expect out' + +git diff -b > out +test_expect_success "Ray's example with -b" 'test_cmp expect out' + +tr 'Q' '\015' << EOF > x +whitespace at beginning +whitespace change +whitespace in the middle +whitespace at end +unchanged line +CR at endQ +EOF + +git update-index x + +tr '_' ' ' << EOF > x + whitespace at beginning +whitespace change +white space in the middle +whitespace at end__ +unchanged line +CR at end +EOF + +tr 'Q_' '\015 ' << EOF > expect +diff --git a/x b/x +index d99af23..8b32fb5 100644 +--- a/x ++++ b/x +@@ -1,6 +1,6 @@ +-whitespace at beginning +-whitespace change +-whitespace in the middle +-whitespace at end ++ whitespace at beginning ++whitespace change ++white space in the middle ++whitespace at end__ +unchanged line +-CR at endQ ++CR at end +EOF +git diff > out +test_expect_success 'another test, without options' 'test_cmp expect out' + +cat << EOF > expect +diff --git a/x b/x +index d99af23..8b32fb5 100644 +EOF +git diff -w > out +test_expect_success 'another test, with -w' 'test_cmp expect out' + +tr 'Q' '\015' << EOF > expect +diff --git a/x b/x +index d99af23..8b32fb5 100644 +--- a/x ++++ b/x +@@ -1,6 +1,6 @@ +-whitespace at beginning ++ whitespace at beginning +whitespace change +-whitespace in the middle ++white space in the middle +whitespace at end +unchanged line +CR at endQ +EOF +git diff -b > out +test_expect_success 'another test, with -b' 'test_cmp expect out' + +test_expect_success 'check mixed spaces and tabs in indent' ' + + # This is indented with SP HT SP. + echo " foo();" > x && + git diff --check | grep "space before tab in indent" + +' + +test_expect_success 'check mixed tabs and spaces in indent' ' + + # This is indented with HT SP HT. + echo " foo();" > x && + git diff --check | grep "space before tab in indent" + +' + +test_expect_success 'check with no whitespace errors' ' + + git commit -m "snapshot" && + echo "foo();" > x && + git diff --check + +' + +test_expect_success 'check with trailing whitespace' ' + + echo "foo(); " > x && + test_must_fail git diff --check + +' + +test_expect_success 'check with space before tab in indent' ' + + # indent has space followed by hard tab + echo " foo();" > x && + test_must_fail git diff --check + +' + +test_expect_success '--check and --exit-code are not exclusive' ' + + git checkout x && + git diff --check --exit-code + +' + +test_expect_success '--check and --quiet are not exclusive' ' + + git diff --check --quiet + +' + +test_expect_success 'check staged with no whitespace errors' ' + + echo "foo();" > x && + git add x && + git diff --cached --check + +' + +test_expect_success 'check staged with trailing whitespace' ' + + echo "foo(); " > x && + git add x && + test_must_fail git diff --cached --check + +' + +test_expect_success 'check staged with space before tab in indent' ' + + # indent has space followed by hard tab + echo " foo();" > x && + git add x && + test_must_fail git diff --cached --check + +' + +test_expect_success 'check with no whitespace errors (diff-index)' ' + + echo "foo();" > x && + git add x && + git diff-index --check HEAD + +' + +test_expect_success 'check with trailing whitespace (diff-index)' ' + + echo "foo(); " > x && + git add x && + test_must_fail git diff-index --check HEAD + +' + +test_expect_success 'check with space before tab in indent (diff-index)' ' + + # indent has space followed by hard tab + echo " foo();" > x && + git add x && + test_must_fail git diff-index --check HEAD + +' + +test_expect_success 'check staged with no whitespace errors (diff-index)' ' + + echo "foo();" > x && + git add x && + git diff-index --cached --check HEAD + +' + +test_expect_success 'check staged with trailing whitespace (diff-index)' ' + + echo "foo(); " > x && + git add x && + test_must_fail git diff-index --cached --check HEAD + +' + +test_expect_success 'check staged with space before tab in indent (diff-index)' ' + + # indent has space followed by hard tab + echo " foo();" > x && + git add x && + test_must_fail git diff-index --cached --check HEAD + +' + +test_expect_success 'check with no whitespace errors (diff-tree)' ' + + echo "foo();" > x && + git commit -m "new commit" x && + git diff-tree --check HEAD^ HEAD + +' + +test_expect_success 'check with trailing whitespace (diff-tree)' ' + + echo "foo(); " > x && + git commit -m "another commit" x && + test_must_fail git diff-tree --check HEAD^ HEAD + +' + +test_expect_success 'check with space before tab in indent (diff-tree)' ' + + # indent has space followed by hard tab + echo " foo();" > x && + git commit -m "yet another" x && + test_must_fail git diff-tree --check HEAD^ HEAD + +' + +test_expect_success 'check trailing whitespace (trailing-space: off)' ' + + git config core.whitespace "-trailing-space" && + echo "foo (); " > x && + git diff --check + +' + +test_expect_success 'check trailing whitespace (trailing-space: on)' ' + + git config core.whitespace "trailing-space" && + echo "foo (); " > x && + test_must_fail git diff --check + +' + +test_expect_success 'check space before tab in indent (space-before-tab: off)' ' + + # indent contains space followed by HT + git config core.whitespace "-space-before-tab" && + echo " foo ();" > x && + git diff --check + +' + +test_expect_success 'check space before tab in indent (space-before-tab: on)' ' + + # indent contains space followed by HT + git config core.whitespace "space-before-tab" && + echo " foo (); " > x && + test_must_fail git diff --check + +' + +test_expect_success 'check spaces as indentation (indent-with-non-tab: off)' ' + + git config core.whitespace "-indent-with-non-tab" + echo " foo ();" > x && + git diff --check + +' + +test_expect_success 'check spaces as indentation (indent-with-non-tab: on)' ' + + git config core.whitespace "indent-with-non-tab" && + echo " foo ();" > x && + test_must_fail git diff --check + +' + +test_expect_success 'check tabs and spaces as indentation (indent-with-non-tab: on)' ' + + git config core.whitespace "indent-with-non-tab" && + echo " foo ();" > x && + test_must_fail git diff --check + +' + +test_expect_success 'line numbers in --check output are correct' ' + + echo "" > x && + echo "foo(); " >> x && + git diff --check | grep "x:2:" + +' + +test_expect_success 'checkdiff detects trailing blank lines' ' + echo "foo();" >x && + echo "" >>x && + git diff --check | grep "ends with blank" +' + +test_expect_success 'checkdiff allows new blank lines' ' + git checkout x && + mv x y && + ( + echo "/* This is new */" && + echo "" && + cat y + ) >x && + git diff --check +' + +test_expect_success 'combined diff with autocrlf conversion' ' + + git reset --hard && + echo >x hello && + git commit -m "one side" x && + git checkout HEAD^ && + echo >x goodbye && + git commit -m "the other side" x && + git config core.autocrlf true && + test_must_fail git merge master && + + git diff | sed -e "1,/^@@@/d" >actual && + ! grep "^-" actual + +' + +test_done + diff --git a/src/test/resources/mocks/5B.txt b/java-diff-utils/src/test/resources/mocks/5B.txt similarity index 96% rename from src/test/resources/mocks/5B.txt rename to java-diff-utils/src/test/resources/mocks/5B.txt index dd12cf4f..112cff5a 100644 --- a/src/test/resources/mocks/5B.txt +++ b/java-diff-utils/src/test/resources/mocks/5B.txt @@ -1,381 +1,381 @@ -#!/bin/sh -# -# Copyright (c) 2006 Johannes E. Schindelin -# - -test_description='Test special whitespace in diff engine. - -' -. ./test-lib.sh -. ../diff-lib.sh - -# Ray Lehtiniemi's example - -cat << EOF > x -do { - nothing; -} while (0); -EOF - -git update-index --add x - -cat << EOF > x -do -{ - nothing; -} -while (0); -EOF - -cat << EOF > expect -diff --git a/x b/x -index adf3937..6edc172 100644 ---- a/x -+++ b/x -@@ -1,3 +1,5 @@ --do { -+do -+{ - nothing; --} while (0); -+} -+while (0); -EOF - -git diff > out -test_expect_success "Ray's example without options" 'test_cmp expect out' - -git diff -w > out -test_expect_success "Ray's example with -w" 'test_cmp expect out' - -git diff -b > out -test_expect_success "Ray's example with -b" 'test_cmp expect out' - -tr 'Q' '\015' << EOF > x -whitespace at beginning -whitespace change -whitespace in the middle -whitespace at end -unchanged line -CR at endQ -EOF - -git update-index x - -tr '_' ' ' << EOF > x - whitespace at beginning -whitespace change -white space in the middle -whitespace at end__ -unchanged line -CR at end -EOF - -tr 'Q_' '\015 ' << EOF > expect -diff --git a/x b/x -index d99af23..8b32fb5 100644 ---- a/x -+++ b/x -@@ -1,6 +1,6 @@ --whitespace at beginning --whitespace change --whitespace in the middle --whitespace at end -+ whitespace at beginning -+whitespace change -+white space in the middle -+whitespace at end__ -unchanged line --CR at endQ -+CR at end -EOF -git diff > out -test_expect_success 'another test, without options' 'test_cmp expect out' - -cat << EOF > expect -diff --git a/x b/x -index d99af23..8b32fb5 100644 -EOF -git diff -w > out -test_expect_success 'another test, with -w' 'test_cmp expect out' - -tr 'Q' '\015' << EOF > expect -diff --git a/x b/x -index d99af23..8b32fb5 100644 ---- a/x -+++ b/x -@@ -1,6 +1,6 @@ --whitespace at beginning -+ whitespace at beginning -whitespace change --whitespace in the middle -+white space in the middle -whitespace at end -unchanged line -CR at endQ -git diff -b --ignore-space-at-eol > out -test_expect_failure 'another test, with -b --ignore-space-at-eol' 'test_cmp expect out' - -tr 'Q' '\015' << EOF > expect -diff --git a/x b/x -index d99af23..8b32fb5 100644 ---- a/x -+++ b/x -EOF -git diff -b > out -test_expect_success 'another test, with -b' 'test_cmp expect out' - -test_expect_success 'check mixed spaces and tabs in indent' ' - - # This is indented with SP HT SP. - echo " foo();" > x && - git diff --check | grep "space before tab in indent" - -' - -test_expect_success 'check mixed tabs and spaces in indent' ' - - # This is indented with HT SP HT. - echo " foo();" > x && - git diff --check | grep "space before tab in indent" - -' - -test_expect_success 'check with no whitespace errors' ' - - git commit -m "snapshot" && - echo "foo();" > x && - git diff --check - -' - -test_expect_success 'check with trailing whitespace' ' - - echo "foo(); " > x && - test_must_fail git diff --check - -' - -test_expect_success 'check with space before tab in indent' ' - - # indent has space followed by hard tab - echo " foo();" > x && - test_must_fail git diff --check - -' - -test_expect_success '--check and --exit-code are not exclusive' ' - - git checkout x && - git diff --check --exit-code - -' - -test_expect_success '--check and --quiet are not exclusive' ' - - git diff --check --quiet - -' - -test_expect_success 'check staged with no whitespace errors' ' - - echo "foo();" > x && - git add x && - git diff --cached --check - -' - -test_expect_success 'check staged with trailing whitespace' ' - - echo "foo(); " > x && - git add x && - test_must_fail git diff --cached --check - -' - -test_expect_success 'check staged with space before tab in indent' ' - - # indent has space followed by hard tab - echo " foo();" > x && - git add x && - test_must_fail git diff --cached --check - -' - -test_expect_success 'check with no whitespace errors (diff-index)' ' - - echo "foo();" > x && - git add x && - git diff-index --check HEAD - -' - -test_expect_success 'check with trailing whitespace (diff-index)' ' - - echo "foo(); " > x && - git add x && - test_must_fail git diff-index --check HEAD - -' - -test_expect_success 'check with space before tab in indent (diff-index)' ' - - # indent has space followed by hard tab - echo " foo();" > x && - git add x && - test_must_fail git diff-index --check HEAD - -' - -test_expect_success 'check staged with no whitespace errors (diff-index)' ' - - echo "foo();" > x && - git add x && - git diff-index --cached --check HEAD - -' - -test_expect_success 'check staged with trailing whitespace (diff-index)' ' - - echo "foo(); " > x && - git add x && - test_must_fail git diff-index --cached --check HEAD - -' - -test_expect_success 'check staged with space before tab in indent (diff-index)' ' - - # indent has space followed by hard tab - echo " foo();" > x && - git add x && - test_must_fail git diff-index --cached --check HEAD - -' - -test_expect_success 'check with no whitespace errors (diff-tree)' ' - - echo "foo();" > x && - git commit -m "new commit" x && - git diff-tree --check HEAD^ HEAD - -' - -test_expect_success 'check with trailing whitespace (diff-tree)' ' - - echo "foo(); " > x && - git commit -m "another commit" x && - test_must_fail git diff-tree --check HEAD^ HEAD - -' - -test_expect_success 'check with space before tab in indent (diff-tree)' ' - - # indent has space followed by hard tab - echo " foo();" > x && - git commit -m "yet another" x && - test_must_fail git diff-tree --check HEAD^ HEAD - -' - -test_expect_success 'check trailing whitespace (trailing-space: off)' ' - - git config core.whitespace "-trailing-space" && - echo "foo (); " > x && - git diff --check - -' - -test_expect_success 'check trailing whitespace (trailing-space: on)' ' - - git config core.whitespace "trailing-space" && - echo "foo (); " > x && - test_must_fail git diff --check - -' - -test_expect_success 'check space before tab in indent (space-before-tab: off)' ' - - # indent contains space followed by HT - git config core.whitespace "-space-before-tab" && - echo " foo ();" > x && - git diff --check - -' - -test_expect_success 'check space before tab in indent (space-before-tab: on)' ' - - # indent contains space followed by HT - git config core.whitespace "space-before-tab" && - echo " foo (); " > x && - test_must_fail git diff --check - -' - -test_expect_success 'check spaces as indentation (indent-with-non-tab: off)' ' - - git config core.whitespace "-indent-with-non-tab" - echo " foo ();" > x && - git diff --check - -' - -test_expect_success 'check spaces as indentation (indent-with-non-tab: on)' ' - - git config core.whitespace "indent-with-non-tab" && - echo " foo ();" > x && - test_must_fail git diff --check - -' - -test_expect_success 'check tabs and spaces as indentation (indent-with-non-tab: on)' ' - - git config core.whitespace "indent-with-non-tab" && - echo " foo ();" > x && - test_must_fail git diff --check - -' - -test_expect_success 'line numbers in --check output are correct' ' - - echo "" > x && - echo "foo(); " >> x && - git diff --check | grep "x:2:" - -' - -test_expect_success 'checkdiff detects trailing blank lines' ' - echo "foo();" >x && - echo "" >>x && - git diff --check | grep "ends with blank" -' - -test_expect_success 'checkdiff allows new blank lines' ' - git checkout x && - mv x y && - ( - echo "/* This is new */" && - echo "" && - cat y - ) >x && - git diff --check -' - -test_expect_success 'combined diff with autocrlf conversion' ' - - git reset --hard && - echo >x hello && - git commit -m "one side" x && - git checkout HEAD^ && - echo >x goodbye && - git commit -m "the other side" x && - git config core.autocrlf true && - test_must_fail git merge master && - - git diff | sed -e "1,/^@@@/d" >actual && - ! grep "^-" actual - -' - -test_done - - +#!/bin/sh +# +# Copyright (c) 2006 Johannes E. Schindelin +# + +test_description='Test special whitespace in diff engine. + +' +. ./test-lib.sh +. ../diff-lib.sh + +# Ray Lehtiniemi's example + +cat << EOF > x +do { + nothing; +} while (0); +EOF + +git update-index --add x + +cat << EOF > x +do +{ + nothing; +} +while (0); +EOF + +cat << EOF > expect +diff --git a/x b/x +index adf3937..6edc172 100644 +--- a/x ++++ b/x +@@ -1,3 +1,5 @@ +-do { ++do ++{ + nothing; +-} while (0); ++} ++while (0); +EOF + +git diff > out +test_expect_success "Ray's example without options" 'test_cmp expect out' + +git diff -w > out +test_expect_success "Ray's example with -w" 'test_cmp expect out' + +git diff -b > out +test_expect_success "Ray's example with -b" 'test_cmp expect out' + +tr 'Q' '\015' << EOF > x +whitespace at beginning +whitespace change +whitespace in the middle +whitespace at end +unchanged line +CR at endQ +EOF + +git update-index x + +tr '_' ' ' << EOF > x + whitespace at beginning +whitespace change +white space in the middle +whitespace at end__ +unchanged line +CR at end +EOF + +tr 'Q_' '\015 ' << EOF > expect +diff --git a/x b/x +index d99af23..8b32fb5 100644 +--- a/x ++++ b/x +@@ -1,6 +1,6 @@ +-whitespace at beginning +-whitespace change +-whitespace in the middle +-whitespace at end ++ whitespace at beginning ++whitespace change ++white space in the middle ++whitespace at end__ +unchanged line +-CR at endQ ++CR at end +EOF +git diff > out +test_expect_success 'another test, without options' 'test_cmp expect out' + +cat << EOF > expect +diff --git a/x b/x +index d99af23..8b32fb5 100644 +EOF +git diff -w > out +test_expect_success 'another test, with -w' 'test_cmp expect out' + +tr 'Q' '\015' << EOF > expect +diff --git a/x b/x +index d99af23..8b32fb5 100644 +--- a/x ++++ b/x +@@ -1,6 +1,6 @@ +-whitespace at beginning ++ whitespace at beginning +whitespace change +-whitespace in the middle ++white space in the middle +whitespace at end +unchanged line +CR at endQ +git diff -b --ignore-space-at-eol > out +test_expect_failure 'another test, with -b --ignore-space-at-eol' 'test_cmp expect out' + +tr 'Q' '\015' << EOF > expect +diff --git a/x b/x +index d99af23..8b32fb5 100644 +--- a/x ++++ b/x +EOF +git diff -b > out +test_expect_success 'another test, with -b' 'test_cmp expect out' + +test_expect_success 'check mixed spaces and tabs in indent' ' + + # This is indented with SP HT SP. + echo " foo();" > x && + git diff --check | grep "space before tab in indent" + +' + +test_expect_success 'check mixed tabs and spaces in indent' ' + + # This is indented with HT SP HT. + echo " foo();" > x && + git diff --check | grep "space before tab in indent" + +' + +test_expect_success 'check with no whitespace errors' ' + + git commit -m "snapshot" && + echo "foo();" > x && + git diff --check + +' + +test_expect_success 'check with trailing whitespace' ' + + echo "foo(); " > x && + test_must_fail git diff --check + +' + +test_expect_success 'check with space before tab in indent' ' + + # indent has space followed by hard tab + echo " foo();" > x && + test_must_fail git diff --check + +' + +test_expect_success '--check and --exit-code are not exclusive' ' + + git checkout x && + git diff --check --exit-code + +' + +test_expect_success '--check and --quiet are not exclusive' ' + + git diff --check --quiet + +' + +test_expect_success 'check staged with no whitespace errors' ' + + echo "foo();" > x && + git add x && + git diff --cached --check + +' + +test_expect_success 'check staged with trailing whitespace' ' + + echo "foo(); " > x && + git add x && + test_must_fail git diff --cached --check + +' + +test_expect_success 'check staged with space before tab in indent' ' + + # indent has space followed by hard tab + echo " foo();" > x && + git add x && + test_must_fail git diff --cached --check + +' + +test_expect_success 'check with no whitespace errors (diff-index)' ' + + echo "foo();" > x && + git add x && + git diff-index --check HEAD + +' + +test_expect_success 'check with trailing whitespace (diff-index)' ' + + echo "foo(); " > x && + git add x && + test_must_fail git diff-index --check HEAD + +' + +test_expect_success 'check with space before tab in indent (diff-index)' ' + + # indent has space followed by hard tab + echo " foo();" > x && + git add x && + test_must_fail git diff-index --check HEAD + +' + +test_expect_success 'check staged with no whitespace errors (diff-index)' ' + + echo "foo();" > x && + git add x && + git diff-index --cached --check HEAD + +' + +test_expect_success 'check staged with trailing whitespace (diff-index)' ' + + echo "foo(); " > x && + git add x && + test_must_fail git diff-index --cached --check HEAD + +' + +test_expect_success 'check staged with space before tab in indent (diff-index)' ' + + # indent has space followed by hard tab + echo " foo();" > x && + git add x && + test_must_fail git diff-index --cached --check HEAD + +' + +test_expect_success 'check with no whitespace errors (diff-tree)' ' + + echo "foo();" > x && + git commit -m "new commit" x && + git diff-tree --check HEAD^ HEAD + +' + +test_expect_success 'check with trailing whitespace (diff-tree)' ' + + echo "foo(); " > x && + git commit -m "another commit" x && + test_must_fail git diff-tree --check HEAD^ HEAD + +' + +test_expect_success 'check with space before tab in indent (diff-tree)' ' + + # indent has space followed by hard tab + echo " foo();" > x && + git commit -m "yet another" x && + test_must_fail git diff-tree --check HEAD^ HEAD + +' + +test_expect_success 'check trailing whitespace (trailing-space: off)' ' + + git config core.whitespace "-trailing-space" && + echo "foo (); " > x && + git diff --check + +' + +test_expect_success 'check trailing whitespace (trailing-space: on)' ' + + git config core.whitespace "trailing-space" && + echo "foo (); " > x && + test_must_fail git diff --check + +' + +test_expect_success 'check space before tab in indent (space-before-tab: off)' ' + + # indent contains space followed by HT + git config core.whitespace "-space-before-tab" && + echo " foo ();" > x && + git diff --check + +' + +test_expect_success 'check space before tab in indent (space-before-tab: on)' ' + + # indent contains space followed by HT + git config core.whitespace "space-before-tab" && + echo " foo (); " > x && + test_must_fail git diff --check + +' + +test_expect_success 'check spaces as indentation (indent-with-non-tab: off)' ' + + git config core.whitespace "-indent-with-non-tab" + echo " foo ();" > x && + git diff --check + +' + +test_expect_success 'check spaces as indentation (indent-with-non-tab: on)' ' + + git config core.whitespace "indent-with-non-tab" && + echo " foo ();" > x && + test_must_fail git diff --check + +' + +test_expect_success 'check tabs and spaces as indentation (indent-with-non-tab: on)' ' + + git config core.whitespace "indent-with-non-tab" && + echo " foo ();" > x && + test_must_fail git diff --check + +' + +test_expect_success 'line numbers in --check output are correct' ' + + echo "" > x && + echo "foo(); " >> x && + git diff --check | grep "x:2:" + +' + +test_expect_success 'checkdiff detects trailing blank lines' ' + echo "foo();" >x && + echo "" >>x && + git diff --check | grep "ends with blank" +' + +test_expect_success 'checkdiff allows new blank lines' ' + git checkout x && + mv x y && + ( + echo "/* This is new */" && + echo "" && + cat y + ) >x && + git diff --check +' + +test_expect_success 'combined diff with autocrlf conversion' ' + + git reset --hard && + echo >x hello && + git commit -m "one side" x && + git checkout HEAD^ && + echo >x goodbye && + git commit -m "the other side" x && + git config core.autocrlf true && + test_must_fail git merge master && + + git diff | sed -e "1,/^@@@/d" >actual && + ! grep "^-" actual + +' + +test_done + + diff --git a/src/test/resources/mocks/issue10_base.txt b/java-diff-utils/src/test/resources/mocks/issue10_base.txt similarity index 100% rename from src/test/resources/mocks/issue10_base.txt rename to java-diff-utils/src/test/resources/mocks/issue10_base.txt diff --git a/src/test/resources/mocks/issue10_patch.txt b/java-diff-utils/src/test/resources/mocks/issue10_patch.txt similarity index 100% rename from src/test/resources/mocks/issue10_patch.txt rename to java-diff-utils/src/test/resources/mocks/issue10_patch.txt diff --git a/src/test/resources/mocks/issue11_1.txt b/java-diff-utils/src/test/resources/mocks/issue11_1.txt similarity index 100% rename from src/test/resources/mocks/issue11_1.txt rename to java-diff-utils/src/test/resources/mocks/issue11_1.txt diff --git a/src/test/resources/mocks/issue11_2.txt b/java-diff-utils/src/test/resources/mocks/issue11_2.txt similarity index 100% rename from src/test/resources/mocks/issue11_2.txt rename to java-diff-utils/src/test/resources/mocks/issue11_2.txt diff --git a/src/test/resources/mocks/issue15_1.txt b/java-diff-utils/src/test/resources/mocks/issue15_1.txt similarity index 100% rename from src/test/resources/mocks/issue15_1.txt rename to java-diff-utils/src/test/resources/mocks/issue15_1.txt diff --git a/src/test/resources/mocks/issue15_2.txt b/java-diff-utils/src/test/resources/mocks/issue15_2.txt similarity index 100% rename from src/test/resources/mocks/issue15_2.txt rename to java-diff-utils/src/test/resources/mocks/issue15_2.txt diff --git a/src/test/resources/mocks/one_delta_test_original.txt b/java-diff-utils/src/test/resources/mocks/one_delta_test_original.txt similarity index 100% rename from src/test/resources/mocks/one_delta_test_original.txt rename to java-diff-utils/src/test/resources/mocks/one_delta_test_original.txt diff --git a/src/test/resources/mocks/one_delta_test_revised.txt b/java-diff-utils/src/test/resources/mocks/one_delta_test_revised.txt similarity index 100% rename from src/test/resources/mocks/one_delta_test_revised.txt rename to java-diff-utils/src/test/resources/mocks/one_delta_test_revised.txt diff --git a/src/test/resources/mocks/original.txt b/java-diff-utils/src/test/resources/mocks/original.txt similarity index 100% rename from src/test/resources/mocks/original.txt rename to java-diff-utils/src/test/resources/mocks/original.txt diff --git a/src/test/resources/mocks/revised.txt b/java-diff-utils/src/test/resources/mocks/revised.txt similarity index 100% rename from src/test/resources/mocks/revised.txt rename to java-diff-utils/src/test/resources/mocks/revised.txt diff --git a/pom.xml b/pom.xml index b7ca5ea3..8563cdf7 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,14 @@ - + + 4.0.0 io.github.java-diff-utils - java-diff-utils - jar + java-diff-utils-parent 4.1-SNAPSHOT - java-diff-utils + pom + + java-diff-utils + java-diff-utils-jgit + The DiffUtils library for computing diffs, applying patches, generationg side-by-side view in Java. https://github.com/java-diff-utils/java-diff-utils 2009 @@ -26,7 +30,6 @@ https://github.com/java-diff-utils/java-diff-utils.git HEAD - GitHub Issues https://github.com/java-diff-utils/java-diff-utils/issues @@ -41,16 +44,6 @@ Tobias Warneke t.warneke@gmx.net - @@ -61,87 +54,21 @@ A business-friendly OSS license - UTF-8 + 1.8 + 1.8 - - - - junit - junit - 4.12 - jar - test - - - org.eclipse.jgit - org.eclipse.jgit - 4.4.1.201607150455-r - - - com.googlecode.javaewah - JavaEWAH - - - commons-codec - commons-codec - - - commons-logging - commons-logging - - - org.apache.httpcomponents - httpclient - - - com.jcraft - jsch - - - org.slf4j - slf4j-api - - - - - org.assertj - assertj-core - 3.11.1 - test - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.6.1 - - 1.8 - 1.8 - UTF-8 - - - - - - - maven-jar-plugin - 3.0.2 + maven-release-plugin + 2.5.3 - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - com.github.wumpz.diffutils - - + true + false + forked-path @@ -174,26 +101,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - 2.19.1 - - - **/LR*.java - - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - true - false - forked-path - - org.apache.maven.plugins maven-checkstyle-plugin @@ -215,12 +122,6 @@ - @@ -253,6 +154,16 @@ + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.1 + + + **/LR*.java + + + @@ -312,5 +223,4 @@ - - + \ No newline at end of file From 53c9ca3478f6c247bbf4561227f2a0eea1f99035 Mon Sep 17 00:00:00 2001 From: Tobias Date: Tue, 5 Nov 2019 16:02:48 +0100 Subject: [PATCH 065/266] Create FUNDING.yml --- .github/FUNDING.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 00000000..5926aa29 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,12 @@ +# These are supported funding model platforms + +github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] +patreon: # Replace with a single Patreon username +open_collective: # Replace with a single Open Collective username +ko_fi: # Replace with a single Ko-fi username +tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel +community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry +liberapay: # Replace with a single Liberapay username +issuehunt: # Replace with a single IssueHunt username +otechie: # Replace with a single Otechie username +custom: https://paypal.me/wumpz From 23a9c523c61392cae38347a951214b7564f8bd44 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Wed, 6 Nov 2019 22:24:48 +0100 Subject: [PATCH 066/266] [maven-release-plugin] prepare release java-diff-utils-parent-4.1 --- java-diff-utils-jgit/pom.xml | 2 +- java-diff-utils/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml index 6a7f281b..52b16033 100644 --- a/java-diff-utils-jgit/pom.xml +++ b/java-diff-utils-jgit/pom.xml @@ -4,7 +4,7 @@ io.github.java-diff-utils java-diff-utils-parent - 4.1-SNAPSHOT + 4.1 java-diff-utils-jgit jar diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml index 7ffe5d33..8e40ac58 100644 --- a/java-diff-utils/pom.xml +++ b/java-diff-utils/pom.xml @@ -7,7 +7,7 @@ io.github.java-diff-utils java-diff-utils-parent - 4.1-SNAPSHOT + 4.1 UTF-8 diff --git a/pom.xml b/pom.xml index 8563cdf7..b78b02dc 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.github.java-diff-utils java-diff-utils-parent - 4.1-SNAPSHOT + 4.1 pom java-diff-utils @@ -28,7 +28,7 @@ scm:git:https://github.com/java-diff-utils/java-diff-utils.git scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git https://github.com/java-diff-utils/java-diff-utils.git - HEAD + java-diff-utils-parent-4.1 GitHub Issues From 6e4e3910c14cfab817fdb55e696813e8e22b34df Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Wed, 6 Nov 2019 22:24:49 +0100 Subject: [PATCH 067/266] [maven-release-plugin] prepare for next development iteration --- java-diff-utils-jgit/pom.xml | 2 +- java-diff-utils/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml index 52b16033..a664fb34 100644 --- a/java-diff-utils-jgit/pom.xml +++ b/java-diff-utils-jgit/pom.xml @@ -4,7 +4,7 @@ io.github.java-diff-utils java-diff-utils-parent - 4.1 + 4.2-SNAPSHOT java-diff-utils-jgit jar diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml index 8e40ac58..8774c243 100644 --- a/java-diff-utils/pom.xml +++ b/java-diff-utils/pom.xml @@ -7,7 +7,7 @@ io.github.java-diff-utils java-diff-utils-parent - 4.1 + 4.2-SNAPSHOT UTF-8 diff --git a/pom.xml b/pom.xml index b78b02dc..2e5ba819 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.github.java-diff-utils java-diff-utils-parent - 4.1 + 4.2-SNAPSHOT pom java-diff-utils @@ -28,7 +28,7 @@ scm:git:https://github.com/java-diff-utils/java-diff-utils.git scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git https://github.com/java-diff-utils/java-diff-utils.git - java-diff-utils-parent-4.1 + HEAD GitHub Issues From ce4007b12469530eef79bc49a6a9904a19430ffb Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Wed, 6 Nov 2019 22:42:43 +0100 Subject: [PATCH 068/266] corrected pom.xml due to sonatype staging validation --- java-diff-utils/pom.xml | 1 - pom.xml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml index 8774c243..3dc41db9 100644 --- a/java-diff-utils/pom.xml +++ b/java-diff-utils/pom.xml @@ -3,7 +3,6 @@ io.github.java-diff-utils java-diff-utils jar - java-diff-utils io.github.java-diff-utils java-diff-utils-parent diff --git a/pom.xml b/pom.xml index 2e5ba819..df716664 100644 --- a/pom.xml +++ b/pom.xml @@ -4,6 +4,7 @@ io.github.java-diff-utils java-diff-utils-parent 4.2-SNAPSHOT + java-diff-utils pom java-diff-utils From 0d9f2ce62dd7c3448c3507e6e9e659a3abc060b1 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Wed, 6 Nov 2019 22:44:40 +0100 Subject: [PATCH 069/266] [maven-release-plugin] prepare release java-diff-utils-parent-4.2 --- java-diff-utils-jgit/pom.xml | 2 +- java-diff-utils/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml index a664fb34..dddb56b7 100644 --- a/java-diff-utils-jgit/pom.xml +++ b/java-diff-utils-jgit/pom.xml @@ -4,7 +4,7 @@ io.github.java-diff-utils java-diff-utils-parent - 4.2-SNAPSHOT + 4.2 java-diff-utils-jgit jar diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml index 3dc41db9..c557b835 100644 --- a/java-diff-utils/pom.xml +++ b/java-diff-utils/pom.xml @@ -6,7 +6,7 @@ io.github.java-diff-utils java-diff-utils-parent - 4.2-SNAPSHOT + 4.2 UTF-8 diff --git a/pom.xml b/pom.xml index df716664..fbc6f3ea 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.github.java-diff-utils java-diff-utils-parent - 4.2-SNAPSHOT + 4.2 java-diff-utils pom @@ -29,7 +29,7 @@ scm:git:https://github.com/java-diff-utils/java-diff-utils.git scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git https://github.com/java-diff-utils/java-diff-utils.git - HEAD + java-diff-utils-parent-4.2 GitHub Issues From 6c617ff9495513ef054a5c87dccd8cdec0916cf9 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Wed, 6 Nov 2019 22:44:42 +0100 Subject: [PATCH 070/266] [maven-release-plugin] prepare for next development iteration --- java-diff-utils-jgit/pom.xml | 2 +- java-diff-utils/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml index dddb56b7..47d8ee9c 100644 --- a/java-diff-utils-jgit/pom.xml +++ b/java-diff-utils-jgit/pom.xml @@ -4,7 +4,7 @@ io.github.java-diff-utils java-diff-utils-parent - 4.2 + 4.3-SNAPSHOT java-diff-utils-jgit jar diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml index c557b835..3d09a077 100644 --- a/java-diff-utils/pom.xml +++ b/java-diff-utils/pom.xml @@ -6,7 +6,7 @@ io.github.java-diff-utils java-diff-utils-parent - 4.2 + 4.3-SNAPSHOT UTF-8 diff --git a/pom.xml b/pom.xml index fbc6f3ea..42487a81 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.github.java-diff-utils java-diff-utils-parent - 4.2 + 4.3-SNAPSHOT java-diff-utils pom @@ -29,7 +29,7 @@ scm:git:https://github.com/java-diff-utils/java-diff-utils.git scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git https://github.com/java-diff-utils/java-diff-utils.git - java-diff-utils-parent-4.2 + HEAD GitHub Issues From 8c7bb30b25a3b2e8a61497e8d9ccec6725c91ea1 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Wed, 6 Nov 2019 22:54:16 +0100 Subject: [PATCH 071/266] [maven-release-plugin] prepare release java-diff-utils-parent-4.3 --- java-diff-utils-jgit/pom.xml | 2 +- java-diff-utils/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml index 47d8ee9c..7363889f 100644 --- a/java-diff-utils-jgit/pom.xml +++ b/java-diff-utils-jgit/pom.xml @@ -4,7 +4,7 @@ io.github.java-diff-utils java-diff-utils-parent - 4.3-SNAPSHOT + 4.3 java-diff-utils-jgit jar diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml index 3d09a077..a1b06cfd 100644 --- a/java-diff-utils/pom.xml +++ b/java-diff-utils/pom.xml @@ -6,7 +6,7 @@ io.github.java-diff-utils java-diff-utils-parent - 4.3-SNAPSHOT + 4.3 UTF-8 diff --git a/pom.xml b/pom.xml index 42487a81..738d9be7 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.github.java-diff-utils java-diff-utils-parent - 4.3-SNAPSHOT + 4.3 java-diff-utils pom @@ -29,7 +29,7 @@ scm:git:https://github.com/java-diff-utils/java-diff-utils.git scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git https://github.com/java-diff-utils/java-diff-utils.git - HEAD + java-diff-utils-parent-4.3 GitHub Issues From ab9908f3bc85bb80a83e6e43633efa17c0b53b03 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Wed, 6 Nov 2019 22:54:17 +0100 Subject: [PATCH 072/266] [maven-release-plugin] prepare for next development iteration --- java-diff-utils-jgit/pom.xml | 2 +- java-diff-utils/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml index 7363889f..3875a7c2 100644 --- a/java-diff-utils-jgit/pom.xml +++ b/java-diff-utils-jgit/pom.xml @@ -4,7 +4,7 @@ io.github.java-diff-utils java-diff-utils-parent - 4.3 + 4.4-SNAPSHOT java-diff-utils-jgit jar diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml index a1b06cfd..38a56a6e 100644 --- a/java-diff-utils/pom.xml +++ b/java-diff-utils/pom.xml @@ -6,7 +6,7 @@ io.github.java-diff-utils java-diff-utils-parent - 4.3 + 4.4-SNAPSHOT UTF-8 diff --git a/pom.xml b/pom.xml index 738d9be7..399ceca5 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.github.java-diff-utils java-diff-utils-parent - 4.3 + 4.4-SNAPSHOT java-diff-utils pom @@ -29,7 +29,7 @@ scm:git:https://github.com/java-diff-utils/java-diff-utils.git scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git https://github.com/java-diff-utils/java-diff-utils.git - java-diff-utils-parent-4.3 + HEAD GitHub Issues From f194a871b1a7c4f40c35cda5a900ff4352c4c9cf Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Wed, 6 Nov 2019 22:57:19 +0100 Subject: [PATCH 073/266] corrected pom.xml due to sonatype staging validation --- java-diff-utils-jgit/pom.xml | 1 + java-diff-utils/pom.xml | 1 + pom.xml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml index 3875a7c2..59d6e365 100644 --- a/java-diff-utils-jgit/pom.xml +++ b/java-diff-utils-jgit/pom.xml @@ -7,6 +7,7 @@ 4.4-SNAPSHOT java-diff-utils-jgit + java-diff-utils-jgit jar This is an extension of java-diff-utils using jgit to use its implementation of some difference algorithms. diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml index 38a56a6e..2985af43 100644 --- a/java-diff-utils/pom.xml +++ b/java-diff-utils/pom.xml @@ -3,6 +3,7 @@ io.github.java-diff-utils java-diff-utils jar + java-diff-utils io.github.java-diff-utils java-diff-utils-parent diff --git a/pom.xml b/pom.xml index 399ceca5..987e8fbd 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.github.java-diff-utils java-diff-utils-parent 4.4-SNAPSHOT - java-diff-utils + java-diff-utils-parent pom java-diff-utils From d5f7ffca5c697c271102092deb1f8657a10c4704 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Wed, 6 Nov 2019 22:58:41 +0100 Subject: [PATCH 074/266] [maven-release-plugin] prepare release java-diff-utils-parent-4.4 --- java-diff-utils-jgit/pom.xml | 2 +- java-diff-utils/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml index 59d6e365..7b37a550 100644 --- a/java-diff-utils-jgit/pom.xml +++ b/java-diff-utils-jgit/pom.xml @@ -4,7 +4,7 @@ io.github.java-diff-utils java-diff-utils-parent - 4.4-SNAPSHOT + 4.4 java-diff-utils-jgit java-diff-utils-jgit diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml index 2985af43..ea4d774a 100644 --- a/java-diff-utils/pom.xml +++ b/java-diff-utils/pom.xml @@ -7,7 +7,7 @@ io.github.java-diff-utils java-diff-utils-parent - 4.4-SNAPSHOT + 4.4 UTF-8 diff --git a/pom.xml b/pom.xml index 987e8fbd..467e46b8 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.github.java-diff-utils java-diff-utils-parent - 4.4-SNAPSHOT + 4.4 java-diff-utils-parent pom @@ -29,7 +29,7 @@ scm:git:https://github.com/java-diff-utils/java-diff-utils.git scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git https://github.com/java-diff-utils/java-diff-utils.git - HEAD + java-diff-utils-parent-4.4 GitHub Issues From 6c58e219b01b3595a8f674d52dc8e1105c0ec8bc Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Wed, 6 Nov 2019 22:58:42 +0100 Subject: [PATCH 075/266] [maven-release-plugin] prepare for next development iteration --- java-diff-utils-jgit/pom.xml | 2 +- java-diff-utils/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml index 7b37a550..b9b07868 100644 --- a/java-diff-utils-jgit/pom.xml +++ b/java-diff-utils-jgit/pom.xml @@ -4,7 +4,7 @@ io.github.java-diff-utils java-diff-utils-parent - 4.4 + 4.5-SNAPSHOT java-diff-utils-jgit java-diff-utils-jgit diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml index ea4d774a..2817a35b 100644 --- a/java-diff-utils/pom.xml +++ b/java-diff-utils/pom.xml @@ -7,7 +7,7 @@ io.github.java-diff-utils java-diff-utils-parent - 4.4 + 4.5-SNAPSHOT UTF-8 diff --git a/pom.xml b/pom.xml index 467e46b8..afb526e6 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.github.java-diff-utils java-diff-utils-parent - 4.4 + 4.5-SNAPSHOT java-diff-utils-parent pom @@ -29,7 +29,7 @@ scm:git:https://github.com/java-diff-utils/java-diff-utils.git scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git https://github.com/java-diff-utils/java-diff-utils.git - java-diff-utils-parent-4.4 + HEAD GitHub Issues From 1d98467cc3bec0e41d436f904b2b0201da17183d Mon Sep 17 00:00:00 2001 From: Tobias Date: Fri, 8 Nov 2019 08:56:42 +0100 Subject: [PATCH 076/266] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e0d8f122..b7c890c6 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ Just add the code below to your maven dependencies: io.github.java-diff-utils java-diff-utils - 4.0 + 4.4 ``` @@ -88,5 +88,5 @@ or using gradle: ```groovy // https://mvnrepository.com/artifact/io.github.java-diff-utils/java-diff-utils -implementation "io.github.java-diff-utils:java-diff-utils:4.0" +implementation "io.github.java-diff-utils:java-diff-utils:4.4" ``` From 3b45d8f37d7b7a32baeed4c4a79a6a61eda875df Mon Sep 17 00:00:00 2001 From: Tobias Date: Sun, 10 Nov 2019 21:17:42 +0100 Subject: [PATCH 077/266] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ba1be15..4ef251e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,12 @@ This project uses a custom versioning scheme (and not [Semantic Versioning](http ## [Unreleased] +## [4.4] – 2019-11-06 + ### Changed +* java-diff-utils is now a multi module project. The main project java-diff-utils now comes without any dependencies. +* started reimplementation of unified diff tools * Exchange `0 += 1` for `0 = 1` in UnifiedDiffUtils * preview of new Unified Diff Reader / Writer. This is not yet feature complete but passes the tests of the old version. * feel free to issue some change requests for the api. From ededee059603f8cab6cd0bd18b1f07b032148370 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Wed, 13 Nov 2019 23:16:38 +0100 Subject: [PATCH 078/266] fixes #51 --- java-diff-utils/nb-configuration.xml | 18 ++++++++++++++++++ java-diff-utils/pom.xml | 2 +- .../difflib/unifieddiff/UnifiedDiffReader.java | 8 +++++--- .../unifieddiff/UnifiedDiffReaderTest.java | 16 ++++++++++++++++ .../unifieddiff/problem_diff_issue51.diff | 11 +++++++++++ 5 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 java-diff-utils/nb-configuration.xml create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue51.diff diff --git a/java-diff-utils/nb-configuration.xml b/java-diff-utils/nb-configuration.xml new file mode 100644 index 00000000..a65c4514 --- /dev/null +++ b/java-diff-utils/nb-configuration.xml @@ -0,0 +1,18 @@ + + + + + + JDK_1.8 + + diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml index 2817a35b..9a42be39 100644 --- a/java-diff-utils/pom.xml +++ b/java-diff-utils/pom.xml @@ -49,7 +49,7 @@ ${project.build.outputDirectory}/META-INF/MANIFEST.MF - io.github.java-diff-utils + io.github.javadiffutils diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java index c208786c..75dff38f 100644 --- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java +++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java @@ -97,7 +97,9 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException { if (processLine(line, LINE_NORMAL, LINE_ADD, LINE_DEL) == false) { throw new UnifiedDiffParserException("expected data line not found"); } - if (originalTxt.size() == old_size && revisedTxt.size() == new_size) { + if ((originalTxt.size() == old_size && revisedTxt.size() == new_size) + || (old_size==0 && new_size==0 && originalTxt.size() == this.old_ln + && revisedTxt.size() == this.new_ln)) { finalizeChunk(); break; } @@ -241,9 +243,9 @@ private String extractFileName(String _line) { Matcher matcher = TIMESTAMP_REGEXP.matcher(_line); String line = _line; if (matcher.find()) { - line = line.substring(1, matcher.start()); + line = line.substring(0, matcher.start()); } - return line.substring(4).replaceFirst("^(a|b)\\/", "") + return line.substring(4).replaceFirst("^(a|b|old|new)(\\/)?", "") .replace(TIMESTAMP_REGEXP.toString(), "").trim(); } diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java index eb0280db..1414562b 100644 --- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java +++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java @@ -141,4 +141,20 @@ public void testParseIssue33() throws IOException { assertThat(diff.getTail()).isNull(); assertThat(diff.getHeader()).isNull(); } + + @Test + public void testParseIssue51() throws IOException { + UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff( + UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue51.diff")); + + System.out.println(diff); + + assertThat(diff.getFiles().size()).isEqualTo(2); + + UnifiedDiffFile file1 = diff.getFiles().get(0); + assertThat(file1.getFromFile()).isEqualTo("f1"); + assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1); + + assertThat(diff.getTail()).isNull(); + } } diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue51.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue51.diff new file mode 100644 index 00000000..0c8b483f --- /dev/null +++ b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue51.diff @@ -0,0 +1,11 @@ +diff -U0 old/f1 new/f1 +--- old/f1 2019-09-25 14:38:06.000000000 +0200 ++++ new/f1 2019-09-25 14:38:27.000000000 +0200 +@@ -1 +1 @@ +-a\nb ++a\nb\nd +diff -U0 old/f2 new/f2 +--- old/f2 2019-09-25 14:38:14.000000000 +0200 ++++ new/f2 2019-09-25 14:38:32.000000000 +0200 +@@ -1 +1 @@ +-a\nc \ No newline at end of file From 84662956a0ab6c62004cc7f42c43be795d230674 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Sun, 17 Nov 2019 22:04:38 +0100 Subject: [PATCH 079/266] --- java-diff-utils-jgit/nb-configuration.xml | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 java-diff-utils-jgit/nb-configuration.xml diff --git a/java-diff-utils-jgit/nb-configuration.xml b/java-diff-utils-jgit/nb-configuration.xml deleted file mode 100644 index ca588fa8..00000000 --- a/java-diff-utils-jgit/nb-configuration.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - none - JDK_1.8 - - From 49b20133c2edb3b97035310302ceda8c69486ac5 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Sun, 17 Nov 2019 22:07:31 +0100 Subject: [PATCH 080/266] [maven-release-plugin] prepare release java-diff-utils-parent-4.5 --- java-diff-utils-jgit/pom.xml | 2 +- java-diff-utils/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml index b9b07868..4bc8e7c6 100644 --- a/java-diff-utils-jgit/pom.xml +++ b/java-diff-utils-jgit/pom.xml @@ -4,7 +4,7 @@ io.github.java-diff-utils java-diff-utils-parent - 4.5-SNAPSHOT + 4.5 java-diff-utils-jgit java-diff-utils-jgit diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml index 9a42be39..2abcaf29 100644 --- a/java-diff-utils/pom.xml +++ b/java-diff-utils/pom.xml @@ -7,7 +7,7 @@ io.github.java-diff-utils java-diff-utils-parent - 4.5-SNAPSHOT + 4.5 UTF-8 diff --git a/pom.xml b/pom.xml index afb526e6..0c94d0e9 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.github.java-diff-utils java-diff-utils-parent - 4.5-SNAPSHOT + 4.5 java-diff-utils-parent pom @@ -29,7 +29,7 @@ scm:git:https://github.com/java-diff-utils/java-diff-utils.git scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git https://github.com/java-diff-utils/java-diff-utils.git - HEAD + java-diff-utils-parent-4.5 GitHub Issues From 3c6fa5f4fe7eabb3430b5a95eae2c3049971a7a2 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Sun, 17 Nov 2019 22:07:32 +0100 Subject: [PATCH 081/266] [maven-release-plugin] prepare for next development iteration --- java-diff-utils-jgit/pom.xml | 2 +- java-diff-utils/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml index 4bc8e7c6..5151af89 100644 --- a/java-diff-utils-jgit/pom.xml +++ b/java-diff-utils-jgit/pom.xml @@ -4,7 +4,7 @@ io.github.java-diff-utils java-diff-utils-parent - 4.5 + 4.6-SNAPSHOT java-diff-utils-jgit java-diff-utils-jgit diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml index 2abcaf29..56d8303d 100644 --- a/java-diff-utils/pom.xml +++ b/java-diff-utils/pom.xml @@ -7,7 +7,7 @@ io.github.java-diff-utils java-diff-utils-parent - 4.5 + 4.6-SNAPSHOT UTF-8 diff --git a/pom.xml b/pom.xml index 0c94d0e9..6f5c4776 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.github.java-diff-utils java-diff-utils-parent - 4.5 + 4.6-SNAPSHOT java-diff-utils-parent pom @@ -29,7 +29,7 @@ scm:git:https://github.com/java-diff-utils/java-diff-utils.git scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git https://github.com/java-diff-utils/java-diff-utils.git - java-diff-utils-parent-4.5 + HEAD GitHub Issues From 93334b5da72dc2b96aad176c54af04bf072c632d Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Mon, 18 Nov 2019 11:10:41 +0100 Subject: [PATCH 082/266] Update release version in README.md (#62) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b7c890c6..9e5221ef 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ Just add the code below to your maven dependencies: io.github.java-diff-utils java-diff-utils - 4.4 + 4.5 ``` @@ -88,5 +88,5 @@ or using gradle: ```groovy // https://mvnrepository.com/artifact/io.github.java-diff-utils/java-diff-utils -implementation "io.github.java-diff-utils:java-diff-utils:4.4" +implementation "io.github.java-diff-utils:java-diff-utils:4.5" ``` From 15a5f060b3822f721e8a50ffb92a3ee86f095e58 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Mon, 18 Nov 2019 11:11:53 +0100 Subject: [PATCH 083/266] Fix links in CHANGELOG.md (#61) --- CHANGELOG.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ef251e1..b6c3c28e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -82,8 +82,10 @@ This project uses a custom versioning scheme (and not [Semantic Versioning](http * Ant build script * Generate output in unified diff format (thanks for Bill James) -[Unreleased]: https://github.com/java-diff-utils/java-diff-utils/compare/java-diff-utils-4.0...HEAD -[4.0]: https://github.com/java-diff-utils/java-diff-utils/compare/diff-utils-3.0...java-diff-utils-4.0 -[3.0]: https://github.com/java-diff-utils/java-diff-utils/compare/diff-utils-2.2...diff-utils-3.0 -[2.2]: https://github.com/java-diff-utils/java-diff-utils/compare/diff-utils-2.0...diff-utils-2.2 +[Unreleased]: https://github.com/java-diff-utils/java-diff-utils/compare/java-diff-utils-parent-4.5...HEAD +[4.5]: https://github.com/java-diff-utils/java-diff-utils/compare/java-diff-utils-parent-4.4...java-diff-utils-parent-4.5 +[4.4]: https://github.com/java-diff-utils/java-diff-utils/compare/java-diff-utils-4.0...java-diff-utils-parent-4.4 +[4.0]: https://github.com/java-diff-utils/java-diff-utils/compare/diffutils-3.0...java-diff-utils-4.0 +[3.0]: https://github.com/java-diff-utils/java-diff-utils/compare/diffutils-2.2...diffutils-3.0 +[2.2]: https://github.com/java-diff-utils/java-diff-utils/compare/diffutils-2.0...diffutils-2.2 From 81085d368ca8aa1b5dc0d5da5c82cc0665966f91 Mon Sep 17 00:00:00 2001 From: Ibrahim ali abdelghany Date: Mon, 18 Nov 2019 17:29:31 +0200 Subject: [PATCH 084/266] Extract duplicate code into method. (#58) * Extract duplicate code into method. * fix conflicts. --- .../com/github/difflib/UnifiedDiffUtils.java | 35 ++++++------------- 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java index d5812c31..2ed5ba8f 100644 --- a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java +++ b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java @@ -59,25 +59,7 @@ public static Patch parseUnifiedDiff(List diff) { Matcher m = UNIFIED_DIFF_CHUNK_REGEXP.matcher(line); if (m.find()) { // Process the lines in the previous chunk - if (!rawChunk.isEmpty()) { - List oldChunkLines = new ArrayList<>(); - List newChunkLines = new ArrayList<>(); - - for (String[] raw_line : rawChunk) { - tag = raw_line[0]; - rest = raw_line[1]; - if (" ".equals(tag) || "-".equals(tag)) { - oldChunkLines.add(rest); - } - if (" ".equals(tag) || "+".equals(tag)) { - newChunkLines.add(rest); - } - } - patch.addDelta(new ChangeDelta<>(new Chunk<>( - old_ln - 1, oldChunkLines), new Chunk<>( - new_ln - 1, newChunkLines))); - rawChunk.clear(); - } + processLinesInPrevChunk(rawChunk, patch, old_ln, new_ln); // Parse the @@ header old_ln = m.group(1) == null ? 1 : Integer.parseInt(m.group(1)); new_ln = m.group(3) == null ? 1 : Integer.parseInt(m.group(3)); @@ -102,6 +84,14 @@ public static Patch parseUnifiedDiff(List diff) { } // Process the lines in the last chunk + processLinesInPrevChunk(rawChunk, patch, old_ln, new_ln); + + return patch; + } + + private static void processLinesInPrevChunk(List rawChunk, Patch patch, int old_ln, int new_ln) { + String tag; + String rest; if (!rawChunk.isEmpty()) { List oldChunkLines = new ArrayList<>(); List newChunkLines = new ArrayList<>(); @@ -116,14 +106,11 @@ public static Patch parseUnifiedDiff(List diff) { newChunkLines.add(rest); } } - patch.addDelta(new ChangeDelta<>(new Chunk<>( - old_ln - 1, oldChunkLines), new Chunk<>(new_ln - 1, - newChunkLines))); + old_ln - 1, oldChunkLines), new Chunk<>( + new_ln - 1, newChunkLines))); rawChunk.clear(); } - - return patch; } /** From 7dec3fef4035c9a00acbeb7e5e4bc41f3b99da11 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Wed, 25 Dec 2019 23:35:47 +0100 Subject: [PATCH 085/266] fixes #47 --- .../com/github/difflib/UnifiedDiffUtils.java | 27 +++++++++++-------- .../difflib/GenerateUnifiedDiffTest.java | 20 ++++++++++++++ 2 files changed, 36 insertions(+), 11 deletions(-) diff --git a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java index d5812c31..be070f7b 100644 --- a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java +++ b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java @@ -127,8 +127,8 @@ public static Patch parseUnifiedDiff(List diff) { } /** - * generateUnifiedDiff takes a Patch and some other arguments, returning the Unified Diff format text representing - * the Patch. + * generateUnifiedDiff takes a Patch and some other arguments, returning the Unified Diff format + * text representing the Patch. * * @param originalFileName - Filename of the original (unrevised file) * @param revisedFileName - Filename of the revised file @@ -179,7 +179,7 @@ public static List generateUnifiedDiff(String originalFileName, // then create a new set and add the current Delta to // it. List curBlock = processDeltas(originalLines, - deltas, contextSize); + deltas, contextSize, false); ret.addAll(curBlock); deltas.clear(); deltas.add(nextDelta); @@ -190,7 +190,7 @@ public static List generateUnifiedDiff(String originalFileName, } // don't forget to process the last set of Deltas List curBlock = processDeltas(originalLines, deltas, - contextSize); + contextSize, patchDeltas.size() == 1 && originalFileName == null); ret.addAll(curBlock); return ret; } @@ -198,7 +198,8 @@ public static List generateUnifiedDiff(String originalFileName, } /** - * processDeltas takes a list of Deltas and outputs them together in a single block of Unified-Diff-format text. + * processDeltas takes a list of Deltas and outputs them together in a single block of + * Unified-Diff-format text. * * @param origLines - the lines of the original file * @param deltas - the Deltas to be output as a single block @@ -207,18 +208,22 @@ public static List generateUnifiedDiff(String originalFileName, * @author Bill James (tankerbay@gmail.com) */ private static List processDeltas(List origLines, - List> deltas, int contextSize) { + List> deltas, int contextSize, boolean newFile) { List buffer = new ArrayList<>(); int origTotal = 0; // counter for total lines output from Original int revTotal = 0; // counter for total lines output from Original int line; AbstractDelta curDelta = deltas.get(0); - - // NOTE: +1 to overcome the 0-offset Position - int origStart = curDelta.getSource().getPosition() + 1 - contextSize; - if (origStart < 1) { - origStart = 1; + int origStart; + if (newFile) { + origStart = 0; + } else { + // NOTE: +1 to overcome the 0-offset Position + origStart = curDelta.getSource().getPosition() + 1 - contextSize; + if (origStart < 1) { + origStart = 1; + } } int revStart = curDelta.getTarget().getPosition() + 1 - contextSize; diff --git a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java index c6bfc4ec..f5d00576 100644 --- a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java +++ b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java @@ -104,6 +104,26 @@ public void testDiffWithHeaderLineInText() throws DiffException { original, patch, 10); UnifiedDiffUtils.parseUnifiedDiff(udiff); } + + /** + * Issue 47 + */ + @Test + public void testNewFileCreation() throws DiffException { + List original = new ArrayList<>(); + List revised = new ArrayList<>(); + + revised.add("line1"); + revised.add("line2"); + + Patch patch = DiffUtils.diff(original, revised); + List udiff = UnifiedDiffUtils.generateUnifiedDiff(null, "revised", + original, patch, 10); + + assertEquals("@@ -0,0 +1,2 @@", udiff.get(2)); + + UnifiedDiffUtils.parseUnifiedDiff(udiff); + } private void verify(List origLines, List revLines, String originalFile, String revisedFile) throws DiffException { From 3b236562607bcc37098afd60ace301fcbcd06e01 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Sat, 4 Jan 2020 01:18:22 +0100 Subject: [PATCH 086/266] included new file diff capability to new unified diff parser --- .../unifieddiff/UnifiedDiffWriter.java | 30 ++++++++++------- .../difflib/GenerateUnifiedDiffTest.java | 2 ++ .../unifieddiff/UnifiedDiffWriterTest.java | 33 +++++++++++++++++++ 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java index c9488f9c..dd338fd4 100644 --- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java +++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java @@ -44,7 +44,9 @@ public static void write(UnifiedDiff diff, Function> origin } public static void write(UnifiedDiff diff, Function> originalLinesProvider, Consumer writer, int contextSize) throws IOException { - writer.accept(diff.getHeader()); + if (diff.getHeader() != null) { + writer.accept(diff.getHeader()); + } for (UnifiedDiffFile file : diff.getFiles()) { List> patchDeltas = new ArrayList<>( @@ -54,9 +56,9 @@ public static void write(UnifiedDiff diff, Function> origin if (file.getIndex() != null) { writer.accept("index " + file.getIndex()); } - if (file.getFromFile() != null) { - writer.accept("--- " + file.getFromFile()); - } + + writer.accept("--- " + file.getFromFile()); + if (file.getToFile() != null) { writer.accept("+++ " + file.getToFile()); } @@ -83,7 +85,7 @@ public static void write(UnifiedDiff diff, Function> origin // if it isn't, output the current set, // then create a new set and add the current Delta to // it. - processDeltas(writer, originalLines, deltas, contextSize); + processDeltas(writer, originalLines, deltas, contextSize, false); deltas.clear(); deltas.add(nextDelta); } @@ -92,7 +94,8 @@ public static void write(UnifiedDiff diff, Function> origin } // don't forget to process the last set of Deltas - processDeltas(writer, originalLines, deltas, contextSize); + processDeltas(writer, originalLines, deltas, contextSize, + patchDeltas.size() == 1 && file.getFromFile() == null); } } @@ -104,7 +107,7 @@ public static void write(UnifiedDiff diff, Function> origin private static void processDeltas(Consumer writer, List origLines, List> deltas, - int contextSize) { + int contextSize, boolean newFile) { List buffer = new ArrayList<>(); int origTotal = 0; // counter for total lines output from Original int revTotal = 0; // counter for total lines output from Original @@ -112,10 +115,15 @@ private static void processDeltas(Consumer writer, AbstractDelta curDelta = deltas.get(0); - // NOTE: +1 to overcome the 0-offset Position - int origStart = curDelta.getSource().getPosition() + 1 - contextSize; - if (origStart < 1) { - origStart = 1; + int origStart; + if (newFile) { + origStart = 0; + } else { + // NOTE: +1 to overcome the 0-offset Position + origStart = curDelta.getSource().getPosition() + 1 - contextSize; + if (origStart < 1) { + origStart = 1; + } } int revStart = curDelta.getTarget().getPosition() + 1 - contextSize; diff --git a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java index f5d00576..5cf3b4f1 100644 --- a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java +++ b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java @@ -120,6 +120,8 @@ public void testNewFileCreation() throws DiffException { List udiff = UnifiedDiffUtils.generateUnifiedDiff(null, "revised", original, patch, 10); + assertEquals("--- null", udiff.get(0)); + assertEquals("+++ revised", udiff.get(1)); assertEquals("@@ -0,0 +1,2 @@", udiff.get(2)); UnifiedDiffUtils.parseUnifiedDiff(udiff); diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java index 1972ab39..24b0a751 100644 --- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java +++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java @@ -15,6 +15,9 @@ */ package com.github.difflib.unifieddiff; +import com.github.difflib.DiffUtils; +import com.github.difflib.algorithm.DiffException; +import com.github.difflib.patch.Patch; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.StringWriter; @@ -23,6 +26,9 @@ import java.nio.charset.Charset; import java.nio.file.Files; import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; +import static org.junit.Assert.assertEquals; import org.junit.Test; /** @@ -43,6 +49,33 @@ public void testWrite() throws URISyntaxException, IOException { // UnifiedDiffWriter.write(diff, writer); // System.out.println(writer.toString()); } + + /** + * Issue 47 + */ + @Test + public void testWriteWithNewFile() throws URISyntaxException, IOException, DiffException { + + List original = new ArrayList<>(); + List revised = new ArrayList<>(); + + revised.add("line1"); + revised.add("line2"); + + Patch patch = DiffUtils.diff(original, revised); + UnifiedDiff diff = new UnifiedDiff(); + diff.addFile( UnifiedDiffFile.from(null, "revised", patch) ); + + StringWriter writer = new StringWriter(); + UnifiedDiffWriter.write(diff, f -> original, writer, 5); + System.out.println(writer.toString()); + + String[] lines = writer.toString().split("\\n"); + + assertEquals("--- null", lines[0]); + assertEquals("+++ revised", lines[1]); + assertEquals("@@ -0,0 +1,2 @@", lines[2]); + } static String readFile(URI path, Charset encoding) throws IOException { From ca0959a0a11ec52809bf6753a0f2510e433c1dc9 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Sat, 4 Jan 2020 01:20:57 +0100 Subject: [PATCH 087/266] included new file diff capability to new unified diff parser --- .../github/difflib/unifieddiff/UnifiedDiffWriterTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java index 24b0a751..f7a28b3d 100644 --- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java +++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java @@ -29,6 +29,7 @@ import java.util.ArrayList; import java.util.List; import static org.junit.Assert.assertEquals; +import org.junit.Ignore; import org.junit.Test; /** @@ -41,13 +42,14 @@ public UnifiedDiffWriterTest() { } @Test + @Ignore public void testWrite() throws URISyntaxException, IOException { String str = readFile(UnifiedDiffReaderTest.class.getResource("jsqlparser_patch_1.diff").toURI(), Charset.defaultCharset()); UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(new ByteArrayInputStream(str.getBytes())); StringWriter writer = new StringWriter(); -// UnifiedDiffWriter.write(diff, writer); -// System.out.println(writer.toString()); + UnifiedDiffWriter.write(diff, f -> null, writer, 5); + System.out.println(writer.toString()); } /** From 94ffdab46f758635ac77ec422aa2394d6740d2a1 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Sat, 4 Jan 2020 23:45:25 +0100 Subject: [PATCH 088/266] included new file diff capability to new unified diff parser --- .../github/difflib/unifieddiff/UnifiedDiffWriter.java | 9 ++++++--- .../difflib/unifieddiff/UnifiedDiffWriterTest.java | 5 ++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java index dd338fd4..54259f77 100644 --- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java +++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java @@ -20,6 +20,7 @@ import java.io.Writer; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.function.Consumer; import java.util.function.Function; import java.util.logging.Level; @@ -34,6 +35,7 @@ public class UnifiedDiffWriter { private static final Logger LOG = Logger.getLogger(UnifiedDiffWriter.class.getName()); public static void write(UnifiedDiff diff, Function> originalLinesProvider, Writer writer, int contextSize) throws IOException { + Objects.requireNonNull(originalLinesProvider, "original lines provider needs to be specified"); write(diff, originalLinesProvider, line -> { try { writer.append(line).append("\n"); @@ -138,7 +140,8 @@ private static void processDeltas(Consumer writer, } // output the context before the first Delta - for (line = contextStart; line < curDelta.getSource().getPosition(); line++) { // + for (line = contextStart; line < curDelta.getSource().getPosition() + && line < origLines.size(); line++) { // buffer.add(" " + origLines.get(line)); origTotal++; revTotal++; @@ -153,8 +156,8 @@ private static void processDeltas(Consumer writer, AbstractDelta nextDelta = deltas.get(deltaIndex); int intermediateStart = curDelta.getSource().getPosition() + curDelta.getSource().getLines().size(); - for (line = intermediateStart; line < nextDelta.getSource() - .getPosition(); line++) { + for (line = intermediateStart; line < nextDelta.getSource().getPosition() + && line < origLines.size(); line++) { // output the code between the last Delta and this one buffer.add(" " + origLines.get(line)); origTotal++; diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java index f7a28b3d..56dc8f6c 100644 --- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java +++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java @@ -27,9 +27,9 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import static org.junit.Assert.assertEquals; -import org.junit.Ignore; import org.junit.Test; /** @@ -42,13 +42,12 @@ public UnifiedDiffWriterTest() { } @Test - @Ignore public void testWrite() throws URISyntaxException, IOException { String str = readFile(UnifiedDiffReaderTest.class.getResource("jsqlparser_patch_1.diff").toURI(), Charset.defaultCharset()); UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(new ByteArrayInputStream(str.getBytes())); StringWriter writer = new StringWriter(); - UnifiedDiffWriter.write(diff, f -> null, writer, 5); + UnifiedDiffWriter.write(diff, f -> Collections.EMPTY_LIST, writer, 5); System.out.println(writer.toString()); } From fb7fca643bf02ae07dd50e503cf3d6f653fe0c37 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Wed, 19 Feb 2020 23:03:34 +0100 Subject: [PATCH 089/266] fixes #69 --- java-diff-utils-jgit/pom.xml | 8 ++-- .../algorithm/jgit/HistogramDiffTest.java | 25 ++--------- .../algorithm/jgit/LRHistogramDiffTest.java | 28 ++---------- java-diff-utils/pom.xml | 7 +-- .../github/difflib/text/DiffRowGenerator.java | 44 ++++++++++--------- .../com/github/difflib/DiffUtilsTest.java | 12 ++--- .../difflib/GenerateUnifiedDiffTest.java | 6 +-- .../algorithm/myers/MyersDiffTest.java | 5 ++- .../com/github/difflib/patch/PatchTest.java | 6 +-- .../difflib/text/DiffRowGeneratorTest.java | 6 +-- .../github/difflib/text/StringUtilsTest.java | 10 +++-- .../unifieddiff/UnifiedDiffReaderTest.java | 8 ++-- .../unifieddiff/UnifiedDiffRoundTripTest.java | 10 ++--- .../unifieddiff/UnifiedDiffWriterTest.java | 4 +- pom.xml | 27 +++++++++--- 15 files changed, 92 insertions(+), 114 deletions(-) diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml index 5151af89..b6d7d28e 100644 --- a/java-diff-utils-jgit/pom.xml +++ b/java-diff-utils-jgit/pom.xml @@ -10,13 +10,11 @@ java-diff-utils-jgit jar This is an extension of java-diff-utils using jgit to use its implementation of -some difference algorithms. + some difference algorithms. - junit - junit - 4.12 - jar + org.junit.jupiter + junit-jupiter test diff --git a/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java b/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java index e1030242..d4487c23 100644 --- a/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java +++ b/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java @@ -21,12 +21,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.junit.After; -import org.junit.AfterClass; -import static org.junit.Assert.*; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.junit.jupiter.api.Test; /** * @@ -37,22 +34,6 @@ public class HistogramDiffTest { public HistogramDiffTest() { } - @BeforeClass - public static void setUpClass() { - } - - @AfterClass - public static void tearDownClass() { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } - /** * Test of diff method, of class HistogramDiff. */ diff --git a/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java b/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java index 02dfe85d..9bb0a8f4 100644 --- a/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java +++ b/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java @@ -28,12 +28,9 @@ import java.util.List; import static java.util.stream.Collectors.toList; import java.util.zip.ZipFile; -import org.junit.After; -import org.junit.AfterClass; -import static org.junit.Assert.*; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; /** * @@ -41,25 +38,6 @@ */ public class LRHistogramDiffTest { - public LRHistogramDiffTest() { - } - - @BeforeClass - public static void setUpClass() { - } - - @AfterClass - public static void tearDownClass() { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } - @Test public void testPossibleDiffHangOnLargeDatasetDnaumenkoIssue26() throws IOException, PatchFailedException { ZipFile zip = new ZipFile("target/test-classes/mocks/large_dataset1.zip"); diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml index 56d8303d..bcb15700 100644 --- a/java-diff-utils/pom.xml +++ b/java-diff-utils/pom.xml @@ -15,16 +15,13 @@ - junit - junit - 4.12 - jar + org.junit.jupiter + junit-jupiter test org.assertj assertj-core - 3.11.1 test diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java index 4f963cd7..0022dab2 100644 --- a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java +++ b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java @@ -32,9 +32,10 @@ import static java.util.stream.Collectors.toList; /** - * This class for generating DiffRows for side-by-sidy view. You can customize the way of generating. For example, show - * inline diffs on not, ignoring white spaces or/and blank lines and so on. All parameters for generating are optional. - * If you do not specify them, the class will use the default values. + * This class for generating DiffRows for side-by-sidy view. You can customize the way of + * generating. For example, show inline diffs on not, ignoring white spaces or/and blank lines and + * so on. All parameters for generating are optional. If you do not specify them, the class will use + * the default values. * * These values are: showInlineDiffs = false; ignoreWhiteSpaces = true; ignoreBlankLines = true; ... * @@ -52,7 +53,6 @@ public final class DiffRowGenerator { public static final Function LINE_NORMALIZER_FOR_HTML = StringUtils::normalize; - /** * Splitting lines by character to achieve char by char diff checking. */ @@ -101,7 +101,8 @@ protected final static List splitStringPreserveDelimiter(String str, Pat /** * Wrap the elements in the sequence with the given tag * - * @param startPosition the position from which tag should start. The counting start from a zero. + * @param startPosition the position from which tag should start. The counting start from a + * zero. * @param endPosition the position before which tag should should be closed. * @param tagGenerator the tag generator */ @@ -170,8 +171,8 @@ private DiffRowGenerator(Builder builder) { } /** - * Get the DiffRows describing the difference between original and revised texts using the given patch. Useful for - * displaying side-by-side diff. + * Get the DiffRows describing the difference between original and revised texts using the given + * patch. Useful for displaying side-by-side diff. * * @param original the original text * @param revised the revised text @@ -182,8 +183,8 @@ public List generateDiffRows(List original, List revise } /** - * Generates the DiffRows describing the difference between original and revised texts using the given patch. Useful - * for displaying side-by-side diff. + * Generates the DiffRows describing the difference between original and revised texts using the + * given patch. Useful for displaying side-by-side diff. * * @param original the original text * @param patch the given patch @@ -402,8 +403,8 @@ public Builder ignoreWhiteSpaces(boolean val) { } /** - * Give the originial old and new text lines to Diffrow without any additional processing and without any tags to - * highlight the change. + * Give the originial old and new text lines to Diffrow without any additional processing + * and without any tags to highlight the change. * * @param val the value to set. Default: false. * @return builder with configured reportLinesUnWrapped parameter @@ -438,8 +439,8 @@ public Builder newTag(Function generator) { /** * Set the column width of generated lines of original and revised texts. * - * @param width the width to set. Making it < 0 doesn't have any sense. Default 80. @return builder with config - * ured ignoreBlankLines parameter + * @param width the width to set. Making it < 0 doesn't have any sense. Default 80. @return + * builder with config ured ignoreBlankLines parameter */ public Builder columnWidth(int width) { if (width >= 0) { @@ -458,7 +459,8 @@ public DiffRowGenerator build() { } /** - * Merge the complete result within the original text. This makes sense for one line display. + * Merge the complete result within the original text. This makes sense for one line + * display. * * @param mergeOriginalRevised * @return @@ -469,8 +471,9 @@ public Builder mergeOriginalRevised(boolean mergeOriginalRevised) { } /** - * Per default each character is separatly processed. This variant introduces processing by word, which does not - * deliver in word changes. Therefore the whole word will be tagged as changed: + * Per default each character is separatly processed. This variant introduces processing by + * word, which does not deliver in word changes. Therefore the whole word will be tagged as + * changed: * * 
          * false:    (aBa : aba) --  changed: a(B)a : a(b)a
@@ -483,8 +486,8 @@ public Builder inlineDiffByWord(boolean inlineDiffByWord) {
         }
 
         /**
-         * To provide some customized splitting a splitter can be provided. Here someone could think about sentence splitter,
-         * comma splitter or stuff like that.
+         * To provide some customized splitting a splitter can be provided. Here someone could think
+         * about sentence splitter, comma splitter or stuff like that.
          *
          * @param inlineDiffSplitter
          * @return
@@ -495,8 +498,9 @@ public Builder inlineDiffBySplitter(Function> inlineDiffSpl
         }
 
         /**
-         * By default DiffRowGenerator preprocesses lines for HTML output. Tabs and special HTML characters like "<"
-         * are replaced with its encoded value. To change this you can provide a customized line normalizer here.
+         * By default DiffRowGenerator preprocesses lines for HTML output. Tabs and special HTML
+         * characters like "<" are replaced with its encoded value. To change this you can
+         * provide a customized line normalizer here.
          *
          * @param lineNormalizer
          * @return
diff --git a/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java b/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
index 28a37219..db5570a3 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
@@ -19,11 +19,11 @@
 import java.util.List;
 import static java.util.stream.Collectors.toList;
 import java.util.zip.ZipFile;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class DiffUtilsTest {
 
@@ -134,7 +134,7 @@ public void testDiffMissesChangeForkDnaumenkoIssue31() throws DiffException {
      * To test this, the greedy meyer algorithm is not suitable.
      */
     @Test
-    @Ignore
+    @Disabled
     public void testPossibleDiffHangOnLargeDatasetDnaumenkoIssue26() throws IOException, DiffException {
         ZipFile zip = new ZipFile(TestConstants.MOCK_FOLDER + "/large_dataset1.zip");
 
diff --git a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
index 5cf3b4f1..18f424ad 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
@@ -11,9 +11,9 @@
 import java.util.Arrays;
 import java.util.List;
 import static java.util.stream.Collectors.joining;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
 
 public class GenerateUnifiedDiffTest {
 
diff --git a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java
index ea9b0dcc..a0276120 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java
@@ -21,8 +21,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import static org.junit.Assert.*;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import org.junit.jupiter.api.Test;
 
 /**
  *
diff --git a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java
index 792785eb..c6c46c03 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java
@@ -4,9 +4,9 @@
 import com.github.difflib.algorithm.DiffException;
 import java.util.Arrays;
 import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
 
 public class PatchTest {
 
diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
index c667b251..c05fa038 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
@@ -9,9 +9,9 @@
 import java.util.List;
 import java.util.regex.Pattern;
 import static java.util.stream.Collectors.toList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
 
 public class DiffRowGeneratorTest {
 
diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/StringUtilsTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/StringUtilsTest.java
index 93076cc1..c4b2acce 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/text/StringUtilsTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/text/StringUtilsTest.java
@@ -15,8 +15,9 @@
  */
 package com.github.difflib.text;
 
-import static org.junit.Assert.*;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
 /**
  *
@@ -50,9 +51,10 @@ public void testWrapText_String_int() {
         assertEquals("test", StringUtils.wrapText("test", 10));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testWrapText_String_int_zero() {
-        assertEquals("test", StringUtils.wrapText("test", -1));
+        Assertions.assertThrows(IllegalArgumentException.class, 
+                () -> StringUtils.wrapText("test", -1));
     }
 
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
index 1414562b..a7c67533 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -19,10 +19,10 @@
 import java.io.IOException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
 
 /**
  *
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java
index c8fc82fc..e66b1a1e 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java
@@ -15,10 +15,10 @@
 import java.util.Arrays;
 import java.util.List;
 import static java.util.stream.Collectors.joining;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class UnifiedDiffRoundTripTest {
 
@@ -84,7 +84,7 @@ public void testDiff_Issue10() throws IOException {
      * Issue 12
      */
     @Test
-    @Ignore
+    @Disabled
     public void testPatchWithNoDeltas() throws DiffException, IOException {
         final List lines1 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_1.txt");
         final List lines2 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_2.txt");
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java
index 56dc8f6c..43fb327e 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java
@@ -29,8 +29,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
 /**
  *
diff --git a/pom.xml b/pom.xml
index 6f5c4776..0eb6664d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,22 @@
         1.8
         1.8
     
+    
+        
+            
+                org.junit.jupiter
+                junit-jupiter
+                5.6.0
+                test
+            
+            
+                org.assertj
+                assertj-core
+                3.15.0
+                test
+            
+        
+    
     
         
             
@@ -89,9 +105,10 @@
             
                 org.apache.maven.plugins
                 maven-javadoc-plugin
-                2.10.4
+                3.1.1
                 
                     ${javadoc.opts}
+                    none
                 
                 
                     
@@ -105,7 +122,7 @@
             
                 org.apache.maven.plugins
                 maven-checkstyle-plugin
-                2.17
+                3.1.0
                 
                     
                         verify-style
@@ -118,7 +135,7 @@
                 
                     true
                     true
-                    ${project.build.sourceDirectory}
+                    ${project.build.sourceDirectory}
                     
                         
                             
@@ -151,14 +168,14 @@
                     
                         com.puppycrawl.tools
                         checkstyle
-                        8.18
+                        8.29
                     
                 
             
             
                 org.apache.maven.plugins
                 maven-surefire-plugin
-                2.22.1
+                3.0.0-M4
                 
                     
                         **/LR*.java

From e37a52395a9549c1139d5fb31595c401e34a1cbb Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Thu, 20 Feb 2020 00:31:24 +0100
Subject: [PATCH 090/266] fixes #66

---
 .../github/difflib/text/DiffRowGenerator.java |  2 +-
 .../difflib/text/DiffRowGeneratorTest.java    | 40 +++++++++++++++++++
 pom.xml                                       |  1 +
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
index 0022dab2..9313dfc3 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
@@ -291,7 +291,7 @@ private List generateInlineDiffs(AbstractDelta delta) throws Di
         origList = inlineDiffSplitter.apply(joinedOrig);
         revList = inlineDiffSplitter.apply(joinedRev);
 
-        List> inlineDeltas = DiffUtils.diff(origList, revList).getDeltas();
+        List> inlineDeltas = DiffUtils.diff(origList, revList, equalizer).getDeltas();
 
         Collections.reverse(inlineDeltas);
         for (AbstractDelta inlineDelta : inlineDeltas) {
diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
index c05fa038..5f46518b 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
@@ -417,4 +417,44 @@ public void testGenerationIssue44reportLinesUnchangedProblem() throws DiffExcept
         List rows = generator.generateDiffRows(Arrays.asList("
To do
"), Arrays.asList("
Done
"));
         assertEquals("[[CHANGE,
~~T~~o~~ do~~
,
**D**o**ne**
]]", rows.toString());
     }
+
+    @Test
+    public void testIgnoreWhitespaceIssue66() throws DiffException {
+        DiffRowGenerator generator = DiffRowGenerator.create()
+                .showInlineDiffs(true)
+                .inlineDiffByWord(true)
+                .ignoreWhiteSpaces(true)
+                .mergeOriginalRevised(true)
+                .oldTag(f -> "~") //introduce markdown style for strikethrough
+                .newTag(f -> "**") //introduce markdown style for bold
+                .build();
+
+        //compute the differences for two test texts.
+        //CHECKSTYLE:OFF
+        List rows = generator.generateDiffRows(
+                Arrays.asList("This\tis\ta\ttest."),
+                Arrays.asList("This is a test"));
+        //CHECKSTYLE:ON
+
+        assertEquals("This    is    a    test~.~", rows.get(0).getOldLine());
+    }
+
+    @Test
+    public void testIgnoreWhitespaceIssue66_2() throws DiffException {
+        DiffRowGenerator generator = DiffRowGenerator.create()
+                .showInlineDiffs(true)
+                .inlineDiffByWord(true)
+                .ignoreWhiteSpaces(true)
+                .mergeOriginalRevised(true)
+                .oldTag(f -> "~") //introduce markdown style for strikethrough
+                .newTag(f -> "**") //introduce markdown style for bold
+                .build();
+
+        //compute the differences for two test texts.
+        List rows = generator.generateDiffRows(
+                Arrays.asList("This  is  a  test."),
+                Arrays.asList("This is a test"));
+
+        assertEquals("This  is  a  test~.~", rows.get(0).getOldLine());
+    }
 }
diff --git a/pom.xml b/pom.xml
index 0eb6664d..5aed4e89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,6 +141,7 @@
                             
                             
                             
+                                
                                 
                                 
                                 

From dbd0b8f72ee1bc34b5757e2fdaa1628ce49c90b9 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Thu, 20 Feb 2020 00:53:35 +0100
Subject: [PATCH 091/266] fixes #64

---
 .../difflib/text/DiffRowGeneratorTest.java    | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
index 5f46518b..be3fe391 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
@@ -9,6 +9,7 @@
 import java.util.List;
 import java.util.regex.Pattern;
 import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import org.junit.jupiter.api.Test;
@@ -457,4 +458,26 @@ public void testIgnoreWhitespaceIssue66_2() throws DiffException {
 
         assertEquals("This  is  a  test~.~", rows.get(0).getOldLine());
     }
+
+    @Test
+    public void testIgnoreWhitespaceIssue64() throws DiffException {
+        DiffRowGenerator generator = DiffRowGenerator.create()
+                .showInlineDiffs(true)
+                .inlineDiffByWord(true)
+                .ignoreWhiteSpaces(true)
+                .mergeOriginalRevised(true)
+                .oldTag(f -> "~") //introduce markdown style for strikethrough
+                .newTag(f -> "**") //introduce markdown style for bold
+                .build();
+
+        //compute the differences for two test texts.
+        List rows = generator.generateDiffRows(
+                Arrays.asList("test\n\ntestline".split("\n")),
+                Arrays.asList("A new text line\n\nanother one".split("\n")));
+
+        assertThat(rows).extracting(item -> item.getOldLine())
+                .containsExactly("~test~**A new text line**", 
+                                 "",
+                                 "~testline~**another one**");
+    }
 }

From df01ef67e31056d58996c7f05fb9bcdfb9a7805d Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 23 Feb 2020 23:07:02 +0100
Subject: [PATCH 092/266] fixes #63

---
 .../github/difflib/text/DiffRowGenerator.java | 76 +++++++++++++------
 .../difflib/text/DiffRowGeneratorTest.java    | 19 +++++
 2 files changed, 72 insertions(+), 23 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
index 9313dfc3..d4b9e0e6 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
@@ -107,7 +107,8 @@ protected final static List splitStringPreserveDelimiter(String str, Pat
      * @param tagGenerator the tag generator
      */
     static void wrapInTag(List sequence, int startPosition,
-            int endPosition, Function tagGenerator) {
+            int endPosition, Function tagGenerator,
+            Function processDiffs) {
         int endPos = endPosition;
 
         while (endPos >= startPosition) {
@@ -125,6 +126,10 @@ static void wrapInTag(List sequence, int startPosition,
             }
 
             sequence.add(endPos, tagGenerator.apply(false));
+            if (processDiffs != null) {
+                    sequence.set(endPos - 1,
+                            processDiffs.apply(sequence.get(endPos - 1)));
+                }
             endPos--;
 
             //search position for end tag
@@ -132,16 +137,19 @@ static void wrapInTag(List sequence, int startPosition,
                 if ("\n".equals(sequence.get(endPos - 1))) {
                     break;
                 }
+                if (processDiffs != null) {
+                    sequence.set(endPos - 1,
+                            processDiffs.apply(sequence.get(endPos - 1)));
+                }
                 endPos--;
             }
 
             sequence.add(endPos, tagGenerator.apply(true));
             endPos--;
         }
-
-//        sequence.add(endPosition, tagGenerator.apply(false));
-//        sequence.add(startPosition, tagGenerator.apply(true));
     }
+    
+    
     private final int columnWidth;
     private final BiPredicate equalizer;
     private final boolean ignoreWhiteSpaces;
@@ -151,6 +159,7 @@ static void wrapInTag(List sequence, int startPosition,
     private final Function oldTag;
     private final boolean reportLinesUnchanged;
     private final Function lineNormalizer;
+    private final Function processDiffs;
 
     private final boolean showInlineDiffs;
 
@@ -165,6 +174,7 @@ private DiffRowGenerator(Builder builder) {
         equalizer = ignoreWhiteSpaces ? IGNORE_WHITESPACE_EQUALIZER : DEFAULT_EQUALIZER;
         reportLinesUnchanged = builder.reportLinesUnchanged;
         lineNormalizer = builder.lineNormalizer;
+        processDiffs = builder.processDiffs;
 
         Objects.requireNonNull(inlineDiffSplitter);
         Objects.requireNonNull(lineNormalizer);
@@ -178,7 +188,8 @@ private DiffRowGenerator(Builder builder) {
      * @param revised the revised text
      * @return the DiffRows between original and revised texts
      */
-    public List generateDiffRows(List original, List revised) throws DiffException {
+    public List generateDiffRows(List original, List revised)
+            throws DiffException {
         return generateDiffRows(original, DiffUtils.diff(original, revised, equalizer));
     }
 
@@ -190,7 +201,8 @@ public List generateDiffRows(List original, List revise
      * @param patch the given patch
      * @return the DiffRows between original and revised texts
      */
-    public List generateDiffRows(final List original, Patch patch) throws DiffException {
+    public List generateDiffRows(final List original, Patch patch)
+            throws DiffException {
         List diffRows = new ArrayList<>();
         int endPos = 0;
         final List> deltaList = patch.getDeltas();
@@ -280,7 +292,8 @@ List normalizeLines(List list) {
      *
      * @param delta the given delta
      */
-    private List generateInlineDiffs(AbstractDelta delta) throws DiffException {
+    private List generateInlineDiffs(AbstractDelta delta)
+            throws DiffException {
         List orig = normalizeLines(delta.getSource().getLines());
         List rev = normalizeLines(delta.getTarget().getLines());
         List origList;
@@ -300,32 +313,36 @@ private List generateInlineDiffs(AbstractDelta delta) throws Di
             if (inlineDelta instanceof DeleteDelta) {
                 wrapInTag(origList, inlineOrig.getPosition(), inlineOrig
                         .getPosition()
-                        + inlineOrig.size(), oldTag);
+                        + inlineOrig.size(), oldTag, processDiffs);
             } else if (inlineDelta instanceof InsertDelta) {
                 if (mergeOriginalRevised) {
                     origList.addAll(inlineOrig.getPosition(),
-                            revList.subList(inlineRev.getPosition(), inlineRev.getPosition()
-                                    + inlineRev.size()));
-                    wrapInTag(origList, inlineOrig.getPosition(), inlineOrig.getPosition()
-                            + inlineRev.size(), newTag);
+                            revList.subList(inlineRev.getPosition(),
+                                    inlineRev.getPosition() + inlineRev.size()));
+                    wrapInTag(origList, inlineOrig.getPosition(),
+                            inlineOrig.getPosition() + inlineRev.size(),
+                            newTag, processDiffs);
                 } else {
-                    wrapInTag(revList, inlineRev.getPosition(), inlineRev.getPosition()
-                            + inlineRev.size(), newTag);
+                    wrapInTag(revList, inlineRev.getPosition(),
+                            inlineRev.getPosition() + inlineRev.size(),
+                            newTag, processDiffs);
                 }
             } else if (inlineDelta instanceof ChangeDelta) {
                 if (mergeOriginalRevised) {
                     origList.addAll(inlineOrig.getPosition() + inlineOrig.size(),
-                            revList.subList(inlineRev.getPosition(), inlineRev.getPosition()
-                                    + inlineRev.size()));
-                    wrapInTag(origList, inlineOrig.getPosition() + inlineOrig.size(), inlineOrig.getPosition() + inlineOrig.size()
-                            + inlineRev.size(), newTag);
+                            revList.subList(inlineRev.getPosition(),
+                                    inlineRev.getPosition() + inlineRev.size()));
+                    wrapInTag(origList, inlineOrig.getPosition() + inlineOrig.size(),
+                            inlineOrig.getPosition() + inlineOrig.size() + inlineRev.size(),
+                            newTag, processDiffs);
                 } else {
-                    wrapInTag(revList, inlineRev.getPosition(), inlineRev.getPosition()
-                            + inlineRev.size(), newTag);
+                    wrapInTag(revList, inlineRev.getPosition(),
+                            inlineRev.getPosition() + inlineRev.size(),
+                            newTag, processDiffs);
                 }
-                wrapInTag(origList, inlineOrig.getPosition(), inlineOrig
-                        .getPosition()
-                        + inlineOrig.size(), oldTag);
+                wrapInTag(origList, inlineOrig.getPosition(),
+                        inlineOrig.getPosition() + inlineOrig.size(),
+                        oldTag, processDiffs);
             }
         }
         StringBuilder origResult = new StringBuilder();
@@ -376,6 +393,7 @@ public static class Builder {
         private boolean reportLinesUnchanged = false;
         private Function> inlineDiffSplitter = SPLITTER_BY_CHARACTER;
         private Function lineNormalizer = LINE_NORMALIZER_FOR_HTML;
+        private Function processDiffs = null;
 
         private Builder() {
         }
@@ -436,6 +454,18 @@ public Builder newTag(Function generator) {
             return this;
         }
 
+        /**
+         * Processor for diffed text parts. Here e.g. whitecharacters could be replaced by something
+         * visible.
+         *
+         * @param processDiffs
+         * @return
+         */
+        public Builder processDiffs(Function processDiffs) {
+            this.processDiffs = processDiffs;
+            return this;
+        }
+
         /**
          * Set the column width of generated lines of original and revised texts.
          *
diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
index be3fe391..be5b1418 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
@@ -480,4 +480,23 @@ public void testIgnoreWhitespaceIssue64() throws DiffException {
                                  "",
                                  "~testline~**another one**");
     }
+    
+    @Test
+    public void testIgnoreWhitespaceIssue63() throws DiffException {
+        DiffRowGenerator generator = DiffRowGenerator.create()
+                .showInlineDiffs(true)
+                .inlineDiffByWord(true)
+                .mergeOriginalRevised(true)
+                .oldTag(f -> "~") //introduce markdown style for strikethrough
+                .newTag(f -> "**") //introduce markdown style for bold
+                .processDiffs(str -> str.replace(" ", "/"))
+                .build();
+
+        //compute the differences for two test texts.
+        List rows = generator.generateDiffRows(
+                Arrays.asList("This  is  a  test."),
+                Arrays.asList("This is a test"));
+
+        assertEquals("This~//~**/**is~//~**/**a~//~**/**test~.~", rows.get(0).getOldLine());
+    }
 }

From fe6dbe243a2305017615c357dbef889cdda46925 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 23 Feb 2020 23:10:06 +0100
Subject: [PATCH 093/266] fixes #63

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6c3c28e..a05dff7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ This project uses a custom versioning scheme (and not [Semantic Versioning](http
 
 ## [Unreleased]
 
+* added possibility to **process diffs** to for instance show whitespace characters
+
 ## [4.4] – 2019-11-06
 
 ### Changed

From 21d2cbbcddc5ea24544d0e37c5161d154a087321 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 23 Feb 2020 23:13:39 +0100
Subject: [PATCH 094/266] fixes #63

---
 .../test/java/com/github/difflib/text/DiffRowGeneratorTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
index be5b1418..42ddc876 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
@@ -482,7 +482,7 @@ public void testIgnoreWhitespaceIssue64() throws DiffException {
     }
     
     @Test
-    public void testIgnoreWhitespaceIssue63() throws DiffException {
+    public void testReplaceDiffsIssue63() throws DiffException {
         DiffRowGenerator generator = DiffRowGenerator.create()
                 .showInlineDiffs(true)
                 .inlineDiffByWord(true)

From 923918a53e3d1324503665586730895e4d9a1434 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 23 Feb 2020 23:16:39 +0100
Subject: [PATCH 095/266] fixes #63

---
 .../java/com/github/difflib/text/DiffRowGenerator.java   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
index d4b9e0e6..5c095df7 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
@@ -127,9 +127,9 @@ static void wrapInTag(List sequence, int startPosition,
 
             sequence.add(endPos, tagGenerator.apply(false));
             if (processDiffs != null) {
-                    sequence.set(endPos - 1,
-                            processDiffs.apply(sequence.get(endPos - 1)));
-                }
+                sequence.set(endPos - 1,
+                        processDiffs.apply(sequence.get(endPos - 1)));
+            }
             endPos--;
 
             //search position for end tag
@@ -148,8 +148,7 @@ static void wrapInTag(List sequence, int startPosition,
             endPos--;
         }
     }
-    
-    
+
     private final int columnWidth;
     private final BiPredicate equalizer;
     private final boolean ignoreWhiteSpaces;

From ae2340874806dfec3f8c7ac3637448362d675500 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 23 Feb 2020 23:51:28 +0100
Subject: [PATCH 096/266] fixes #47

---
 .../src/main/java/com/github/difflib/UnifiedDiffUtils.java   | 5 +++--
 .../java/com/github/difflib/GenerateUnifiedDiffTest.java     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
index eee82ca3..9d7908b9 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
@@ -21,6 +21,7 @@
 import com.github.difflib.patch.Patch;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -130,8 +131,8 @@ public static List generateUnifiedDiff(String originalFileName,
             int contextSize) {
         if (!patch.getDeltas().isEmpty()) {
             List ret = new ArrayList<>();
-            ret.add("--- " + originalFileName);
-            ret.add("+++ " + revisedFileName);
+            ret.add("--- " + Optional.ofNullable(originalFileName).orElse(""));
+            ret.add("+++ " + Optional.ofNullable(revisedFileName).orElse(""));
 
             List> patchDeltas = new ArrayList<>(
                     patch.getDeltas());
diff --git a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
index 18f424ad..938d0a1e 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
@@ -120,7 +120,7 @@ public void testNewFileCreation() throws DiffException {
         List udiff = UnifiedDiffUtils.generateUnifiedDiff(null, "revised",
                 original, patch, 10);
         
-        assertEquals("--- null", udiff.get(0));
+        assertEquals("--- ", udiff.get(0));
         assertEquals("+++ revised", udiff.get(1));
         assertEquals("@@ -0,0 +1,2 @@", udiff.get(2));
         

From 9a39411ee88b8e9a91d9d9ea6450f74300321e52 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 7 Mar 2020 00:27:39 +0100
Subject: [PATCH 097/266] removed diff exception

---
 CHANGELOG.md                                  |  1 +
 .../java/com/github/difflib/DiffUtils.java    | 16 +++--
 .../difflib/algorithm/DiffAlgorithmI.java     |  7 +--
 .../difflib/algorithm/DiffException.java      | 28 ---------
 .../DifferentiationFailedException.java       | 34 -----------
 .../difflib/algorithm/myers/MyersDiff.java    |  9 +--
 .../github/difflib/text/DiffRowGenerator.java | 10 +---
 .../com/github/difflib/DiffUtilsTest.java     | 23 ++++----
 .../difflib/GenerateUnifiedDiffTest.java      | 17 +++---
 .../algorithm/myers/MyersDiffTest.java        |  5 +-
 .../difflib/examples/ComputeDifference.java   |  3 +-
 .../com/github/difflib/patch/PatchTest.java   |  7 +--
 .../difflib/text/DiffRowGeneratorTest.java    | 59 +++++++++----------
 .../unifieddiff/UnifiedDiffRoundTripTest.java | 15 +++--
 .../unifieddiff/UnifiedDiffWriterTest.java    |  3 +-
 15 files changed, 79 insertions(+), 158 deletions(-)
 delete mode 100644 java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffException.java
 delete mode 100644 java-diff-utils/src/main/java/com/github/difflib/algorithm/DifferentiationFailedException.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a05dff7d..80558290 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ This project uses a custom versioning scheme (and not [Semantic Versioning](http
 
 ## [Unreleased]
 
+* **API** change: removed DiffException completely
 * added possibility to **process diffs** to for instance show whitespace characters
 
 ## [4.4] – 2019-11-06
diff --git a/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
index b57a0d2f..0e7b074e 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
@@ -17,7 +17,6 @@
 
 import com.github.difflib.algorithm.DiffAlgorithmI;
 import com.github.difflib.algorithm.DiffAlgorithmListener;
-import com.github.difflib.algorithm.DiffException;
 import com.github.difflib.algorithm.myers.MyersDiff;
 import com.github.difflib.patch.AbstractDelta;
 import com.github.difflib.patch.Patch;
@@ -43,13 +42,12 @@ public final class DiffUtils {
      * @param revised The revised text. Must not be {@code null}.
      * @param progress progress listener
      * @return The patch describing the difference between the original and revised sequences. Never {@code null}.
-     * @throws com.github.difflib.algorithm.DiffException
      */
-    public static  Patch diff(List original, List revised, DiffAlgorithmListener progress) throws DiffException {
+    public static  Patch diff(List original, List revised, DiffAlgorithmListener progress) {
         return DiffUtils.diff(original, revised, new MyersDiff<>(), progress);
     }
     
-    public static  Patch diff(List original, List revised) throws DiffException {
+    public static  Patch diff(List original, List revised) {
         return DiffUtils.diff(original, revised, new MyersDiff<>(), null);
     }
 
@@ -57,7 +55,7 @@ public static  Patch diff(List original, List revised) throws DiffEx
      * Computes the difference between the original and revised text.
      */
     public static Patch diff(String sourceText, String targetText,
-            DiffAlgorithmListener progress) throws DiffException {
+            DiffAlgorithmListener progress) {
         return DiffUtils.diff(
                  Arrays.asList(sourceText.split("\n")), 
                  Arrays.asList(targetText.split("\n")), progress);
@@ -74,7 +72,7 @@ public static Patch diff(String sourceText, String targetText,
      * @return The patch describing the difference between the original and revised sequences. Never {@code null}.
      */
     public static  Patch diff(List source, List target,
-            BiPredicate equalizer) throws DiffException {
+            BiPredicate equalizer) {
         if (equalizer != null) {
             return DiffUtils.diff(source, target,
                     new MyersDiff<>(equalizer));
@@ -92,7 +90,7 @@ public static  Patch diff(List source, List target,
      * @return The patch describing the difference between the original and revised sequences. Never {@code null}.
      */
     public static  Patch diff(List original, List revised,
-            DiffAlgorithmI algorithm, DiffAlgorithmListener progress) throws DiffException {
+            DiffAlgorithmI algorithm, DiffAlgorithmListener progress) {
         Objects.requireNonNull(original, "original must not be null");
         Objects.requireNonNull(revised, "revised must not be null");
         Objects.requireNonNull(algorithm, "algorithm must not be null");
@@ -109,7 +107,7 @@ public static  Patch diff(List original, List revised,
      * @return The patch describing the difference between the original and revised sequences. Never {@code null}.
      */
      public static  Patch diff(List original, List revised,
-            DiffAlgorithmI algorithm) throws DiffException {
+            DiffAlgorithmI algorithm) {
          return diff(original, revised, algorithm, null);
      }
 
@@ -121,7 +119,7 @@ public static  Patch diff(List original, List revised,
      * @param revised
      * @return
      */
-    public static Patch diffInline(String original, String revised) throws DiffException {
+    public static Patch diffInline(String original, String revised) {
         List origList = new ArrayList<>();
         List revList = new ArrayList<>();
         for (Character character : original.toCharArray()) {
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmI.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmI.java
index d9236290..117656e4 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmI.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmI.java
@@ -22,6 +22,7 @@
  * Interface of a diff algorithm.
  *
  * @author Tobias Warneke (t.warneke@gmx.net)
+ * @param  type of data that is diffed.
  */
 public interface DiffAlgorithmI {
 
@@ -32,9 +33,8 @@ public interface DiffAlgorithmI {
      * @param target target data
      * @param progress progress listener
      * @return
-     * @throws DiffException
      */
-    List computeDiff(List source, List target, DiffAlgorithmListener progress) throws DiffException;
+    List computeDiff(List source, List target, DiffAlgorithmListener progress);
 
     /**
      * Simple extension to compute a changeset using arrays.
@@ -43,9 +43,8 @@ public interface DiffAlgorithmI {
      * @param target
      * @param progress
      * @return
-     * @throws com.github.difflib.algorithm.DiffException
      */
-    default List computeDiff(T[] source, T[] target, DiffAlgorithmListener progress) throws DiffException {
+    default List computeDiff(T[] source, T[] target, DiffAlgorithmListener progress) {
         return computeDiff(Arrays.asList(source), Arrays.asList(target), progress);
     }
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffException.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffException.java
deleted file mode 100644
index d36d16fb..00000000
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffException.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2009-2017 java-diff-utils.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.github.difflib.algorithm;
-
-public class DiffException extends Exception {
-
-    private static final long serialVersionUID = 1L;
-
-    public DiffException() {
-    }
-
-    public DiffException(String msg) {
-        super(msg);
-    }
-}
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/DifferentiationFailedException.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/DifferentiationFailedException.java
deleted file mode 100644
index e201e440..00000000
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/DifferentiationFailedException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2009-2017 java-diff-utils.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.github.difflib.algorithm;
-
-/**
- * Thrown whenever the differencing engine cannot produce the differences between two revisions of ta text.
- *
- * @see com.github.difflib.algorithm.myers.MyersDiff
- * @see DiffAlgorithmI
- */
-public class DifferentiationFailedException extends DiffException {
-
-    private static final long serialVersionUID = 1L;
-
-    public DifferentiationFailedException() {
-    }
-
-    public DifferentiationFailedException(String msg) {
-        super(msg);
-    }
-}
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java
index abcf31e2..631bc38c 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java
@@ -18,8 +18,6 @@
 import com.github.difflib.algorithm.Change;
 import com.github.difflib.algorithm.DiffAlgorithmI;
 import com.github.difflib.algorithm.DiffAlgorithmListener;
-import com.github.difflib.algorithm.DiffException;
-import com.github.difflib.algorithm.DifferentiationFailedException;
 import com.github.difflib.patch.DeltaType;
 import com.github.difflib.patch.Patch;
 import java.util.ArrayList;
@@ -50,7 +48,7 @@ public MyersDiff(final BiPredicate equalizer) {
      * Return empty diff if get the error while procession the difference.
      */
     @Override
-    public List computeDiff(final List source, final List target, DiffAlgorithmListener progress) throws DiffException {
+    public List computeDiff(final List source, final List target, DiffAlgorithmListener progress) {
         Objects.requireNonNull(source, "source list must not be null");
         Objects.requireNonNull(target, "target list must not be null");
 
@@ -74,8 +72,7 @@ public List computeDiff(final List source, final List target, Diff
      * @return A minimum {@link PathNode Path} accross the differences graph.
      * @throws DifferentiationFailedException if a diff path could not be found.
      */
-    private PathNode buildPath(final List orig, final List rev, DiffAlgorithmListener progress)
-            throws DifferentiationFailedException {
+    private PathNode buildPath(final List orig, final List rev, DiffAlgorithmListener progress) {
         Objects.requireNonNull(orig, "original sequence is null");
         Objects.requireNonNull(rev, "revised sequence is null");
 
@@ -132,7 +129,7 @@ private PathNode buildPath(final List orig, final List rev, DiffAlgorithmL
             diagonal[middle + d - 1] = null;
         }
         // According to Myers, this cannot happen
-        throw new DifferentiationFailedException("could not find a diff path");
+        throw new IllegalStateException("could not find a diff path");
     }
 
     /**
diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
index 5c095df7..5fb1d2b1 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
@@ -16,7 +16,6 @@
 package com.github.difflib.text;
 
 import com.github.difflib.DiffUtils;
-import com.github.difflib.algorithm.DiffException;
 import com.github.difflib.patch.AbstractDelta;
 import com.github.difflib.patch.ChangeDelta;
 import com.github.difflib.patch.Chunk;
@@ -187,8 +186,7 @@ private DiffRowGenerator(Builder builder) {
      * @param revised the revised text
      * @return the DiffRows between original and revised texts
      */
-    public List generateDiffRows(List original, List revised)
-            throws DiffException {
+    public List generateDiffRows(List original, List revised) {
         return generateDiffRows(original, DiffUtils.diff(original, revised, equalizer));
     }
 
@@ -200,8 +198,7 @@ public List generateDiffRows(List original, List revise
      * @param patch the given patch
      * @return the DiffRows between original and revised texts
      */
-    public List generateDiffRows(final List original, Patch patch)
-            throws DiffException {
+    public List generateDiffRows(final List original, Patch patch) {
         List diffRows = new ArrayList<>();
         int endPos = 0;
         final List> deltaList = patch.getDeltas();
@@ -291,8 +288,7 @@ List normalizeLines(List list) {
      *
      * @param delta the given delta
      */
-    private List generateInlineDiffs(AbstractDelta delta)
-            throws DiffException {
+    private List generateInlineDiffs(AbstractDelta delta) {
         List orig = normalizeLines(delta.getSource().getLines());
         List rev = normalizeLines(delta.getTarget().getLines());
         List origList;
diff --git a/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java b/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
index db5570a3..cee5b2c9 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
@@ -1,6 +1,5 @@
 package com.github.difflib;
 
-import com.github.difflib.algorithm.DiffException;
 import com.github.difflib.patch.ChangeDelta;
 import com.github.difflib.patch.Chunk;
 import com.github.difflib.patch.DeleteDelta;
@@ -28,7 +27,7 @@
 public class DiffUtilsTest {
 
     @Test
-    public void testDiff_Insert() throws DiffException {
+    public void testDiff_Insert() {
         final Patch patch = DiffUtils.diff(Arrays.asList("hhh"), Arrays.
                 asList("hhh", "jjj", "kkk"));
         assertNotNull(patch);
@@ -40,7 +39,7 @@ public void testDiff_Insert() throws DiffException {
     }
 
     @Test
-    public void testDiff_Delete() throws DiffException {
+    public void testDiff_Delete() {
         final Patch patch = DiffUtils.diff(Arrays.asList("ddd", "fff", "ggg"), Arrays.
                 asList("ggg"));
         assertNotNull(patch);
@@ -52,7 +51,7 @@ public void testDiff_Delete() throws DiffException {
     }
 
     @Test
-    public void testDiff_Change() throws DiffException {
+    public void testDiff_Change() {
         final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc");
         final List changeTest_to = Arrays.asList("aaa", "zzz", "ccc");
 
@@ -66,14 +65,14 @@ public void testDiff_Change() throws DiffException {
     }
 
     @Test
-    public void testDiff_EmptyList() throws DiffException {
+    public void testDiff_EmptyList() {
         final Patch patch = DiffUtils.diff(new ArrayList<>(), new ArrayList<>());
         assertNotNull(patch);
         assertEquals(0, patch.getDeltas().size());
     }
 
     @Test
-    public void testDiff_EmptyListWithNonEmpty() throws DiffException {
+    public void testDiff_EmptyListWithNonEmpty() {
         final Patch patch = DiffUtils.diff(new ArrayList<>(), Arrays.asList("aaa"));
         assertNotNull(patch);
         assertEquals(1, patch.getDeltas().size());
@@ -82,7 +81,7 @@ public void testDiff_EmptyListWithNonEmpty() throws DiffException {
     }
 
     @Test
-    public void testDiffInline() throws DiffException {
+    public void testDiffInline() {
         final Patch patch = DiffUtils.diffInline("", "test");
         assertEquals(1, patch.getDeltas().size());
         assertTrue(patch.getDeltas().get(0) instanceof InsertDelta);
@@ -92,7 +91,7 @@ public void testDiffInline() throws DiffException {
     }
 
     @Test
-    public void testDiffInline2() throws DiffException {
+    public void testDiffInline2() {
         final Patch patch = DiffUtils.diffInline("es", "fest");
         assertEquals(2, patch.getDeltas().size());
         assertTrue(patch.getDeltas().get(0) instanceof InsertDelta);
@@ -105,7 +104,7 @@ public void testDiffInline2() throws DiffException {
     }
 
     @Test
-    public void testDiffIntegerList() throws DiffException {
+    public void testDiffIntegerList() {
         List original = Arrays.asList(1, 2, 3, 4, 5);
         List revised = Arrays.asList(2, 3, 4, 6);
 
@@ -121,7 +120,7 @@ public void testDiffIntegerList() throws DiffException {
     }
 
     @Test
-    public void testDiffMissesChangeForkDnaumenkoIssue31() throws DiffException {
+    public void testDiffMissesChangeForkDnaumenkoIssue31() {
         List original = Arrays.asList("line1", "line2", "line3");
         List revised = Arrays.asList("line1", "line2-2", "line4");
 
@@ -135,7 +134,7 @@ public void testDiffMissesChangeForkDnaumenkoIssue31() throws DiffException {
      */
     @Test
     @Disabled
-    public void testPossibleDiffHangOnLargeDatasetDnaumenkoIssue26() throws IOException, DiffException {
+    public void testPossibleDiffHangOnLargeDatasetDnaumenkoIssue26() throws IOException {
         ZipFile zip = new ZipFile(TestConstants.MOCK_FOLDER + "/large_dataset1.zip");
 
         Patch patch = DiffUtils.diff(
@@ -154,7 +153,7 @@ public static List readStringListFromInputStream(InputStream is) throws
     }
 
     @Test
-    public void testDiffMyersExample1() throws DiffException {
+    public void testDiffMyersExample1() {
         final Patch patch = DiffUtils.diff(Arrays.asList("A", "B", "C", "A", "B", "B", "A"), Arrays.asList("C", "B", "A", "B", "A", "C"));
         assertNotNull(patch);
         assertEquals(4, patch.getDeltas().size());
diff --git a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
index 938d0a1e..8c023c96 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
@@ -1,6 +1,5 @@
 package com.github.difflib;
 
-import com.github.difflib.algorithm.DiffException;
 import com.github.difflib.patch.Patch;
 import com.github.difflib.patch.PatchFailedException;
 import java.io.BufferedReader;
@@ -29,7 +28,7 @@ public static List fileToLines(String filename) throws FileNotFoundExcep
     }
 
     @Test
-    public void testGenerateUnified() throws DiffException, IOException {
+    public void testGenerateUnified() throws IOException {
         List origLines = fileToLines(TestConstants.MOCK_FOLDER + "original.txt");
         List revLines = fileToLines(TestConstants.MOCK_FOLDER + "revised.txt");
 
@@ -37,7 +36,7 @@ public void testGenerateUnified() throws DiffException, IOException {
     }
 
     @Test
-    public void testGenerateUnifiedWithOneDelta() throws DiffException, IOException {
+    public void testGenerateUnifiedWithOneDelta() throws IOException {
         List origLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_original.txt");
         List revLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_revised.txt");
 
@@ -45,7 +44,7 @@ public void testGenerateUnifiedWithOneDelta() throws DiffException, IOException
     }
 
     @Test
-    public void testGenerateUnifiedDiffWithoutAnyDeltas() throws DiffException {
+    public void testGenerateUnifiedDiffWithoutAnyDeltas() {
         List test = Arrays.asList("abc");
         Patch patch = DiffUtils.diff(test, test);
         UnifiedDiffUtils.generateUnifiedDiff("abc", "abc", test, patch, 0);
@@ -67,14 +66,14 @@ public void testDiff_Issue10() throws IOException {
      * Issue 12
      */
     @Test
-    public void testPatchWithNoDeltas() throws DiffException, IOException {
+    public void testPatchWithNoDeltas() throws IOException {
         final List lines1 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_1.txt");
         final List lines2 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_2.txt");
         verify(lines1, lines2, "issue11_1.txt", "issue11_2.txt");
     }
 
     @Test
-    public void testDiff5() throws DiffException, IOException {
+    public void testDiff5() throws IOException {
         final List lines1 = fileToLines(TestConstants.MOCK_FOLDER + "5A.txt");
         final List lines2 = fileToLines(TestConstants.MOCK_FOLDER + "5B.txt");
         verify(lines1, lines2, "5A.txt", "5B.txt");
@@ -84,7 +83,7 @@ public void testDiff5() throws DiffException, IOException {
      * Issue 19
      */
     @Test
-    public void testDiffWithHeaderLineInText() throws DiffException {
+    public void testDiffWithHeaderLineInText() {
         List original = new ArrayList<>();
         List revised = new ArrayList<>();
 
@@ -109,7 +108,7 @@ public void testDiffWithHeaderLineInText() throws DiffException {
      * Issue 47
      */
     @Test
-    public void testNewFileCreation() throws DiffException {
+    public void testNewFileCreation() {
         List original = new ArrayList<>();
         List revised = new ArrayList<>();
 
@@ -128,7 +127,7 @@ public void testNewFileCreation() throws DiffException {
     }
 
     private void verify(List origLines, List revLines,
-            String originalFile, String revisedFile) throws DiffException {
+            String originalFile, String revisedFile) {
         Patch patch = DiffUtils.diff(origLines, revLines);
         List unifiedDiff = UnifiedDiffUtils.generateUnifiedDiff(originalFile, revisedFile,
                 origLines, patch, 10);
diff --git a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java
index a0276120..5b8348e6 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java
@@ -16,7 +16,6 @@
 package com.github.difflib.algorithm.myers;
 
 import com.github.difflib.algorithm.DiffAlgorithmListener;
-import com.github.difflib.algorithm.DiffException;
 import com.github.difflib.patch.Patch;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -32,7 +31,7 @@
 public class MyersDiffTest {
 
     @Test
-    public void testDiffMyersExample1Forward() throws DiffException {
+    public void testDiffMyersExample1Forward() {
         List original = Arrays.asList("A", "B", "C", "A", "B", "B", "A");
         List revised = Arrays.asList("C", "B", "A", "B", "A", "C");
         final Patch patch = Patch.generate(original, revised, new MyersDiff().computeDiff(original, revised, null));
@@ -42,7 +41,7 @@ public void testDiffMyersExample1Forward() throws DiffException {
     }
     
     @Test
-    public void testDiffMyersExample1ForwardWithListener() throws DiffException {
+    public void testDiffMyersExample1ForwardWithListener() {
         List original = Arrays.asList("A", "B", "C", "A", "B", "B", "A");
         List revised = Arrays.asList("C", "B", "A", "B", "A", "C");
         
diff --git a/java-diff-utils/src/test/java/com/github/difflib/examples/ComputeDifference.java b/java-diff-utils/src/test/java/com/github/difflib/examples/ComputeDifference.java
index bd6af94f..f665e662 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/examples/ComputeDifference.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/examples/ComputeDifference.java
@@ -2,7 +2,6 @@
 
 import com.github.difflib.DiffUtils;
 import com.github.difflib.TestConstants;
-import com.github.difflib.algorithm.DiffException;
 import com.github.difflib.patch.AbstractDelta;
 import com.github.difflib.patch.Patch;
 import java.io.File;
@@ -15,7 +14,7 @@ public class ComputeDifference {
     private static final String ORIGINAL = TestConstants.MOCK_FOLDER + "original.txt";
     private static final String RIVISED = TestConstants.MOCK_FOLDER + "revised.txt";
 
-    public static void main(String[] args) throws DiffException, IOException {
+    public static void main(String[] args) throws IOException {
         List original = Files.readAllLines(new File(ORIGINAL).toPath());
         List revised = Files.readAllLines(new File(RIVISED).toPath());
 
diff --git a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java
index c6c46c03..e2d1abac 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java
@@ -1,7 +1,6 @@
 package com.github.difflib.patch;
 
 import com.github.difflib.DiffUtils;
-import com.github.difflib.algorithm.DiffException;
 import java.util.Arrays;
 import java.util.List;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -11,7 +10,7 @@
 public class PatchTest {
 
     @Test
-    public void testPatch_Insert() throws DiffException {
+    public void testPatch_Insert() {
         final List insertTest_from = Arrays.asList("hhh");
         final List insertTest_to = Arrays.asList("hhh", "jjj", "kkk", "lll");
 
@@ -24,7 +23,7 @@ public void testPatch_Insert() throws DiffException {
     }
 
     @Test
-    public void testPatch_Delete() throws DiffException {
+    public void testPatch_Delete() {
         final List deleteTest_from = Arrays.asList("ddd", "fff", "ggg", "hhh");
         final List deleteTest_to = Arrays.asList("ggg");
 
@@ -37,7 +36,7 @@ public void testPatch_Delete() throws DiffException {
     }
 
     @Test
-    public void testPatch_Change() throws DiffException {
+    public void testPatch_Change() {
         final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
         final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
 
diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
index 42ddc876..a1450f3d 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
@@ -1,6 +1,5 @@
 package com.github.difflib.text;
 
-import com.github.difflib.algorithm.DiffException;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -17,7 +16,7 @@
 public class DiffRowGeneratorTest {
 
     @Test
-    public void testGenerator_Default() throws DiffException {
+    public void testGenerator_Default() {
         String first = "anything \n \nother";
         String second = "anything\n\nother";
 
@@ -41,7 +40,7 @@ public void testNormalize_List() {
     }
 
     @Test
-    public void testGenerator_Default2() throws DiffException {
+    public void testGenerator_Default2() {
         String first = "anything \n \nother";
         String second = "anything\n\nother";
 
@@ -55,7 +54,7 @@ public void testGenerator_Default2() throws DiffException {
     }
 
     @Test
-    public void testGenerator_InlineDiff() throws DiffException {
+    public void testGenerator_InlineDiff() {
         String first = "anything \n \nother";
         String second = "anything\n\nother";
 
@@ -71,7 +70,7 @@ public void testGenerator_InlineDiff() throws DiffException {
     }
 
     @Test
-    public void testGenerator_IgnoreWhitespaces() throws DiffException {
+    public void testGenerator_IgnoreWhitespaces() {
         String first = "anything \n \nother\nmore lines";
         String second = "anything\n\nother\nsome more lines";
 
@@ -100,7 +99,7 @@ private void print(List diffRows) {
     }
 
     @Test
-    public void testGeneratorWithWordWrap() throws DiffException {
+    public void testGeneratorWithWordWrap() {
         String first = "anything \n \nother";
         String second = "anything\n\nother";
 
@@ -117,7 +116,7 @@ public void testGeneratorWithWordWrap() throws DiffException {
     }
 
     @Test
-    public void testGeneratorWithMerge() throws DiffException {
+    public void testGeneratorWithMerge() {
         String first = "anything \n \nother";
         String second = "anything\n\nother";
 
@@ -135,7 +134,7 @@ public void testGeneratorWithMerge() throws DiffException {
     }
 
     @Test
-    public void testGeneratorWithMerge2() throws DiffException {
+    public void testGeneratorWithMerge2() {
         DiffRowGenerator generator = DiffRowGenerator.create()
                 .showInlineDiffs(true)
                 .mergeOriginalRevised(true)
@@ -148,7 +147,7 @@ public void testGeneratorWithMerge2() throws DiffException {
     }
 
     @Test
-    public void testGeneratorWithMerge3() throws DiffException {
+    public void testGeneratorWithMerge3() {
         String first = "test\nanything \n \nother";
         String second = "anything\n\nother\ntest\ntest2";
 
@@ -169,7 +168,7 @@ public void testGeneratorWithMerge3() throws DiffException {
     }
 
     @Test
-    public void testGeneratorWithMergeByWord4() throws DiffException {
+    public void testGeneratorWithMergeByWord4() {
         DiffRowGenerator generator = DiffRowGenerator.create()
                 .showInlineDiffs(true)
                 .mergeOriginalRevised(true)
@@ -183,7 +182,7 @@ public void testGeneratorWithMergeByWord4() throws DiffException {
     }
 
     @Test
-    public void testGeneratorWithMergeByWord5() throws DiffException {
+    public void testGeneratorWithMergeByWord5() {
         DiffRowGenerator generator = DiffRowGenerator.create()
                 .showInlineDiffs(true)
                 .mergeOriginalRevised(true)
@@ -221,7 +220,7 @@ public void testSplitString3() {
     }
 
     @Test
-    public void testGeneratorExample1() throws DiffException {
+    public void testGeneratorExample1() {
         DiffRowGenerator generator = DiffRowGenerator.create()
                 .showInlineDiffs(true)
                 .mergeOriginalRevised(true)
@@ -240,7 +239,7 @@ public void testGeneratorExample1() throws DiffException {
     }
 
     @Test
-    public void testGeneratorExample2() throws DiffException {
+    public void testGeneratorExample2() {
         DiffRowGenerator generator = DiffRowGenerator.create()
                 .showInlineDiffs(true)
                 .inlineDiffByWord(true)
@@ -263,7 +262,7 @@ public void testGeneratorExample2() throws DiffException {
     }
 
     @Test
-    public void testGeneratorUnchanged() throws DiffException {
+    public void testGeneratorUnchanged() {
         String first = "anything \n \nother";
         String second = "anything\n\nother";
 
@@ -281,7 +280,7 @@ public void testGeneratorUnchanged() throws DiffException {
     }
 
     @Test
-    public void testGeneratorIssue14() throws DiffException {
+    public void testGeneratorIssue14() {
         DiffRowGenerator generator = DiffRowGenerator.create()
                 .showInlineDiffs(true)
                 .mergeOriginalRevised(true)
@@ -300,7 +299,7 @@ public void testGeneratorIssue14() throws DiffException {
     }
 
     @Test
-    public void testGeneratorIssue15() throws DiffException, IOException {
+    public void testGeneratorIssue15() throws IOException {
         DiffRowGenerator generator = DiffRowGenerator.create()
                 .showInlineDiffs(true) //show the ~ ~ and ** ** symbols on each difference
                 .inlineDiffByWord(true) //show the ~ ~ and ** ** around each different word instead of each letter
@@ -329,7 +328,7 @@ public void testGeneratorIssue15() throws DiffException, IOException {
     }
 
     @Test
-    public void testGeneratorIssue22() throws DiffException {
+    public void testGeneratorIssue22() {
         DiffRowGenerator generator = DiffRowGenerator.create()
                 .showInlineDiffs(true)
                 .inlineDiffByWord(true)
@@ -353,7 +352,7 @@ public void testGeneratorIssue22() throws DiffException {
     }
 
     @Test
-    public void testGeneratorIssue22_2() throws DiffException {
+    public void testGeneratorIssue22_2() {
         DiffRowGenerator generator = DiffRowGenerator.create()
                 .showInlineDiffs(true)
                 .inlineDiffByWord(true)
@@ -371,7 +370,7 @@ public void testGeneratorIssue22_2() throws DiffException {
     }
 
     @Test
-    public void testGeneratorIssue22_3() throws DiffException {
+    public void testGeneratorIssue22_3() {
         DiffRowGenerator generator = DiffRowGenerator.create()
                 .showInlineDiffs(true)
                 .inlineDiffByWord(true)
@@ -389,7 +388,7 @@ public void testGeneratorIssue22_3() throws DiffException {
     }
 
     @Test
-    public void testGeneratorIssue41DefaultNormalizer() throws DiffException {
+    public void testGeneratorIssue41DefaultNormalizer() {
         DiffRowGenerator generator = DiffRowGenerator.create()
                 .build();
         List rows = generator.generateDiffRows(Arrays.asList("<"), Arrays.asList("<"));
@@ -397,7 +396,7 @@ public void testGeneratorIssue41DefaultNormalizer() throws DiffException {
     }
 
     @Test
-    public void testGeneratorIssue41UserNormalizer() throws DiffException {
+    public void testGeneratorIssue41UserNormalizer() {
         DiffRowGenerator generator = DiffRowGenerator.create()
                 .lineNormalizer(str -> str.replace("\t", "    "))
                 .build();
@@ -408,7 +407,7 @@ public void testGeneratorIssue41UserNormalizer() throws DiffException {
     }
 
     @Test
-    public void testGenerationIssue44reportLinesUnchangedProblem() throws DiffException {
+    public void testGenerationIssue44reportLinesUnchangedProblem() {
         DiffRowGenerator generator = DiffRowGenerator.create()
                 .showInlineDiffs(true)
                 .reportLinesUnchanged(true)
@@ -420,7 +419,7 @@ public void testGenerationIssue44reportLinesUnchangedProblem() throws DiffExcept
     }
 
     @Test
-    public void testIgnoreWhitespaceIssue66() throws DiffException {
+    public void testIgnoreWhitespaceIssue66() {
         DiffRowGenerator generator = DiffRowGenerator.create()
                 .showInlineDiffs(true)
                 .inlineDiffByWord(true)
@@ -441,7 +440,7 @@ public void testIgnoreWhitespaceIssue66() throws DiffException {
     }
 
     @Test
-    public void testIgnoreWhitespaceIssue66_2() throws DiffException {
+    public void testIgnoreWhitespaceIssue66_2() {
         DiffRowGenerator generator = DiffRowGenerator.create()
                 .showInlineDiffs(true)
                 .inlineDiffByWord(true)
@@ -460,7 +459,7 @@ public void testIgnoreWhitespaceIssue66_2() throws DiffException {
     }
 
     @Test
-    public void testIgnoreWhitespaceIssue64() throws DiffException {
+    public void testIgnoreWhitespaceIssue64() {
         DiffRowGenerator generator = DiffRowGenerator.create()
                 .showInlineDiffs(true)
                 .inlineDiffByWord(true)
@@ -476,13 +475,13 @@ public void testIgnoreWhitespaceIssue64() throws DiffException {
                 Arrays.asList("A new text line\n\nanother one".split("\n")));
 
         assertThat(rows).extracting(item -> item.getOldLine())
-                .containsExactly("~test~**A new text line**", 
-                                 "",
-                                 "~testline~**another one**");
+                .containsExactly("~test~**A new text line**",
+                        "",
+                        "~testline~**another one**");
     }
-    
+
     @Test
-    public void testReplaceDiffsIssue63() throws DiffException {
+    public void testReplaceDiffsIssue63() {
         DiffRowGenerator generator = DiffRowGenerator.create()
                 .showInlineDiffs(true)
                 .inlineDiffByWord(true)
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java
index e66b1a1e..acc84e9a 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java
@@ -2,7 +2,6 @@
 
 import com.github.difflib.DiffUtils;
 import com.github.difflib.TestConstants;
-import com.github.difflib.algorithm.DiffException;
 import com.github.difflib.patch.Patch;
 import com.github.difflib.patch.PatchFailedException;
 import java.io.BufferedReader;
@@ -34,7 +33,7 @@ public static List fileToLines(String filename) throws FileNotFoundExcep
     }
 
     @Test
-    public void testGenerateUnified() throws DiffException, IOException {
+    public void testGenerateUnified() throws IOException {
         List origLines = fileToLines(TestConstants.MOCK_FOLDER + "original.txt");
         List revLines = fileToLines(TestConstants.MOCK_FOLDER + "revised.txt");
 
@@ -42,7 +41,7 @@ public void testGenerateUnified() throws DiffException, IOException {
     }
 
     @Test
-    public void testGenerateUnifiedWithOneDelta() throws DiffException, IOException {
+    public void testGenerateUnifiedWithOneDelta() throws IOException {
         List origLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_original.txt");
         List revLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_revised.txt");
 
@@ -50,7 +49,7 @@ public void testGenerateUnifiedWithOneDelta() throws DiffException, IOException
     }
 
     @Test
-    public void testGenerateUnifiedDiffWithoutAnyDeltas() throws DiffException, IOException {
+    public void testGenerateUnifiedDiffWithoutAnyDeltas() throws IOException {
         List test = Arrays.asList("abc");
         Patch patch = DiffUtils.diff(test, test);
         StringWriter writer = new StringWriter();
@@ -85,14 +84,14 @@ public void testDiff_Issue10() throws IOException {
      */
     @Test
     @Disabled
-    public void testPatchWithNoDeltas() throws DiffException, IOException {
+    public void testPatchWithNoDeltas() throws IOException {
         final List lines1 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_1.txt");
         final List lines2 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_2.txt");
         verify(lines1, lines2, "issue11_1.txt", "issue11_2.txt");
     }
 
     @Test
-    public void testDiff5() throws DiffException, IOException {
+    public void testDiff5() throws IOException {
         final List lines1 = fileToLines(TestConstants.MOCK_FOLDER + "5A.txt");
         final List lines2 = fileToLines(TestConstants.MOCK_FOLDER + "5B.txt");
         verify(lines1, lines2, "5A.txt", "5B.txt");
@@ -102,7 +101,7 @@ public void testDiff5() throws DiffException, IOException {
      * Issue 19
      */
     @Test
-    public void testDiffWithHeaderLineInText() throws DiffException, IOException {
+    public void testDiffWithHeaderLineInText() throws IOException {
         List original = new ArrayList<>();
         List revised = new ArrayList<>();
 
@@ -130,7 +129,7 @@ public void testDiffWithHeaderLineInText() throws DiffException, IOException {
     }
 
     private void verify(List origLines, List revLines,
-            String originalFile, String revisedFile) throws DiffException, IOException {
+            String originalFile, String revisedFile) throws IOException {
         Patch patch = DiffUtils.diff(origLines, revLines);
 
         StringWriter writer = new StringWriter();
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java
index 43fb327e..a89d0275 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java
@@ -16,7 +16,6 @@
 package com.github.difflib.unifieddiff;
 
 import com.github.difflib.DiffUtils;
-import com.github.difflib.algorithm.DiffException;
 import com.github.difflib.patch.Patch;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -55,7 +54,7 @@ public void testWrite() throws URISyntaxException, IOException {
      * Issue 47
      */
     @Test
-    public void testWriteWithNewFile() throws URISyntaxException, IOException, DiffException {
+    public void testWriteWithNewFile() throws URISyntaxException, IOException {
         
         List original = new ArrayList<>();
         List revised = new ArrayList<>();

From 89c9f94aefe2a992278470617ac2be39211cf9d5 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 7 Mar 2020 00:31:21 +0100
Subject: [PATCH 098/266] removed diff exception

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index b6d7d28e..36e471c8 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.6-SNAPSHOT
+        4.7-SNAPSHOT
     
     java-diff-utils-jgit
     java-diff-utils-jgit
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index bcb15700..f80bdd42 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -7,7 +7,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.6-SNAPSHOT
+        4.7-SNAPSHOT
     
     
         UTF-8
diff --git a/pom.xml b/pom.xml
index 5aed4e89..1665a20a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.6-SNAPSHOT
+    4.7-SNAPSHOT
     java-diff-utils-parent
     pom
     

From d34591ed130c8c2ec1930e93eb2ac9ca36df4462 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 7 Mar 2020 00:36:15 +0100
Subject: [PATCH 099/266] removed diff exception

---
 java-diff-utils-jgit/nb-configuration.xml | 18 ++++++++++++++++++
 java-diff-utils/nb-configuration.xml      |  1 +
 2 files changed, 19 insertions(+)
 create mode 100644 java-diff-utils-jgit/nb-configuration.xml

diff --git a/java-diff-utils-jgit/nb-configuration.xml b/java-diff-utils-jgit/nb-configuration.xml
new file mode 100644
index 00000000..ec4540cb
--- /dev/null
+++ b/java-diff-utils-jgit/nb-configuration.xml
@@ -0,0 +1,18 @@
+
+
+    
+    
+        
+        none
+    
+
diff --git a/java-diff-utils/nb-configuration.xml b/java-diff-utils/nb-configuration.xml
index a65c4514..b01ee9a6 100644
--- a/java-diff-utils/nb-configuration.xml
+++ b/java-diff-utils/nb-configuration.xml
@@ -14,5 +14,6 @@ That way multiple projects can share the same settings (useful for formatting ru
 Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
         JDK_1.8
+        none
     
 

From 11b3c53d2b840d015f11c6ac1a8ef62ba6235713 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 8 Mar 2020 23:01:13 +0100
Subject: [PATCH 100/266] fixes #52 fixes #53

---
 .../java/com/github/difflib/DiffUtils.java    |  3 +-
 .../github/difflib/text/DiffRowGenerator.java | 81 ++++++++++++++-----
 2 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
index 0e7b074e..dc00c172 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
@@ -30,14 +30,13 @@
 
 /**
  * Implements the difference and patching engine
- *
- * @author Dmitry Naumenko
  */
 public final class DiffUtils {
 
     /**
      * Computes the difference between the original and revised list of elements with default diff algorithm
      *
+     * @param  types to be diffed
      * @param original The original text. Must not be {@code null}.
      * @param revised The revised text. Must not be {@code null}.
      * @param progress progress listener
diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
index 5fb1d2b1..8ea86a84 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
@@ -24,6 +24,7 @@
 import com.github.difflib.patch.Patch;
 import com.github.difflib.text.DiffRow.Tag;
 import java.util.*;
+import java.util.function.BiFunction;
 import java.util.function.BiPredicate;
 import java.util.function.Function;
 import java.util.regex.Matcher;
@@ -106,7 +107,7 @@ protected final static List splitStringPreserveDelimiter(String str, Pat
      * @param tagGenerator the tag generator
      */
     static void wrapInTag(List sequence, int startPosition,
-            int endPosition, Function tagGenerator,
+            int endPosition, Tag tag, BiFunction tagGenerator,
             Function processDiffs) {
         int endPos = endPosition;
 
@@ -124,7 +125,7 @@ static void wrapInTag(List sequence, int startPosition,
                 break;
             }
 
-            sequence.add(endPos, tagGenerator.apply(false));
+            sequence.add(endPos, tagGenerator.apply(tag, false));
             if (processDiffs != null) {
                 sequence.set(endPos - 1,
                         processDiffs.apply(sequence.get(endPos - 1)));
@@ -143,7 +144,7 @@ static void wrapInTag(List sequence, int startPosition,
                 endPos--;
             }
 
-            sequence.add(endPos, tagGenerator.apply(true));
+            sequence.add(endPos, tagGenerator.apply(tag, true));
             endPos--;
         }
     }
@@ -153,8 +154,8 @@ static void wrapInTag(List sequence, int startPosition,
     private final boolean ignoreWhiteSpaces;
     private final Function> inlineDiffSplitter;
     private final boolean mergeOriginalRevised;
-    private final Function newTag;
-    private final Function oldTag;
+    private final BiFunction newTag;
+    private final BiFunction oldTag;
     private final boolean reportLinesUnchanged;
     private final Function lineNormalizer;
     private final Function processDiffs;
@@ -169,7 +170,13 @@ private DiffRowGenerator(Builder builder) {
         columnWidth = builder.columnWidth;
         mergeOriginalRevised = builder.mergeOriginalRevised;
         inlineDiffSplitter = builder.inlineDiffSplitter;
-        equalizer = ignoreWhiteSpaces ? IGNORE_WHITESPACE_EQUALIZER : DEFAULT_EQUALIZER;
+
+        if (builder.equalizer != null) {
+            equalizer = builder.equalizer;
+        } else {
+            equalizer = ignoreWhiteSpaces ? IGNORE_WHITESPACE_EQUALIZER : DEFAULT_EQUALIZER;
+        }
+
         reportLinesUnchanged = builder.reportLinesUnchanged;
         lineNormalizer = builder.lineNormalizer;
         processDiffs = builder.processDiffs;
@@ -254,15 +261,15 @@ private DiffRow buildDiffRow(Tag type, String orgline, String newline) {
             String wrapOrg = preprocessLine(orgline);
             if (Tag.DELETE == type) {
                 if (mergeOriginalRevised || showInlineDiffs) {
-                    wrapOrg = oldTag.apply(true) + wrapOrg + oldTag.apply(false);
+                    wrapOrg = oldTag.apply(type, true) + wrapOrg + oldTag.apply(type, false);
                 }
             }
             String wrapNew = preprocessLine(newline);
             if (Tag.INSERT == type) {
                 if (mergeOriginalRevised) {
-                    wrapOrg = newTag.apply(true) + wrapNew + newTag.apply(false);
+                    wrapOrg = newTag.apply(type, true) + wrapNew + newTag.apply(type, false);
                 } else if (showInlineDiffs) {
-                    wrapNew = newTag.apply(true) + wrapNew + newTag.apply(false);
+                    wrapNew = newTag.apply(type, true) + wrapNew + newTag.apply(type, false);
                 }
             }
             return new DiffRow(type, wrapOrg, wrapNew);
@@ -308,7 +315,7 @@ private List generateInlineDiffs(AbstractDelta delta) {
             if (inlineDelta instanceof DeleteDelta) {
                 wrapInTag(origList, inlineOrig.getPosition(), inlineOrig
                         .getPosition()
-                        + inlineOrig.size(), oldTag, processDiffs);
+                        + inlineOrig.size(), Tag.DELETE, oldTag, processDiffs);
             } else if (inlineDelta instanceof InsertDelta) {
                 if (mergeOriginalRevised) {
                     origList.addAll(inlineOrig.getPosition(),
@@ -316,11 +323,11 @@ private List generateInlineDiffs(AbstractDelta delta) {
                                     inlineRev.getPosition() + inlineRev.size()));
                     wrapInTag(origList, inlineOrig.getPosition(),
                             inlineOrig.getPosition() + inlineRev.size(),
-                            newTag, processDiffs);
+                            Tag.INSERT, newTag, processDiffs);
                 } else {
                     wrapInTag(revList, inlineRev.getPosition(),
                             inlineRev.getPosition() + inlineRev.size(),
-                            newTag, processDiffs);
+                            Tag.INSERT, newTag, processDiffs);
                 }
             } else if (inlineDelta instanceof ChangeDelta) {
                 if (mergeOriginalRevised) {
@@ -329,15 +336,15 @@ private List generateInlineDiffs(AbstractDelta delta) {
                                     inlineRev.getPosition() + inlineRev.size()));
                     wrapInTag(origList, inlineOrig.getPosition() + inlineOrig.size(),
                             inlineOrig.getPosition() + inlineOrig.size() + inlineRev.size(),
-                            newTag, processDiffs);
+                            Tag.CHANGE, newTag, processDiffs);
                 } else {
                     wrapInTag(revList, inlineRev.getPosition(),
                             inlineRev.getPosition() + inlineRev.size(),
-                            newTag, processDiffs);
+                            Tag.CHANGE, newTag, processDiffs);
                 }
                 wrapInTag(origList, inlineOrig.getPosition(),
                         inlineOrig.getPosition() + inlineOrig.size(),
-                        oldTag, processDiffs);
+                        Tag.CHANGE, oldTag, processDiffs);
             }
         }
         StringBuilder origResult = new StringBuilder();
@@ -380,8 +387,10 @@ public static class Builder {
         private boolean showInlineDiffs = false;
         private boolean ignoreWhiteSpaces = false;
 
-        private Function oldTag = f -> f ? "" : "";
-        private Function newTag = f -> f ? "" : "";
+        private BiFunction oldTag = 
+                (tag, f) -> f ? "" : "";
+        private BiFunction newTag = 
+                (tag, f) -> f ? "" : "";
 
         private int columnWidth = 0;
         private boolean mergeOriginalRevised = false;
@@ -389,6 +398,7 @@ public static class Builder {
         private Function> inlineDiffSplitter = SPLITTER_BY_CHARACTER;
         private Function lineNormalizer = LINE_NORMALIZER_FOR_HTML;
         private Function processDiffs = null;
+        private BiPredicate equalizer = null;
 
         private Builder() {
         }
@@ -433,10 +443,21 @@ public Builder reportLinesUnchanged(final boolean val) {
          * @param generator the tag generator
          * @return builder with configured ignoreBlankLines parameter
          */
-        public Builder oldTag(Function generator) {
+        public Builder oldTag(BiFunction generator) {
             this.oldTag = generator;
             return this;
         }
+        
+        /**
+         * Generator for Old-Text-Tags.
+         *
+         * @param generator the tag generator
+         * @return builder with configured ignoreBlankLines parameter
+         */
+        public Builder oldTag(Function generator) {
+            this.oldTag = (tag, f) -> generator.apply(f);
+            return this;
+        }
 
         /**
          * Generator for New-Text-Tags.
@@ -444,10 +465,21 @@ public Builder oldTag(Function generator) {
          * @param generator
          * @return
          */
-        public Builder newTag(Function generator) {
+        public Builder newTag(BiFunction generator) {
             this.newTag = generator;
             return this;
         }
+        
+        /**
+         * Generator for New-Text-Tags.
+         *
+         * @param generator
+         * @return
+         */
+        public Builder newTag(Function generator) {
+            this.newTag = (tag, f) -> generator.apply(f);
+            return this;
+        }
 
         /**
          * Processor for diffed text parts. Here e.g. whitecharacters could be replaced by something
@@ -534,5 +566,16 @@ public Builder lineNormalizer(Function lineNormalizer) {
             this.lineNormalizer = lineNormalizer;
             return this;
         }
+
+        /**
+         * Provide an equalizer for diff processing.
+         *
+         * @param equalizer equalizer for diff processing.
+         * @return builder with configured equalizer parameter
+         */
+        public Builder equalizer(BiPredicate equalizer) {
+            this.equalizer = equalizer;
+            return this;
+        }
     }
 }

From 29de84cd96f7c71b277557b43ecc62aa7678ac28 Mon Sep 17 00:00:00 2001
From: "Sean C. Sullivan" 
Date: Fri, 10 Apr 2020 16:35:57 -0700
Subject: [PATCH 101/266] junit 5.6.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1665a20a..d2e0a786 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
             
                 org.junit.jupiter
                 junit-jupiter
-                5.6.0
+                5.6.2
                 test
             
             
@@ -242,4 +242,4 @@
             
         
     
-
\ No newline at end of file
+

From f0fc883485dceec65f22cb14687e979db749b7a6 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 18 Apr 2020 22:31:50 +0200
Subject: [PATCH 102/266] first try of implementing issue #42

---
 .../java/com/github/difflib/DiffUtils.java    | 63 ++++++++++++-------
 .../com/github/difflib/patch/EqualDelta.java  | 44 +++++++++++++
 .../java/com/github/difflib/patch/Patch.java  | 31 ++++++++-
 .../com/github/difflib/DiffUtilsTest.java     | 32 ++++++++++
 4 files changed, 146 insertions(+), 24 deletions(-)
 create mode 100644 java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java

diff --git a/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
index dc00c172..f85b6178 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
@@ -34,21 +34,27 @@
 public final class DiffUtils {
 
     /**
-     * Computes the difference between the original and revised list of elements with default diff algorithm
+     * Computes the difference between the original and revised list of elements with default diff
+     * algorithm
      *
      * @param  types to be diffed
      * @param original The original text. Must not be {@code null}.
      * @param revised The revised text. Must not be {@code null}.
      * @param progress progress listener
-     * @return The patch describing the difference between the original and revised sequences. Never {@code null}.
+     * @return The patch describing the difference between the original and revised sequences. Never
+     * {@code null}.
      */
     public static  Patch diff(List original, List revised, DiffAlgorithmListener progress) {
         return DiffUtils.diff(original, revised, new MyersDiff<>(), progress);
     }
-    
+
     public static  Patch diff(List original, List revised) {
         return DiffUtils.diff(original, revised, new MyersDiff<>(), null);
     }
+    
+    public static  Patch diff(List original, List revised, boolean includeEqualParts) {
+        return DiffUtils.diff(original, revised, new MyersDiff<>(), null, includeEqualParts);
+    }
 
     /**
      * Computes the difference between the original and revised text.
@@ -56,19 +62,21 @@ public static  Patch diff(List original, List revised) {
     public static Patch diff(String sourceText, String targetText,
             DiffAlgorithmListener progress) {
         return DiffUtils.diff(
-                 Arrays.asList(sourceText.split("\n")), 
-                 Arrays.asList(targetText.split("\n")), progress);
+                Arrays.asList(sourceText.split("\n")),
+                Arrays.asList(targetText.split("\n")), progress);
     }
 
     /**
-     * Computes the difference between the original and revised list of elements with default diff algorithm
+     * Computes the difference between the original and revised list of elements with default diff
+     * algorithm
      *
      * @param source The original text. Must not be {@code null}.
      * @param target The revised text. Must not be {@code null}.
      *
-     * @param equalizer the equalizer object to replace the default compare algorithm (Object.equals). If {@code null}
-     * the default equalizer of the default algorithm is used..
-     * @return The patch describing the difference between the original and revised sequences. Never {@code null}.
+     * @param equalizer the equalizer object to replace the default compare algorithm
+     * (Object.equals). If {@code null} the default equalizer of the default algorithm is used..
+     * @return The patch describing the difference between the original and revised sequences. Never
+     * {@code null}.
      */
     public static  Patch diff(List source, List target,
             BiPredicate equalizer) {
@@ -79,40 +87,51 @@ public static  Patch diff(List source, List target,
         return DiffUtils.diff(source, target, new MyersDiff<>());
     }
 
+    public static  Patch diff(List original, List revised,
+            DiffAlgorithmI algorithm, DiffAlgorithmListener progress) {
+        return diff(original, revised, algorithm, progress, false);
+    }
+    
     /**
-     * Computes the difference between the original and revised list of elements with default diff algorithm
+     * Computes the difference between the original and revised list of elements with default diff
+     * algorithm
      *
      * @param original The original text. Must not be {@code null}.
      * @param revised The revised text. Must not be {@code null}.
      * @param algorithm The diff algorithm. Must not be {@code null}.
      * @param progress The diff algorithm listener.
-     * @return The patch describing the difference between the original and revised sequences. Never {@code null}.
+     * @param includeEqualParts Include equal data parts into the patch.
+     * @return The patch describing the difference between the original and revised sequences. Never
+     * {@code null}.
      */
     public static  Patch diff(List original, List revised,
-            DiffAlgorithmI algorithm, DiffAlgorithmListener progress) {
+            DiffAlgorithmI algorithm, DiffAlgorithmListener progress, 
+            boolean includeEqualParts) {
         Objects.requireNonNull(original, "original must not be null");
         Objects.requireNonNull(revised, "revised must not be null");
         Objects.requireNonNull(algorithm, "algorithm must not be null");
 
-        return Patch.generate(original, revised, algorithm.computeDiff(original, revised, progress));
+        return Patch.generate(original, revised, algorithm.computeDiff(original, revised, progress), includeEqualParts);
     }
-    
+
     /**
-     * Computes the difference between the original and revised list of elements with default diff algorithm
+     * Computes the difference between the original and revised list of elements with default diff
+     * algorithm
      *
      * @param original The original text. Must not be {@code null}.
      * @param revised The revised text. Must not be {@code null}.
      * @param algorithm The diff algorithm. Must not be {@code null}.
-     * @return The patch describing the difference between the original and revised sequences. Never {@code null}.
+     * @return The patch describing the difference between the original and revised sequences. Never
+     * {@code null}.
      */
-     public static  Patch diff(List original, List revised,
-            DiffAlgorithmI algorithm) {
-         return diff(original, revised, algorithm, null);
-     }
+    public static  Patch diff(List original, List revised, DiffAlgorithmI algorithm) {
+        return diff(original, revised, algorithm, null);
+    }
 
     /**
-     * Computes the difference between the given texts inline. This one uses the "trick" to make out of texts lists of
-     * characters, like DiffRowGenerator does and merges those changes at the end together again.
+     * Computes the difference between the given texts inline. This one uses the "trick" to make out
+     * of texts lists of characters, like DiffRowGenerator does and merges those changes at the end
+     * together again.
      *
      * @param original
      * @param revised
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java
new file mode 100644
index 00000000..ff3d2323
--- /dev/null
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2020 java-diff-utils.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.difflib.patch;
+
+import java.util.List;
+
+/**
+ * This delta contains equal lines of data. Therefore nothing is to do in applyTo and restore.
+ * @author tobens
+ */
+public class EqualDelta extends AbstractDelta {
+
+    public EqualDelta(Chunk source, Chunk target) {
+        super(DeltaType.EQUAL, source, target);
+    }
+
+    @Override
+    public void applyTo(List target) throws PatchFailedException {
+        verifyChunk(target);
+    }
+
+    @Override
+    public void restore(List target) {
+    }
+
+    @Override
+    public String toString() {
+        return "[EqualDelta, position: " + getSource().getPosition() + ", lines: "
+                + getSource().getLines() + "]";
+    }
+}
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
index 688e9f16..821d21b9 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
@@ -100,10 +100,27 @@ public String toString() {
     }
 
     public static  Patch generate(List original, List revised, List changes) {
+        return generate(original, revised, changes, false);
+    }
+
+    private static  Chunk buildChunk(int start, int end, List data) {
+        return new Chunk<>(start, new ArrayList<>(data.subList(start, end)));
+    }
+
+    public static  Patch generate(List original, List revised, List changes, boolean includeEquals) {
         Patch patch = new Patch<>(changes.size());
+        int startOriginal = 0;
+        int startRevised = 0;
         for (Change change : changes) {
-            Chunk orgChunk = new Chunk<>(change.startOriginal, new ArrayList<>(original.subList(change.startOriginal, change.endOriginal)));
-            Chunk revChunk = new Chunk<>(change.startRevised, new ArrayList<>(revised.subList(change.startRevised, change.endRevised)));
+
+            if (includeEquals && startOriginal < change.startOriginal) {
+                patch.addDelta(new EqualDelta(
+                        buildChunk(startOriginal, change.startOriginal, original),
+                        buildChunk(startRevised, change.startRevised, revised)));
+            }
+
+            Chunk orgChunk = buildChunk(change.startOriginal, change.endOriginal, original);
+            Chunk revChunk = buildChunk(change.startRevised, change.endRevised, revised);
             switch (change.deltaType) {
                 case DELETE:
                     patch.addDelta(new DeleteDelta<>(orgChunk, revChunk));
@@ -115,7 +132,17 @@ public static  Patch generate(List original, List revised, List(orgChunk, revChunk));
                     break;
             }
+
+            startOriginal = change.endOriginal + 1;
+            startRevised = change.endRevised + 1;
         }
+
+        if (includeEquals && startOriginal < original.size()) {
+            patch.addDelta(new EqualDelta(
+                    buildChunk(startOriginal, original.size(), original),
+                    buildChunk(startRevised, revised.size(), revised)));
+        }
+
         return patch;
     }
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java b/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
index cee5b2c9..6272e3df 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
@@ -4,6 +4,7 @@
 import com.github.difflib.patch.Chunk;
 import com.github.difflib.patch.DeleteDelta;
 import com.github.difflib.patch.AbstractDelta;
+import com.github.difflib.patch.EqualDelta;
 import com.github.difflib.patch.InsertDelta;
 import com.github.difflib.patch.Patch;
 import java.io.BufferedReader;
@@ -159,4 +160,35 @@ public void testDiffMyersExample1() {
         assertEquals(4, patch.getDeltas().size());
         assertEquals("Patch{deltas=[[DeleteDelta, position: 0, lines: [A, B]], [InsertDelta, position: 3, lines: [B]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]}", patch.toString());
     }
+    
+    @Test
+    public void testDiff_Equal() {
+        final Patch patch = DiffUtils.diff(
+                Arrays.asList("hhh", "jjj", "kkk"), 
+                Arrays.asList("hhh", "jjj", "kkk"), true);
+        assertNotNull(patch);
+        assertEquals(1, patch.getDeltas().size());
+        final AbstractDelta delta = patch.getDeltas().get(0);
+        assertTrue(delta instanceof EqualDelta);
+        assertEquals(new Chunk<>(0, Arrays.asList("hhh", "jjj", "kkk")), delta.getSource());
+        assertEquals(new Chunk<>(0, Arrays.asList("hhh", "jjj", "kkk")), delta.getTarget());
+    }
+    
+     @Test
+    public void testDiff_InsertWithEqual() {
+        final Patch patch = DiffUtils.diff(Arrays.asList("hhh"), Arrays.
+                asList("hhh", "jjj", "kkk"), true);
+        assertNotNull(patch);
+        assertEquals(2, patch.getDeltas().size());
+        
+        AbstractDelta delta = patch.getDeltas().get(0);
+        assertTrue(delta instanceof EqualDelta);
+        assertEquals(new Chunk<>(0, Arrays.asList("hhh")), delta.getSource());
+        assertEquals(new Chunk<>(0, Arrays.asList("hhh")), delta.getTarget());
+        
+        delta = patch.getDeltas().get(1);
+        assertTrue(delta instanceof InsertDelta);
+        assertEquals(new Chunk<>(1, Collections.emptyList()), delta.getSource());
+        assertEquals(new Chunk<>(1, Arrays.asList("jjj", "kkk")), delta.getTarget());
+    }
 }

From ccfc40234adcb7ed7c766f550a50e0554f1a8120 Mon Sep 17 00:00:00 2001
From: Tobias 
Date: Sat, 18 Apr 2020 22:58:56 +0200
Subject: [PATCH 103/266] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80558290..8bf3fcba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ This project uses a custom versioning scheme (and not [Semantic Versioning](http
 
 ## [Unreleased]
 
+* minor bug fixes
+* optional include equal parts of original and revised data
 * **API** change: removed DiffException completely
 * added possibility to **process diffs** to for instance show whitespace characters
 

From 37310e1628ca04f32d669c1923352396d7f52f34 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 18 Apr 2020 22:59:50 +0200
Subject: [PATCH 104/266] working on issue #75

---
 .../com/github/difflib/text/DiffRowGenerator.java  | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
index 8ea86a84..350bef5b 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
@@ -17,10 +17,8 @@
 
 import com.github.difflib.DiffUtils;
 import com.github.difflib.patch.AbstractDelta;
-import com.github.difflib.patch.ChangeDelta;
 import com.github.difflib.patch.Chunk;
-import com.github.difflib.patch.DeleteDelta;
-import com.github.difflib.patch.InsertDelta;
+import com.github.difflib.patch.DeltaType;
 import com.github.difflib.patch.Patch;
 import com.github.difflib.text.DiffRow.Tag;
 import java.util.*;
@@ -218,7 +216,7 @@ public List generateDiffRows(final List original, Patch
             }
 
             // Inserted DiffRow
-            if (delta instanceof InsertDelta) {
+            if (delta.getType() == DeltaType.INSERT) {
                 endPos = orig.last() + 1;
                 for (String line : rev.getLines()) {
                     diffRows.add(buildDiffRow(Tag.INSERT, "", line));
@@ -227,7 +225,7 @@ public List generateDiffRows(final List original, Patch
             }
 
             // Deleted DiffRow
-            if (delta instanceof DeleteDelta) {
+            if (delta.getType() == DeltaType.DELETE) {
                 endPos = orig.last() + 1;
                 for (String line : orig.getLines()) {
                     diffRows.add(buildDiffRow(Tag.DELETE, line, ""));
@@ -312,11 +310,11 @@ private List generateInlineDiffs(AbstractDelta delta) {
         for (AbstractDelta inlineDelta : inlineDeltas) {
             Chunk inlineOrig = inlineDelta.getSource();
             Chunk inlineRev = inlineDelta.getTarget();
-            if (inlineDelta instanceof DeleteDelta) {
+            if (inlineDelta.getType() == DeltaType.DELETE) {
                 wrapInTag(origList, inlineOrig.getPosition(), inlineOrig
                         .getPosition()
                         + inlineOrig.size(), Tag.DELETE, oldTag, processDiffs);
-            } else if (inlineDelta instanceof InsertDelta) {
+            } else if (inlineDelta.getType() == DeltaType.INSERT) {
                 if (mergeOriginalRevised) {
                     origList.addAll(inlineOrig.getPosition(),
                             revList.subList(inlineRev.getPosition(),
@@ -329,7 +327,7 @@ private List generateInlineDiffs(AbstractDelta delta) {
                             inlineRev.getPosition() + inlineRev.size(),
                             Tag.INSERT, newTag, processDiffs);
                 }
-            } else if (inlineDelta instanceof ChangeDelta) {
+            } else if (inlineDelta.getType() == DeltaType.CHANGE) {
                 if (mergeOriginalRevised) {
                     origList.addAll(inlineOrig.getPosition() + inlineOrig.size(),
                             revList.subList(inlineRev.getPosition(),

From 5781cc51786dc59dbde55a501102f359b81a8b9f Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 19 Apr 2020 23:51:23 +0200
Subject: [PATCH 105/266]

---
 .../java/com/github/difflib/patch/Patch.java  | 17 +++++--
 .../com/github/difflib/DiffUtilsTest.java     | 48 ++++++++++++++++---
 2 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
index 821d21b9..161293eb 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
@@ -22,6 +22,7 @@
 import static java.util.Comparator.comparing;
 import com.github.difflib.algorithm.Change;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.ListIterator;
 
@@ -107,10 +108,18 @@ private static  Chunk buildChunk(int start, int end, List data) {
         return new Chunk<>(start, new ArrayList<>(data.subList(start, end)));
     }
 
-    public static  Patch generate(List original, List revised, List changes, boolean includeEquals) {
-        Patch patch = new Patch<>(changes.size());
+    public static  Patch generate(List original, List revised, List _changes, boolean includeEquals) {
+        Patch patch = new Patch<>(_changes.size());
         int startOriginal = 0;
         int startRevised = 0;
+        
+        List changes = _changes;
+        
+        if (includeEquals) {
+            changes = new ArrayList(_changes);
+            Collections.sort(changes, comparing(d -> d.startOriginal));
+        }
+        
         for (Change change : changes) {
 
             if (includeEquals && startOriginal < change.startOriginal) {
@@ -133,8 +142,8 @@ public static  Patch generate(List original, List revised, List patch = DiffUtils.diff(
-                Arrays.asList("hhh", "jjj", "kkk"), 
+                Arrays.asList("hhh", "jjj", "kkk"),
                 Arrays.asList("hhh", "jjj", "kkk"), true);
         assertNotNull(patch);
         assertEquals(1, patch.getDeltas().size());
@@ -173,22 +174,57 @@ public void testDiff_Equal() {
         assertEquals(new Chunk<>(0, Arrays.asList("hhh", "jjj", "kkk")), delta.getSource());
         assertEquals(new Chunk<>(0, Arrays.asList("hhh", "jjj", "kkk")), delta.getTarget());
     }
-    
-     @Test
+
+    @Test
     public void testDiff_InsertWithEqual() {
         final Patch patch = DiffUtils.diff(Arrays.asList("hhh"), Arrays.
                 asList("hhh", "jjj", "kkk"), true);
         assertNotNull(patch);
         assertEquals(2, patch.getDeltas().size());
-        
+
         AbstractDelta delta = patch.getDeltas().get(0);
         assertTrue(delta instanceof EqualDelta);
         assertEquals(new Chunk<>(0, Arrays.asList("hhh")), delta.getSource());
         assertEquals(new Chunk<>(0, Arrays.asList("hhh")), delta.getTarget());
-        
+
         delta = patch.getDeltas().get(1);
         assertTrue(delta instanceof InsertDelta);
         assertEquals(new Chunk<>(1, Collections.emptyList()), delta.getSource());
         assertEquals(new Chunk<>(1, Arrays.asList("jjj", "kkk")), delta.getTarget());
     }
+
+    @Test
+    public void testDiff_ProblemIssue42() {
+        final Patch patch = DiffUtils.diff(
+                Arrays.asList("The", "dog", "is", "brown"),
+                Arrays.asList("The", "fox", "is", "down"), true);
+
+        System.out.println(patch);
+        assertNotNull(patch);
+        assertEquals(4, patch.getDeltas().size());
+
+        
+        assertThat(patch.getDeltas()).extracting(d -> d.getType().name())
+                .containsExactly("EQUAL", "CHANGE", "EQUAL", "CHANGE");
+        
+        AbstractDelta delta = patch.getDeltas().get(0);
+        assertTrue(delta instanceof EqualDelta);
+        assertEquals(new Chunk<>(0, Arrays.asList("The")), delta.getSource());
+        assertEquals(new Chunk<>(0, Arrays.asList("The")), delta.getTarget());
+
+        delta = patch.getDeltas().get(1);
+        assertTrue(delta instanceof ChangeDelta);
+        assertEquals(new Chunk<>(1, Arrays.asList("dog")), delta.getSource());
+        assertEquals(new Chunk<>(1, Arrays.asList("fox")), delta.getTarget());
+        
+        delta = patch.getDeltas().get(2);
+        assertTrue(delta instanceof EqualDelta);
+        assertEquals(new Chunk<>(2, Arrays.asList("is")), delta.getSource());
+        assertEquals(new Chunk<>(2, Arrays.asList("is")), delta.getTarget());
+        
+        delta = patch.getDeltas().get(3);
+        assertTrue(delta instanceof ChangeDelta);
+        assertEquals(new Chunk<>(3, Arrays.asList("brown")), delta.getSource());
+        assertEquals(new Chunk<>(3, Arrays.asList("down")), delta.getTarget());
+    }
 }

From fbb51d28c7b3611a6bc546bde96bfcc655cc5cca Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Wed, 22 Apr 2020 22:24:49 +0200
Subject: [PATCH 106/266]

---
 .../main/java/com/github/difflib/patch/AbstractDelta.java    | 2 ++
 .../src/main/java/com/github/difflib/patch/ChangeDelta.java  | 5 +++++
 .../src/main/java/com/github/difflib/patch/DeleteDelta.java  | 5 +++++
 .../src/main/java/com/github/difflib/patch/EqualDelta.java   | 5 +++++
 .../src/main/java/com/github/difflib/patch/InsertDelta.java  | 5 +++++
 5 files changed, 22 insertions(+)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
index 9f1fb451..6d0b5d98 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
@@ -60,6 +60,8 @@ protected void verifyChunk(List target) throws PatchFailedException {
     public abstract void applyTo(List target) throws PatchFailedException;
     
     public abstract void restore(List target);
+    
+    public abstract AbstractDelta withChunks(Chunk original, Chunk revised);
 
     @Override
     public int hashCode() {
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java
index 7c1cd98b..eddb279d 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java
@@ -72,4 +72,9 @@ public String toString() {
         return "[ChangeDelta, position: " + getSource().getPosition() + ", lines: "
                 + getSource().getLines() + " to " + getTarget().getLines() + "]";
     }
+
+    @Override
+    public AbstractDelta withChunks(Chunk original, Chunk revised) {
+        return new ChangeDelta(original, revised);
+    }
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java
index cfbc427c..b33114fe 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java
@@ -59,4 +59,9 @@ public String toString() {
         return "[DeleteDelta, position: " + getSource().getPosition() + ", lines: "
                 + getSource().getLines() + "]";
     }
+    
+    @Override
+    public AbstractDelta withChunks(Chunk original, Chunk revised) {
+        return new DeleteDelta(original, revised);
+    }
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java
index ff3d2323..dbfdf46a 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java
@@ -41,4 +41,9 @@ public String toString() {
         return "[EqualDelta, position: " + getSource().getPosition() + ", lines: "
                 + getSource().getLines() + "]";
     }
+    
+    @Override
+    public AbstractDelta withChunks(Chunk original, Chunk revised) {
+        return new EqualDelta(original, revised);
+    }
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java
index 12164fa4..16742d25 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java
@@ -59,4 +59,9 @@ public String toString() {
         return "[InsertDelta, position: " + getSource().getPosition()
                 + ", lines: " + getTarget().getLines() + "]";
     }
+    
+    @Override
+    public AbstractDelta withChunks(Chunk original, Chunk revised) {
+        return new InsertDelta(original, revised);
+    }
 }

From ea8d442d28f8fb88b849e8f22fde581ee0922190 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Wed, 22 Apr 2020 22:26:25 +0200
Subject: [PATCH 107/266] fixes #75

---
 .../src/main/java/com/github/difflib/patch/AbstractDelta.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
index 6d0b5d98..e98874e8 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
@@ -61,6 +61,9 @@ protected void verifyChunk(List target) throws PatchFailedException {
     
     public abstract void restore(List target);
     
+    /**
+     * Create a new delta of the actual instance with customized chunk data.
+     */
     public abstract AbstractDelta withChunks(Chunk original, Chunk revised);
 
     @Override

From ba4bd7ff03cbc98c3e40c8c372c5a7dab289bc45 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Thu, 23 Apr 2020 22:19:31 +0200
Subject: [PATCH 108/266] [maven-release-plugin] prepare release
 java-diff-utils-parent-4.7

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index 36e471c8..deeef10e 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.7-SNAPSHOT
+        4.7
     
     java-diff-utils-jgit
     java-diff-utils-jgit
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index f80bdd42..5cbff438 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -7,7 +7,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.7-SNAPSHOT
+        4.7
     
     
         UTF-8
diff --git a/pom.xml b/pom.xml
index d2e0a786..b6b3d5f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.7-SNAPSHOT
+    4.7
     java-diff-utils-parent
     pom
     
@@ -29,7 +29,7 @@
         scm:git:https://github.com/java-diff-utils/java-diff-utils.git
         scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
         https://github.com/java-diff-utils/java-diff-utils.git
-        HEAD
+        java-diff-utils-parent-4.7
     
     
         GitHub Issues
@@ -141,7 +141,7 @@
                             
                             
                             
-                                
+                                
                                 
                                 
                                 

From 47fe8e0ea655f8ab7b7b6378bba5d3cb7cd5a33f Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Thu, 23 Apr 2020 22:19:33 +0200
Subject: [PATCH 109/266] [maven-release-plugin] prepare for next development
 iteration

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index deeef10e..6f7dc799 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.7
+        4.8-SNAPSHOT
     
     java-diff-utils-jgit
     java-diff-utils-jgit
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index 5cbff438..a96aa7cd 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -7,7 +7,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.7
+        4.8-SNAPSHOT
     
     
         UTF-8
diff --git a/pom.xml b/pom.xml
index b6b3d5f5..07ea0726 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.7
+    4.8-SNAPSHOT
     java-diff-utils-parent
     pom
     
@@ -29,7 +29,7 @@
         scm:git:https://github.com/java-diff-utils/java-diff-utils.git
         scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
         https://github.com/java-diff-utils/java-diff-utils.git
-        java-diff-utils-parent-4.7
+        HEAD
     
     
         GitHub Issues

From b5569703c8daa021cf5bdd705075441984c679c4 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Thu, 23 Apr 2020 23:18:28 +0200
Subject: [PATCH 110/266]

---
 CHANGELOG.md | 4 ++++
 _config.yml  | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)
 delete mode 100644 _config.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8bf3fcba..ed01cf49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ This project uses a custom versioning scheme (and not [Semantic Versioning](http
 
 ## [Unreleased]
 
+## [4.7]
+
+### Changed 
+
 * minor bug fixes
 * optional include equal parts of original and revised data
 * **API** change: removed DiffException completely
diff --git a/_config.yml b/_config.yml
deleted file mode 100644
index 2f7efbea..00000000
--- a/_config.yml
+++ /dev/null
@@ -1 +0,0 @@
-theme: jekyll-theme-minimal
\ No newline at end of file

From 80c17a30d91a4571a5698cd61a2141dcc693d1ee Mon Sep 17 00:00:00 2001
From: Tobias 
Date: Thu, 23 Apr 2020 23:21:18 +0200
Subject: [PATCH 111/266] Update README.md

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 9e5221ef..48991980 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,10 @@ Main reason to build this library was the lack of easy-to-use libraries with all
 
 **This is originally a fork of java-diff-utils from Google Code Archive.**
 
+## API
+
+Javadocs of the actual release version: [![JavaDocs java-diff-utils](https://java-diff-utils.github.io/java-diff-utils/4.7/docs/api/)]
+
 ## Examples
 
 Look [here](https://github.com/wumpz/java-diff-utils/wiki) to find more helpful informations and examples.

From 9bd7aaa0f21a898a6d1c934ce0e493f212fc2bf6 Mon Sep 17 00:00:00 2001
From: Tobias 
Date: Thu, 23 Apr 2020 23:47:42 +0200
Subject: [PATCH 112/266] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 48991980..34c09e6f 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Main reason to build this library was the lack of easy-to-use libraries with all
 
 ## API
 
-Javadocs of the actual release version: [![JavaDocs java-diff-utils](https://java-diff-utils.github.io/java-diff-utils/4.7/docs/api/)]
+Javadocs of the actual release version: [JavaDocs java-diff-utils](https://java-diff-utils.github.io/java-diff-utils/4.7/docs/api/)
 
 ## Examples
 

From a8e4ce2eff297c7700a6215bacb548e30151b948 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 17 May 2020 17:16:14 +0200
Subject: [PATCH 113/266] fixes #65

---
 .../github/difflib/text/DiffRowGenerator.java | 52 ++++++++----
 .../difflib/text/DiffRowGeneratorTest.java    | 81 +++++++++++++++++++
 2 files changed, 119 insertions(+), 14 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
index 350bef5b..387ef8dd 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
@@ -61,6 +61,7 @@ public final class DiffRowGenerator {
         }
         return list;
     };
+
     public static final Pattern SPLIT_BY_WORD_PATTERN = Pattern.compile("\\s+|[,.\\[\\](){}/\\\\*+\\-#]");
 
     /**
@@ -106,7 +107,7 @@ protected final static List splitStringPreserveDelimiter(String str, Pat
      */
     static void wrapInTag(List sequence, int startPosition,
             int endPosition, Tag tag, BiFunction tagGenerator,
-            Function processDiffs) {
+            Function processDiffs, boolean replaceLinefeedWithSpace) {
         int endPos = endPosition;
 
         while (endPos >= startPosition) {
@@ -115,6 +116,9 @@ static void wrapInTag(List sequence, int startPosition,
             while (endPos > startPosition) {
                 if (!"\n".equals(sequence.get(endPos - 1))) {
                     break;
+                } else if (replaceLinefeedWithSpace) {
+                    sequence.set(endPos - 1, " ");
+                    break;
                 }
                 endPos--;
             }
@@ -133,7 +137,11 @@ static void wrapInTag(List sequence, int startPosition,
             //search position for end tag
             while (endPos > startPosition) {
                 if ("\n".equals(sequence.get(endPos - 1))) {
-                    break;
+                    if (replaceLinefeedWithSpace) {
+                        sequence.set(endPos - 1, " ");
+                    } else {
+                        break;
+                    }
                 }
                 if (processDiffs != null) {
                     sequence.set(endPos - 1,
@@ -159,6 +167,7 @@ static void wrapInTag(List sequence, int startPosition,
     private final Function processDiffs;
 
     private final boolean showInlineDiffs;
+    private final boolean replaceOriginalLinefeedInChangesWithSpaces;
 
     private DiffRowGenerator(Builder builder) {
         showInlineDiffs = builder.showInlineDiffs;
@@ -178,6 +187,8 @@ private DiffRowGenerator(Builder builder) {
         reportLinesUnchanged = builder.reportLinesUnchanged;
         lineNormalizer = builder.lineNormalizer;
         processDiffs = builder.processDiffs;
+        
+        replaceOriginalLinefeedInChangesWithSpaces = builder.replaceOriginalLinefeedInChangesWithSpaces;
 
         Objects.requireNonNull(inlineDiffSplitter);
         Objects.requireNonNull(lineNormalizer);
@@ -313,7 +324,7 @@ private List generateInlineDiffs(AbstractDelta delta) {
             if (inlineDelta.getType() == DeltaType.DELETE) {
                 wrapInTag(origList, inlineOrig.getPosition(), inlineOrig
                         .getPosition()
-                        + inlineOrig.size(), Tag.DELETE, oldTag, processDiffs);
+                        + inlineOrig.size(), Tag.DELETE, oldTag, processDiffs, replaceOriginalLinefeedInChangesWithSpaces && mergeOriginalRevised);
             } else if (inlineDelta.getType() == DeltaType.INSERT) {
                 if (mergeOriginalRevised) {
                     origList.addAll(inlineOrig.getPosition(),
@@ -321,11 +332,11 @@ private List generateInlineDiffs(AbstractDelta delta) {
                                     inlineRev.getPosition() + inlineRev.size()));
                     wrapInTag(origList, inlineOrig.getPosition(),
                             inlineOrig.getPosition() + inlineRev.size(),
-                            Tag.INSERT, newTag, processDiffs);
+                            Tag.INSERT, newTag, processDiffs, false);
                 } else {
                     wrapInTag(revList, inlineRev.getPosition(),
                             inlineRev.getPosition() + inlineRev.size(),
-                            Tag.INSERT, newTag, processDiffs);
+                            Tag.INSERT, newTag, processDiffs, false);
                 }
             } else if (inlineDelta.getType() == DeltaType.CHANGE) {
                 if (mergeOriginalRevised) {
@@ -334,15 +345,15 @@ private List generateInlineDiffs(AbstractDelta delta) {
                                     inlineRev.getPosition() + inlineRev.size()));
                     wrapInTag(origList, inlineOrig.getPosition() + inlineOrig.size(),
                             inlineOrig.getPosition() + inlineOrig.size() + inlineRev.size(),
-                            Tag.CHANGE, newTag, processDiffs);
+                            Tag.CHANGE, newTag, processDiffs, false);
                 } else {
                     wrapInTag(revList, inlineRev.getPosition(),
                             inlineRev.getPosition() + inlineRev.size(),
-                            Tag.CHANGE, newTag, processDiffs);
+                            Tag.CHANGE, newTag, processDiffs, false);
                 }
                 wrapInTag(origList, inlineOrig.getPosition(),
                         inlineOrig.getPosition() + inlineOrig.size(),
-                        Tag.CHANGE, oldTag, processDiffs);
+                        Tag.CHANGE, oldTag, processDiffs, replaceOriginalLinefeedInChangesWithSpaces && mergeOriginalRevised);
             }
         }
         StringBuilder origResult = new StringBuilder();
@@ -385,10 +396,10 @@ public static class Builder {
         private boolean showInlineDiffs = false;
         private boolean ignoreWhiteSpaces = false;
 
-        private BiFunction oldTag = 
-                (tag, f) -> f ? "" : "";
-        private BiFunction newTag = 
-                (tag, f) -> f ? "" : "";
+        private BiFunction oldTag
+                = (tag, f) -> f ? "" : "";
+        private BiFunction newTag
+                = (tag, f) -> f ? "" : "";
 
         private int columnWidth = 0;
         private boolean mergeOriginalRevised = false;
@@ -397,6 +408,7 @@ public static class Builder {
         private Function lineNormalizer = LINE_NORMALIZER_FOR_HTML;
         private Function processDiffs = null;
         private BiPredicate equalizer = null;
+        private boolean replaceOriginalLinefeedInChangesWithSpaces = false;
 
         private Builder() {
         }
@@ -445,7 +457,7 @@ public Builder oldTag(BiFunction generator) {
             this.oldTag = generator;
             return this;
         }
-        
+
         /**
          * Generator for Old-Text-Tags.
          *
@@ -467,7 +479,7 @@ public Builder newTag(BiFunction generator) {
             this.newTag = generator;
             return this;
         }
-        
+
         /**
          * Generator for New-Text-Tags.
          *
@@ -575,5 +587,17 @@ public Builder equalizer(BiPredicate equalizer) {
             this.equalizer = equalizer;
             return this;
         }
+        
+        /**
+         * Sometimes it happens that a change contains multiple lines. If there is no correspondence
+         * in old and new. To keep the merged line more readable the linefeeds could be replaced
+         * by spaces.
+         * @param replace
+         * @return 
+         */
+        public Builder replaceOriginalLinefeedInChangesWithSpaces(boolean replace) {
+            this.replaceOriginalLinefeedInChangesWithSpaces = replace;
+            return this;
+        }
     }
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
index a1450f3d..e18dde9f 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
@@ -498,4 +498,85 @@ public void testReplaceDiffsIssue63() {
 
         assertEquals("This~//~**/**is~//~**/**a~//~**/**test~.~", rows.get(0).getOldLine());
     }
+
+    @Test
+    public void testProblemTooManyDiffRowsIssue65() {
+        DiffRowGenerator generator = DiffRowGenerator.create()
+                .showInlineDiffs(true)
+                .reportLinesUnchanged(true)
+                .oldTag(f -> "~")
+                .newTag(f -> "**")
+                .mergeOriginalRevised(true)
+                .inlineDiffByWord(false)
+                .replaceOriginalLinefeedInChangesWithSpaces(true)
+                .build();
+
+        List diffRows = generator.generateDiffRows(
+                Arrays.asList("Ich möchte nicht mit einem Bot sprechen.", "Ich soll das schon wieder wiederholen?"),
+                Arrays.asList("Ich möchte nicht mehr mit dir sprechen. Leite mich weiter.", "Kannst du mich zum Kundendienst weiterleiten?"));
+
+        print(diffRows);
+
+        assertThat(diffRows).hasSize(2);
+    }
+
+    @Test
+    public void testProblemTooManyDiffRowsIssue65_NoMerge() {
+        DiffRowGenerator generator = DiffRowGenerator.create()
+                .showInlineDiffs(true)
+                .reportLinesUnchanged(true)
+                .oldTag(f -> "~")
+                .newTag(f -> "**")
+                .mergeOriginalRevised(false)
+                .inlineDiffByWord(false)
+                .build();
+
+        List diffRows = generator.generateDiffRows(
+                Arrays.asList("Ich möchte nicht mit einem Bot sprechen.", "Ich soll das schon wieder wiederholen?"),
+                Arrays.asList("Ich möchte nicht mehr mit dir sprechen. Leite mich weiter.", "Kannst du mich zum Kundendienst weiterleiten?"));
+
+        System.out.println(diffRows);
+
+        assertThat(diffRows).hasSize(2);
+    }
+
+    @Test
+    public void testProblemTooManyDiffRowsIssue65_DiffByWord() {
+        DiffRowGenerator generator = DiffRowGenerator.create()
+                .showInlineDiffs(true)
+                .reportLinesUnchanged(true)
+                .oldTag(f -> "~")
+                .newTag(f -> "**")
+                .mergeOriginalRevised(true)
+                .inlineDiffByWord(true)
+                .build();
+
+        List diffRows = generator.generateDiffRows(
+                Arrays.asList("Ich möchte nicht mit einem Bot sprechen.", "Ich soll das schon wieder wiederholen?"),
+                Arrays.asList("Ich möchte nicht mehr mit dir sprechen. Leite mich weiter.", "Kannst du mich zum Kundendienst weiterleiten?"));
+
+        System.out.println(diffRows);
+
+        assertThat(diffRows).hasSize(2);
+    }
+
+    @Test
+    public void testProblemTooManyDiffRowsIssue65_NoInlineDiff() {
+        DiffRowGenerator generator = DiffRowGenerator.create()
+                .showInlineDiffs(false)
+                .reportLinesUnchanged(true)
+                .oldTag(f -> "~")
+                .newTag(f -> "**")
+                .mergeOriginalRevised(true)
+                .inlineDiffByWord(false)
+                .build();
+
+        List diffRows = generator.generateDiffRows(
+                Arrays.asList("Ich möchte nicht mit einem Bot sprechen.", "Ich soll das schon wieder wiederholen?"),
+                Arrays.asList("Ich möchte nicht mehr mit dir sprechen. Leite mich weiter.", "Kannst du mich zum Kundendienst weiterleiten?"));
+
+        System.out.println(diffRows);
+
+        assertThat(diffRows).hasSize(2);
+    }
 }

From 7620f919c256531c7df8dcd0c91d333e62beee18 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 24 May 2020 22:56:28 +0200
Subject: [PATCH 114/266] fixes #80

---
 java-diff-utils/pom.xml                           |  9 +++++++++
 .../difflib/unifieddiff/UnifiedDiffReader.java    | 12 ++++++------
 .../unifieddiff/UnifiedDiffReaderTest.java        | 15 +++++++++++++++
 .../difflib/unifieddiff/problem_diff_issue79.diff |  3 +++
 .../src/test/resources/logging.properties         |  8 ++++++++
 5 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue79.diff
 create mode 100644 java-diff-utils/src/test/resources/logging.properties

diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index a96aa7cd..d2937204 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -51,6 +51,15 @@
                     
                 
             
+            
+                org.apache.maven.plugins
+                maven-surefire-plugin
+                
+                    
+                        target/test-classes/logging.properties
+                    
+                
+            
         
     
 
diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
index 75dff38f..6a7f2306 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
@@ -66,11 +66,11 @@ public final class UnifiedDiffReader {
     // [/^-/, del], [/^\+/, add], [/^\\ No newline at end of file$/, eof]];
     private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
         String headerTxt = "";
-        LOG.log(Level.INFO, "header parsing");
+        LOG.log(Level.FINE, "header parsing");
         String line = null;
         while (READER.ready()) {
             line = READER.readLine();
-            LOG.log(Level.INFO, "parsing line {0}", line);
+            LOG.log(Level.FINE, "parsing line {0}", line);
             if (DIFF_COMMAND.validLine(line) || INDEX.validLine(line)
                     || FROM_FILE.validLine(line) || TO_FILE.validLine(line)) {
                 break;
@@ -139,11 +139,11 @@ public static UnifiedDiff parseUnifiedDiff(InputStream stream) throws IOExceptio
     private boolean processLine(String line, UnifiedDiffLine... rules) throws UnifiedDiffParserException {
         for (UnifiedDiffLine rule : rules) {
             if (rule.processLine(line)) {
-                LOG.info("  >>> processed rule " + rule.toString());
+                LOG.fine("  >>> processed rule " + rule.toString());
                 return true;
             }
         }
-        LOG.info("  >>> no rule matched " + line);
+        LOG.warning("  >>> no rule matched " + line);
         return false;
         //throw new UnifiedDiffParserException("parsing error at line " + line);
     }
@@ -161,7 +161,7 @@ private void initFileIfNecessary() {
 
     private void processDiff(MatchResult match, String line) {
         //initFileIfNecessary();
-        LOG.log(Level.INFO, "start {0}", line);
+        LOG.log(Level.FINE, "start {0}", line);
         String[] fromTo = parseFileNames(READER.lastLine());
         actualFile.setFromFile(fromTo[0]);
         actualFile.setToFile(fromTo[1]);
@@ -223,7 +223,7 @@ private static Integer toInteger(MatchResult match, int group, int defValue) thr
 
     private void processIndex(MatchResult match, String line) {
         //initFileIfNecessary();
-        LOG.log(Level.INFO, "index {0}", line);
+        LOG.log(Level.FINE, "index {0}", line);
         actualFile.setIndex(line.substring(6));
     }
 
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
index a7c67533..d91835bd 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -157,4 +157,19 @@ public void testParseIssue51() throws IOException {
 
         assertThat(diff.getTail()).isNull();
     }
+    
+    @Test
+    public void testParseIssue79() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue79.diff"));
+
+        assertThat(diff.getFiles().size()).isEqualTo(1);
+
+        UnifiedDiffFile file1 = diff.getFiles().get(0);
+        assertThat(file1.getFromFile()).isEqualTo("Main.java");
+        assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
+
+        assertThat(diff.getTail()).isNull();
+        assertThat(diff.getHeader()).isNull();
+    }
 }
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue79.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue79.diff
new file mode 100644
index 00000000..4fd34031
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue79.diff
@@ -0,0 +1,3 @@
+diff --git a/test/Issue.java b/test/Issue.java
+new file mode 100644
+index 00000000..9702606e
\ No newline at end of file
diff --git a/java-diff-utils/src/test/resources/logging.properties b/java-diff-utils/src/test/resources/logging.properties
new file mode 100644
index 00000000..4c1655b6
--- /dev/null
+++ b/java-diff-utils/src/test/resources/logging.properties
@@ -0,0 +1,8 @@
+handlers=java.util.logging.ConsoleHandler
+
+.level=INFO
+com.github.difflib.unifieddiff.level=FINE
+
+java.util.logging.ConsoleHandler.level=INFO
+#java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+

From f292c97dae06e15fc124f36a1223068ff2903886 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 21 Jun 2020 01:29:57 +0200
Subject: [PATCH 115/266] fixes #79 open #85

---
 java-diff-utils/pom.xml                       |  1 +
 .../github/difflib/text/DiffRowGenerator.java |  4 +-
 .../difflib/unifieddiff/UnifiedDiffFile.java  |  9 +++++
 .../unifieddiff/UnifiedDiffReader.java        | 39 ++++++++++++-------
 .../difflib/text/DiffRowGeneratorTest.java    | 19 +++++++++
 .../unifieddiff/UnifiedDiffReaderTest.java    | 24 +++++++++++-
 .../unifieddiff/problem_diff_issue85.diff     | 31 +++++++++++++++
 7 files changed, 110 insertions(+), 17 deletions(-)
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue85.diff

diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index d2937204..6fb5d71f 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -55,6 +55,7 @@
                 org.apache.maven.plugins
                 maven-surefire-plugin
                 
+                    false
                     
                         target/test-classes/logging.properties
                     
diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
index 387ef8dd..c315c45c 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
@@ -506,8 +506,8 @@ public Builder processDiffs(Function processDiffs) {
         /**
          * Set the column width of generated lines of original and revised texts.
          *
-         * @param width the width to set. Making it < 0 doesn't have any sense. Default 80. @return
-         * builder with config ured ignoreBlankLines parameter
+         * @param width the width to set. Making it < 0 doesn't make any sense. Default 80. 
+         * @return builder with config of column width
          */
         public Builder columnWidth(int width) {
             if (width >= 0) {
diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java
index c244184f..cd7f57a8 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java
@@ -29,6 +29,7 @@ public final class UnifiedDiffFile {
     private String toFile;
     private String toTimestamp;
     private String index;
+    private String newFileMode;
     private Patch patch = new Patch<>();
 
     public String getDiffCommand() {
@@ -92,4 +93,12 @@ public static UnifiedDiffFile from(String fromFile, String toFile, Patch
         file.patch = patch;
         return file;
     }
+
+    public void setNewFileMode(String newFileMode) {
+        this.newFileMode = newFileMode;
+    }
+    
+    public String getNewFileMode() {
+        return newFileMode;
+    }
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
index 6a7f2306..6730be3a 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
@@ -49,6 +49,8 @@ public final class UnifiedDiffReader {
     private final UnifiedDiffLine FROM_FILE = new UnifiedDiffLine(true, "^---\\s", this::processFromFile);
     private final UnifiedDiffLine TO_FILE = new UnifiedDiffLine(true, "^\\+\\+\\+\\s", this::processToFile);
 
+    private final UnifiedDiffLine NEW_FILE_MODE = new UnifiedDiffLine(true, "^new\\sfile\\smode\\s(\\d+)", this::processNewFileMode);
+
     private final UnifiedDiffLine CHUNK = new UnifiedDiffLine(false, UNIFIED_DIFF_CHUNK_REGEXP, this::processChunk);
     private final UnifiedDiffLine LINE_NORMAL = new UnifiedDiffLine("^\\s", this::processNormalLine);
     private final UnifiedDiffLine LINE_DEL = new UnifiedDiffLine("^-", this::processDelLine);
@@ -72,7 +74,8 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
             line = READER.readLine();
             LOG.log(Level.FINE, "parsing line {0}", line);
             if (DIFF_COMMAND.validLine(line) || INDEX.validLine(line)
-                    || FROM_FILE.validLine(line) || TO_FILE.validLine(line)) {
+                    || FROM_FILE.validLine(line) || TO_FILE.validLine(line)
+                    || NEW_FILE_MODE.validLine(line)) {
                 break;
             } else {
                 headerTxt += line + "\n";
@@ -85,26 +88,28 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
         while (line != null) {
             if (!CHUNK.validLine(line)) {
                 initFileIfNecessary();
-                while (!CHUNK.validLine(line)) {
-                    if (processLine(line, DIFF_COMMAND, INDEX, FROM_FILE, TO_FILE) == false) {
+                while (line != null && !CHUNK.validLine(line)) {
+                    if (processLine(line, DIFF_COMMAND, INDEX, FROM_FILE, TO_FILE, NEW_FILE_MODE) == false) {
                         throw new UnifiedDiffParserException("expected file start line not found");
                     }
                     line = READER.readLine();
                 }
             }
-            processLine(line, CHUNK);
-            while ((line = READER.readLine()) != null) {
-                if (processLine(line, LINE_NORMAL, LINE_ADD, LINE_DEL) == false) {
-                    throw new UnifiedDiffParserException("expected data line not found");
-                }
-                if ((originalTxt.size() == old_size && revisedTxt.size() == new_size) 
-                        || (old_size==0 && new_size==0 && originalTxt.size() == this.old_ln 
+            if (line != null) {
+                processLine(line, CHUNK);
+                while ((line = READER.readLine()) != null) {
+                    if (processLine(line, LINE_NORMAL, LINE_ADD, LINE_DEL) == false) {
+                        throw new UnifiedDiffParserException("expected data line not found");
+                    }
+                    if ((originalTxt.size() == old_size && revisedTxt.size() == new_size)
+                            || (old_size == 0 && new_size == 0 && originalTxt.size() == this.old_ln
                             && revisedTxt.size() == this.new_ln)) {
-                    finalizeChunk();
-                    break;
+                        finalizeChunk();
+                        break;
+                    }
                 }
+                line = READER.readLine();
             }
-            line = READER.readLine();
             if (line == null || line.startsWith("--")) {
                 break;
             }
@@ -137,6 +142,9 @@ public static UnifiedDiff parseUnifiedDiff(InputStream stream) throws IOExceptio
     }
 
     private boolean processLine(String line, UnifiedDiffLine... rules) throws UnifiedDiffParserException {
+        if (line == null) {
+            return false;
+        }
         for (UnifiedDiffLine rule : rules) {
             if (rule.processLine(line)) {
                 LOG.fine("  >>> processed rule " + rule.toString());
@@ -239,6 +247,11 @@ private void processToFile(MatchResult match, String line) {
         actualFile.setToTimestamp(extractTimestamp(line));
     }
 
+    private void processNewFileMode(MatchResult match, String line) {
+        //initFileIfNecessary();
+        actualFile.setNewFileMode(match.group(1));
+    }
+
     private String extractFileName(String _line) {
         Matcher matcher = TIMESTAMP_REGEXP.matcher(_line);
         String line = _line;
diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
index e18dde9f..be408933 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
@@ -579,4 +579,23 @@ public void testProblemTooManyDiffRowsIssue65_NoInlineDiff() {
 
         assertThat(diffRows).hasSize(2);
     }
+
+    @Test
+    public void testLinefeedInStandardTagsWithLineWidthIssue81() {
+        List original = Arrays.asList(("American bobtail jaguar. American bobtail bombay but turkish angora and tomcat.\n"
+                + "Russian blue leopard. Lion. Tabby scottish fold for russian blue, so savannah yet lynx. Tomcat singapura, cheetah.\n"
+                + "Bengal tiger panther but singapura but bombay munchkin for cougar.").split("\n"));
+        List revised = Arrays.asList(("bobtail jaguar. American bobtail turkish angora and tomcat.\n"
+                + "Russian blue leopard. Lion. Tabby scottish folded for russian blue, so savannah yettie? lynx. Tomcat singapura, cheetah.\n"
+                + "Bengal tiger panther but singapura but bombay munchkin for cougar. And more.").split("\n"));
+
+        DiffRowGenerator generator = DiffRowGenerator.create()
+                .showInlineDiffs(true)
+                .ignoreWhiteSpaces(true)
+                .columnWidth(100)
+                .build();
+        List deltas = generator.generateDiffRows(original, revised);
+
+        System.out.println(deltas);
+    }
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
index d91835bd..b663ce17 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -21,6 +21,7 @@
 import java.util.regex.Pattern;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import org.junit.jupiter.api.Test;
 
@@ -166,10 +167,29 @@ public void testParseIssue79() throws IOException {
         assertThat(diff.getFiles().size()).isEqualTo(1);
 
         UnifiedDiffFile file1 = diff.getFiles().get(0);
-        assertThat(file1.getFromFile()).isEqualTo("Main.java");
-        assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
+        assertThat(file1.getFromFile()).isEqualTo("test/Issue.java");
+        assertThat(file1.getPatch().getDeltas().size()).isEqualTo(0);
 
         assertThat(diff.getTail()).isNull();
         assertThat(diff.getHeader()).isNull();
     }
+    
+    @Test
+    public void testParseIssue85() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue85.diff"));
+
+        assertThat(diff.getFiles().size()).isEqualTo(1);
+
+        assertEquals(1, diff.getFiles().size());
+
+        final UnifiedDiffFile file1 = diff.getFiles().get(0);
+        assertEquals("diff -r 83e41b73d115 -r a4438263b228 tests/test-check-pyflakes.t",
+                file1.getDiffCommand());
+        assertEquals("tests/test-check-pyflakes.t", file1.getFromFile());
+        assertEquals("tests/test-check-pyflakes.t", file1.getToFile());
+        assertEquals(1, file1.getPatch().getDeltas().size());
+
+        assertNull(diff.getTail());
+    }
 }
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue85.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue85.diff
new file mode 100644
index 00000000..09d12f3b
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue85.diff
@@ -0,0 +1,31 @@
+# HG changeset patch
+# User Anton Shestakov 
+# Date 1591442367 -28800
+# Node ID a4438263b228dd3e2983d59095c6180b1411f0e8
+# Parent  83e41b73d115e3717943c2e5a83d36d05670384c
+tests: skip pyflakes for mercurial/thirdparty/
+
+The current version of pyflakes (2.2.0) correctly detects one issue:
+
+  mercurial/thirdparty/selectors2.py:335:40 '...'.format(...) has unused arguments at position(s): 1
+
+But we're not interested in fixing lint errors in third-party code, so we need
+to exclude at least selectors2.py. And in the discussion for this patch it was
+decided to just skip the entire thirdparty directory.
+
+Differential Revision: https://phab.mercurial-scm.org/D8619
+
+diff -r 83e41b73d115 -r a4438263b228 tests/test-check-pyflakes.t
+--- a/tests/test-check-pyflakes.t	Tue Jun 09 17:13:26 2020 -0400
++++ b/tests/test-check-pyflakes.t	Sat Jun 06 19:19:27 2020 +0800
+@@ -16,9 +16,7 @@
+   $ testrepohg locate 'set:**.py or grep("^#!.*python")' \
+   > -X hgext/fsmonitor/pywatchman \
+   > -X mercurial/pycompat.py -X contrib/python-zstandard \
+-  > -X mercurial/thirdparty/cbor \
+-  > -X mercurial/thirdparty/concurrent \
+-  > -X mercurial/thirdparty/zope \
++  > -X mercurial/thirdparty \
+   > 2>/dev/null \
+   > | xargs $PYTHON -m pyflakes 2>/dev/null | "$TESTDIR/filterpyflakes.py"
+   contrib/perf.py:*:* undefined name 'xrange' (glob) (?)
\ No newline at end of file

From 8006986dd8547ec1d1ceba4ad4c8a09eff8dcbc8 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 21 Jun 2020 02:04:14 +0200
Subject: [PATCH 116/266] fixes #85

---
 .../com/github/difflib/unifieddiff/UnifiedDiffReader.java    | 5 +++--
 .../github/difflib/unifieddiff/UnifiedDiffReaderTest.java    | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
index 6730be3a..36737674 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
@@ -39,7 +39,7 @@
 public final class UnifiedDiffReader {
 
     static final Pattern UNIFIED_DIFF_CHUNK_REGEXP = Pattern.compile("^@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@");
-    static final Pattern TIMESTAMP_REGEXP = Pattern.compile("(\\d{4}-\\d{2}-\\d{2}[T ]\\d{2}:\\d{2}:\\d{2}\\.\\d{3,})");
+    static final Pattern TIMESTAMP_REGEXP = Pattern.compile("(\\d{4}-\\d{2}-\\d{2}[T ]\\d{2}:\\d{2}:\\d{2}\\.\\d{3,})(?: [+-]\\d+)?");
 
     private final InternalUnifiedDiffReader READER;
     private final UnifiedDiff data = new UnifiedDiff();
@@ -258,8 +258,9 @@ private String extractFileName(String _line) {
         if (matcher.find()) {
             line = line.substring(0, matcher.start());
         }
+        line = line.split("\t")[0];
         return line.substring(4).replaceFirst("^(a|b|old|new)(\\/)?", "")
-                .replace(TIMESTAMP_REGEXP.toString(), "").trim();
+                .trim();
     }
 
     private String extractTimestamp(String line) {
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
index b663ce17..016e574e 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -192,4 +192,9 @@ public void testParseIssue85() throws IOException {
 
         assertNull(diff.getTail());
     }
+    
+    @Test
+    public void testTimeStampRegexp() {
+        assertThat("2019-04-18 13:49:39.516149751 +0200").matches(UnifiedDiffReader.TIMESTAMP_REGEXP);
+    }
 }

From 73c4c307a9cddd0cbf8155daece4aef1f74cca35 Mon Sep 17 00:00:00 2001
From: Tobias 
Date: Sun, 21 Jun 2020 22:38:11 +0200
Subject: [PATCH 117/266] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed01cf49..bc5d4a60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ This project uses a custom versioning scheme (and not [Semantic Versioning](http
 
 ## [Unreleased]
 
+### Changed
+
+* UnifiedDiffReader improved for **new file mode** and better timestamp recognition
+
 ## [4.7]
 
 ### Changed 

From e11c1599ee5449bfef2c92267ea3b85d3cb0989d Mon Sep 17 00:00:00 2001
From: iamhlbx 
Date: Wed, 1 Jul 2020 20:25:54 +0800
Subject: [PATCH 118/266] update .gitignore to ignore *.iml files (#88)

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 54a9c8ca..634cb5b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 build/
 nbproject/
 target/
+
+*.iml

From f0f5d241c71400b60b789a9b696a52243ec0a90a Mon Sep 17 00:00:00 2001
From: iamhlbx 
Date: Fri, 3 Jul 2020 22:58:44 +0800
Subject: [PATCH 119/266] fixes #89 to get exact add/remove lines'positions
 (#90)

---
 .../com/github/difflib/UnifiedDiffUtils.java  | 16 +++++++-
 .../java/com/github/difflib/patch/Chunk.java  | 36 +++++++++++++++-
 .../difflib/GenerateUnifiedDiffTest.java      | 41 +++++++++++++++++++
 .../test/resources/mocks/issue89_patch.txt    | 29 +++++++++++++
 .../test/resources/mocks/issue89_revised.txt  | 30 ++++++++++++++
 5 files changed, 148 insertions(+), 4 deletions(-)
 create mode 100644 java-diff-utils/src/test/resources/mocks/issue89_patch.txt
 create mode 100644 java-diff-utils/src/test/resources/mocks/issue89_revised.txt

diff --git a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
index 9d7908b9..8221bdc6 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
@@ -97,19 +97,31 @@ private static void processLinesInPrevChunk(List rawChunk, Patch oldChunkLines = new ArrayList<>();
             List newChunkLines = new ArrayList<>();
 
+            List removePosition = new ArrayList<>();
+            List addPosition = new ArrayList<>();
+            int removeNum = 0;
+            int addNum = 0;
             for (String[] raw_line : rawChunk) {
                 tag = raw_line[0];
                 rest = raw_line[1];
                 if (" ".equals(tag) || "-".equals(tag)) {
+                    removeNum++;
                     oldChunkLines.add(rest);
+                    if ("-".equals(tag)) {
+                        removePosition.add(old_ln - 1 + removeNum);
+                    }
                 }
                 if (" ".equals(tag) || "+".equals(tag)) {
+                    addNum++;
                     newChunkLines.add(rest);
+                    if ("+".equals(tag)) {
+                        addPosition.add(new_ln - 1 + addNum);
+                    }
                 }
             }
             patch.addDelta(new ChangeDelta<>(new Chunk<>(
-                    old_ln - 1, oldChunkLines), new Chunk<>(
-                    new_ln - 1, newChunkLines)));
+                    old_ln - 1, oldChunkLines, removePosition), new Chunk<>(
+                    new_ln - 1, newChunkLines, addPosition)));
             rawChunk.clear();
         }
     }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
index 70b57223..87af9a28 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
@@ -37,16 +37,19 @@ public final class Chunk {
 
     private final int position;
     private List lines;
+    private final List changePosition;
 
     /**
      * Creates a chunk and saves a copy of affected lines
      *
      * @param position the start position
      * @param lines the affected lines
+     * @param changePosition the positions of changed lines
      */
-    public Chunk(int position, List lines) {
+    public Chunk(int position, List lines, List changePosition) {
         this.position = position;
         this.lines = new ArrayList<>(lines);
+        this.changePosition = changePosition;
     }
 
     /**
@@ -55,9 +58,31 @@ public Chunk(int position, List lines) {
      * @param position the start position
      * @param lines the affected lines
      */
-    public Chunk(int position, T[] lines) {
+    public Chunk(int position, List lines) {
+        this(position, lines, null);
+    }
+
+    /**
+     * Creates a chunk and saves a copy of affected lines
+     *
+     * @param position the start position
+     * @param lines the affected lines
+     * @param changePosition the positions of changed lines
+     */
+    public Chunk(int position, T[] lines, List changePosition) {
         this.position = position;
         this.lines = Arrays.asList(lines);
+        this.changePosition = changePosition;
+    }
+
+    /**
+     * Creates a chunk and saves a copy of affected lines
+     *
+     * @param position the start position
+     * @param lines the affected lines
+     */
+    public Chunk(int position, T[] lines) {
+        this(position, lines, null);
     }
 
     /**
@@ -96,6 +121,13 @@ public List getLines() {
         return lines;
     }
 
+    /**
+     * @return the positions of changed lines of chunk in the text
+     */
+    public List getChangePosition() {
+        return changePosition;
+    }
+
     public int size() {
         return lines.size();
     }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
index 8c023c96..6bff200b 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
@@ -1,5 +1,6 @@
 package com.github.difflib;
 
+import com.github.difflib.patch.Chunk;
 import com.github.difflib.patch.Patch;
 import com.github.difflib.patch.PatchFailedException;
 import java.io.BufferedReader;
@@ -8,9 +9,11 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import static java.util.stream.Collectors.joining;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 import org.junit.jupiter.api.Test;
 
@@ -126,6 +129,44 @@ public void testNewFileCreation() {
         UnifiedDiffUtils.parseUnifiedDiff(udiff);
     }
 
+    /**
+     * Issue 89
+     */
+    @Test
+    public void testChagngePosition() throws IOException {
+        final List patchLines = fileToLines(TestConstants.MOCK_FOLDER + "issue89_patch.txt");
+        final Patch patch = UnifiedDiffUtils.parseUnifiedDiff(patchLines);
+        List realRemoveListOne = Collections.singletonList(3);
+        List realAddListOne = Arrays.asList(3, 7, 8, 9, 10, 11, 12, 13, 14);
+        validateChangePosition(patch, 0, realRemoveListOne, realAddListOne);
+        List realRemoveListTwo = new ArrayList<>();
+        List realAddListTwo = Arrays.asList(27, 28);
+        validateChangePosition(patch, 1, realRemoveListTwo, realAddListTwo);
+
+    }
+
+    private void validateChangePosition(Patch patch, int index, List realRemoveList,
+                                        List realAddList ) {
+        final Chunk originChunk = patch.getDeltas().get(index).getSource();
+        List removeList = originChunk.getChangePosition();
+        assertEquals(realRemoveList.size(), removeList.size());
+        for (Integer ele: realRemoveList) {
+            assertTrue(realRemoveList.contains(ele));
+        }
+        for (Integer ele: removeList) {
+            assertTrue(realAddList.contains(ele));
+        }
+        final Chunk targetChunk = patch.getDeltas().get(index).getTarget();
+        List addList = targetChunk.getChangePosition();
+        assertEquals(realAddList.size(), addList.size());
+        for (Integer ele: realAddList) {
+            assertTrue(addList.contains(ele));
+        }
+        for (Integer ele: addList) {
+            assertTrue(realAddList.contains(ele));
+        }
+    }
+
     private void verify(List origLines, List revLines,
             String originalFile, String revisedFile) {
         Patch patch = DiffUtils.diff(origLines, revLines);
diff --git a/java-diff-utils/src/test/resources/mocks/issue89_patch.txt b/java-diff-utils/src/test/resources/mocks/issue89_patch.txt
new file mode 100644
index 00000000..7d410eda
--- /dev/null
+++ b/java-diff-utils/src/test/resources/mocks/issue89_patch.txt
@@ -0,0 +1,29 @@
+--- Origin.java	2020-06-11 11:06:21.000000000 +0800
++++ Update.java	2020-06-11 10:59:48.000000000 +0800
+@@ -1,9 +1,17 @@
+ package checkstyle_demo.PatchSuppression.MultiChangeInOneFile;
+ 
+-public class Origin {
++public class Update {
+     public void test1() {
+ 
+     }
++
++    public void test2() {
++
++    }
++
++    public void test3() {
++
++    }
+ }
+ 
+ class BasicTest {
+@@ -16,5 +24,7 @@
+ class Test2 {
+     public void test1() {
+         System.out.println();
++        System.out.println();
++        System.out.println();
+     }
+ }
diff --git a/java-diff-utils/src/test/resources/mocks/issue89_revised.txt b/java-diff-utils/src/test/resources/mocks/issue89_revised.txt
new file mode 100644
index 00000000..559e6a4c
--- /dev/null
+++ b/java-diff-utils/src/test/resources/mocks/issue89_revised.txt
@@ -0,0 +1,30 @@
+package checkstyle_demo.PatchSuppression.MultiChangeInOneFile;
+
+public class issue89_revised {
+    public void test1() {
+
+    }
+
+    public void test2() {
+
+    }
+
+    public void test3() {
+
+    }
+}
+
+class Test {
+    private int i;
+    void foo() {
+        i++;
+    }
+}
+
+class Test2 {
+    public void test1() {
+        System.out.println();
+        System.out.println();
+        System.out.println();
+    }
+}

From dcc29eee7eeca20077ec63e86d69397474144b12 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Fri, 3 Jul 2020 22:59:04 +0200
Subject: [PATCH 120/266] fixes #84  Seems to be solved by a previous issue. A
 test case was included from issue 84.

---
 .../unifieddiff/UnifiedDiffReader.java        |   5 +-
 .../unifieddiff/UnifiedDiffReaderTest.java    |  31 ++++-
 .../unifieddiff/problem_diff_issue84.diff     | 109 ++++++++++++++++++
 3 files changed, 138 insertions(+), 7 deletions(-)
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue84.diff

diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
index 36737674..04c2f539 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
@@ -118,7 +118,10 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
         if (READER.ready()) {
             String tailTxt = "";
             while (READER.ready()) {
-                tailTxt += READER.readLine() + "\n";
+                if (tailTxt.length() > 0) {
+                    tailTxt += "\n";
+                }
+                tailTxt += READER.readLine();
             }
             data.setTailTxt(tailTxt);
         }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
index 016e574e..1d1148d7 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -43,7 +43,7 @@ public void testSimpleParse() throws IOException {
         assertThat(file1.getFromFile()).isEqualTo("src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt");
         assertThat(file1.getPatch().getDeltas().size()).isEqualTo(3);
 
-        assertThat(diff.getTail()).isEqualTo("2.17.1.windows.2\n\n");
+        assertThat(diff.getTail()).isEqualTo("2.17.1.windows.2\n");
     }
 
     @Test
@@ -101,7 +101,7 @@ public void testSimpleParse2() throws IOException {
         assertThat(first.getSource().size()).isGreaterThan(0);
         assertThat(first.getTarget().size()).isGreaterThan(0);
 
-        assertThat(diff.getTail()).isEqualTo("2.17.1.windows.2\n\n");
+        assertThat(diff.getTail()).isEqualTo("2.17.1.windows.2\n");
     }
 
     @Test
@@ -142,7 +142,7 @@ public void testParseIssue33() throws IOException {
         assertThat(diff.getTail()).isNull();
         assertThat(diff.getHeader()).isNull();
     }
-    
+
     @Test
     public void testParseIssue51() throws IOException {
         UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
@@ -158,7 +158,7 @@ public void testParseIssue51() throws IOException {
 
         assertThat(diff.getTail()).isNull();
     }
-    
+
     @Test
     public void testParseIssue79() throws IOException {
         UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
@@ -173,7 +173,26 @@ public void testParseIssue79() throws IOException {
         assertThat(diff.getTail()).isNull();
         assertThat(diff.getHeader()).isNull();
     }
-    
+
+    @Test
+    public void testParseIssue84() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue84.diff"));
+
+        assertThat(diff.getFiles().size()).isEqualTo(2);
+
+        UnifiedDiffFile file1 = diff.getFiles().get(0);
+        assertThat(file1.getFromFile()).isEqualTo("config/ant-phase-verify.xml");
+        assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
+
+        UnifiedDiffFile file2 = diff.getFiles().get(1);
+        assertThat(file2.getFromFile()).isEqualTo("/dev/null");
+        assertThat(file2.getPatch().getDeltas().size()).isEqualTo(1);
+
+        assertThat(diff.getTail()).isEqualTo("2.7.4");
+        assertThat(diff.getHeader()).startsWith("From b53e612a2ab5ff15d14860e252f84c0f343fe93a Mon Sep 17 00:00:00 2001");
+    }
+
     @Test
     public void testParseIssue85() throws IOException {
         UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
@@ -192,7 +211,7 @@ public void testParseIssue85() throws IOException {
 
         assertNull(diff.getTail());
     }
-    
+
     @Test
     public void testTimeStampRegexp() {
         assertThat("2019-04-18 13:49:39.516149751 +0200").matches(UnifiedDiffReader.TIMESTAMP_REGEXP);
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue84.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue84.diff
new file mode 100644
index 00000000..e558fc0d
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue84.diff
@@ -0,0 +1,109 @@
+From b53e612a2ab5ff15d14860e252f84c0f343fe93a Mon Sep 17 00:00:00 2001
+From: nmancus1 
+          
+          
++         
++         
+          
+          
+         
+diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14InstanceofWithPatternMatching.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14InstanceofWithPatternMatching.java
+new file mode 100644
+index 0000000..8fa3eba
+--- /dev/null
++++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14InstanceofWithPatternMatching.java
+@@ -0,0 +1,76 @@
++//non-compiled with javac: Compilable with Java14
++package com.puppycrawl.tools.checkstyle.grammar.java14;
++
++import java.util.Arrays;
++import java.util.Locale;
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++ ...... I removed it
++        }
++    }
++}
+--
+2.7.4
\ No newline at end of file

From dbe601c2fcb766dda91b33d1a4db15dc8a056959 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Fri, 3 Jul 2020 23:44:48 +0200
Subject: [PATCH 121/266] fixes #83

---
 .../com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java | 4 ++++
 .../com/github/difflib/unifieddiff/problem_diff_issue51.diff  | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
index 1d1148d7..a8556113 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -155,6 +155,10 @@ public void testParseIssue51() throws IOException {
         UnifiedDiffFile file1 = diff.getFiles().get(0);
         assertThat(file1.getFromFile()).isEqualTo("f1");
         assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
+        
+        UnifiedDiffFile file2 = diff.getFiles().get(1);
+        assertThat(file2.getFromFile()).isEqualTo("f2");
+        assertThat(file2.getPatch().getDeltas().size()).isEqualTo(1);
 
         assertThat(diff.getTail()).isNull();
     }
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue51.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue51.diff
index 0c8b483f..a9c4dae5 100644
--- a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue51.diff
+++ b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue51.diff
@@ -8,4 +8,5 @@ diff -U0 old/f2 new/f2
 --- old/f2	2019-09-25 14:38:14.000000000 +0200
 +++ new/f2	2019-09-25 14:38:32.000000000 +0200
 @@ -1 +1 @@
--a\nc
\ No newline at end of file
+-a\nc
++a\nb\nd

From 85c31995703e1f855532ce7d8394784639e65352 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Tue, 4 Aug 2020 07:27:41 +0200
Subject: [PATCH 122/266] changes jgit version

---
 java-diff-utils-jgit/pom.xml                  |  2 +-
 .../algorithm/jgit/HistogramDiffTest.java     |  2 +-
 .../difflib/text/DiffRowGeneratorTest.java    | 23 +++++++++++++++++++
 .../github/difflib/text/issue_86_original.txt |  7 ++++++
 .../github/difflib/text/issue_86_revised.txt  |  8 +++++++
 5 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/text/issue_86_original.txt
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/text/issue_86_revised.txt

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index 6f7dc799..7497c326 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -20,7 +20,7 @@
         
             org.eclipse.jgit
             org.eclipse.jgit
-            4.4.1.201607150455-r
+            5.8.1.202007141445-r
             
                 
                     com.googlecode.javaewah
diff --git a/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java b/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java
index d4487c23..4a06ef9f 100644
--- a/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java
+++ b/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java
@@ -82,6 +82,6 @@ public void diffEnd() {
         assertEquals(revList, patched);
         
         System.out.println(logdata);
-        assertEquals(17, logdata.size());
+        assertEquals(19, logdata.size());
     }
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
index be408933..63c8e454 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
@@ -3,10 +3,12 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.regex.Pattern;
+import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -598,4 +600,25 @@ public void testLinefeedInStandardTagsWithLineWidthIssue81() {
 
         System.out.println(deltas);
     }
+    
+    @Test
+    public void testIssue86WrongInlineDiff() throws IOException {      
+        String original = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue_86_original.txt")).collect(joining("\n"));
+        String revised = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue_86_revised.txt")).collect(joining("\n"));
+        
+        DiffRowGenerator generator = DiffRowGenerator.create()
+            .showInlineDiffs(true)
+            .mergeOriginalRevised(false)
+            .inlineDiffByWord(true)
+            .oldTag( f -> "~" )
+            .newTag( f -> "**" )
+            .build();
+        List rows = generator.generateDiffRows(
+                Arrays.asList(original.split("\n")),
+                Arrays.asList(revised.split("\n")));
+        
+        for (DiffRow diff : rows) {
+            System.out.println(diff);
+        }
+    }
 }
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/text/issue_86_original.txt b/java-diff-utils/src/test/resources/com/github/difflib/text/issue_86_original.txt
new file mode 100644
index 00000000..02c2492e
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/text/issue_86_original.txt
@@ -0,0 +1,7 @@
+MessageTime,MessageType,Instrument,InstrumentState,TradePrice,TradeVolume,TradeCond,TradeId,AskPrice1,AskVol1,BidPrice1,BidVol1,AskPrice2,AskVol2,BidPrice2,BidVol2,AskPrice3,AskVol3,BidPrice3,BidVol3,AskPrice4,AskVol4,BidPrice4,BidVol4,AskPrice5,AskVol5,BidPrice5,BidVol5
+2020-04-04T08:00:00.000Z,S,HHD_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,
+2020-04-04T08:00:00.000Z,S,FHK_C23.5_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,
+2020-04-04T13:49:11.522Z,Q,HHD_MAY20,,,,,,2.6,10,2.6,10,,,,,,,,,,,,,,,,
+2020-04-04T13:49:18.210Z,T,HHD_MAY20,,2.6,1,Screen,0,,,,,,,,,,,,,,,,,,,,
+2020-04-04T17:00:00.000Z,S,HHD_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,,
+2020-04-04T17:00:00.000Z,S,FHK_C23.5_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,,
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/text/issue_86_revised.txt b/java-diff-utils/src/test/resources/com/github/difflib/text/issue_86_revised.txt
new file mode 100644
index 00000000..e081675f
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/text/issue_86_revised.txt
@@ -0,0 +1,8 @@
+MessageTime,MessageType,Instrument,InstrumentState,TradePrice,TradeVolume,TradeCond,TradeId,AskPrice1,AskVol1,BidPrice1,BidVol1,AskPrice2,AskVol2,BidPrice2,BidVol2,AskPrice3,AskVol3,BidPrice3,BidVol3,AskPrice4,AskVol4,BidPrice4,BidVol4,AskPrice5,AskVol5,BidPrice5,BidVol5
+2020-04-02T08:00:00.000Z,S,HHD_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,
+2020-04-02T08:00:00.000Z,S,FHK_C23.5_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,
+2020-04-04T13:49:11.522Z,Q,HHD_MAY20,,,,,,2.6,10,2.6,10,,,,,,,,,,,,,,,,
+2020-04xs-04T17dw:00:00.000Z,Sdwdw,HHD_MAY20dwdw,Closdwde,,,,,,,,,,,,,,,,,,,,,,,,
+2020-04-04T13:49:18.210Z,T,HHD_MAY20,,2.6,2,Screen,0,,,,,,,,,,,,,,,,,,,,
+2020-04-04T17:00:00.000Z,S,HHD_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,,
+2020-04-04T17:00:00.000Z,S,FHK_C23.5_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,,
\ No newline at end of file

From d3524314eb9ca25e70b8ca1027f53367ab3892bb Mon Sep 17 00:00:00 2001
From: Morten Telling 
Date: Tue, 4 Aug 2020 07:29:55 +0200
Subject: [PATCH 123/266] Mark no file with /dev/null to align with git diff
 (#93)

If you run git diff locally with a staged new file the diff will indicate that the file did not exist before with `--- /dev/null`.
I believe this should align with this?
---
 .../src/main/java/com/github/difflib/UnifiedDiffUtils.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
index 8221bdc6..2098aacf 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
@@ -33,6 +33,7 @@ public final class UnifiedDiffUtils {
 
     private static final Pattern UNIFIED_DIFF_CHUNK_REGEXP = Pattern
             .compile("^@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@$");
+    private static final String NULL_FILE_INDICATOR = "/dev/null";
 
     /**
      * Parse the given text in unified format and creates the list of deltas for it.
@@ -143,8 +144,8 @@ public static List generateUnifiedDiff(String originalFileName,
             int contextSize) {
         if (!patch.getDeltas().isEmpty()) {
             List ret = new ArrayList<>();
-            ret.add("--- " + Optional.ofNullable(originalFileName).orElse(""));
-            ret.add("+++ " + Optional.ofNullable(revisedFileName).orElse(""));
+            ret.add("--- " + Optional.ofNullable(originalFileName).orElse(NULL_FILE_INDICATOR));
+            ret.add("+++ " + Optional.ofNullable(revisedFileName).orElse(NULL_FILE_INDICATOR));
 
             List> patchDeltas = new ArrayList<>(
                     patch.getDeltas());

From 96f7fbdebda3c1227ab1f0135d24ce3a372efca8 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Tue, 4 Aug 2020 07:35:09 +0200
Subject: [PATCH 124/266] finishes pull request #93

---
 .../test/java/com/github/difflib/GenerateUnifiedDiffTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
index 6bff200b..8febc309 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
@@ -122,7 +122,7 @@ public void testNewFileCreation() {
         List udiff = UnifiedDiffUtils.generateUnifiedDiff(null, "revised",
                 original, patch, 10);
         
-        assertEquals("--- ", udiff.get(0));
+        assertEquals("--- /dev/null", udiff.get(0));
         assertEquals("+++ revised", udiff.get(1));
         assertEquals("@@ -0,0 +1,2 @@", udiff.get(2));
         

From e38cd3a99fab36bf5720cd65c408cc76733b4916 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 9 Aug 2020 21:38:16 +0200
Subject: [PATCH 125/266]

---
 .../com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java
index a89d0275..5527fe17 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java
@@ -72,7 +72,7 @@ public void testWriteWithNewFile() throws URISyntaxException, IOException {
         
         String[] lines = writer.toString().split("\\n");
         
-        assertEquals("--- null", lines[0]);
+        assertEquals("--- /dev/null", lines[0]);
         assertEquals("+++ revised", lines[1]);
         assertEquals("@@ -0,0 +1,2 @@", lines[2]);
     }

From de04bd688a0ee067fbe9bbc6344b1ceedfd6e220 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 9 Aug 2020 21:44:28 +0200
Subject: [PATCH 126/266]

---
 .../com/github/difflib/unifieddiff/UnifiedDiffWriter.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java
index 54259f77..320e6858 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java
@@ -59,7 +59,7 @@ public static void write(UnifiedDiff diff, Function> origin
                     writer.accept("index " + file.getIndex());
                 }
 
-                writer.accept("--- " + file.getFromFile());
+                writer.accept("--- " + (file.getFromFile() == null ? "/dev/null" : file.getFromFile()));
 
                 if (file.getToFile() != null) {
                     writer.accept("+++ " + file.getToFile());
@@ -96,7 +96,7 @@ public static void write(UnifiedDiff diff, Function> origin
 
                 }
                 // don't forget to process the last set of Deltas
-                processDeltas(writer, originalLines, deltas, contextSize, 
+                processDeltas(writer, originalLines, deltas, contextSize,
                         patchDeltas.size() == 1 && file.getFromFile() == null);
             }
 
@@ -156,7 +156,7 @@ private static void processDeltas(Consumer writer,
             AbstractDelta nextDelta = deltas.get(deltaIndex);
             int intermediateStart = curDelta.getSource().getPosition()
                     + curDelta.getSource().getLines().size();
-            for (line = intermediateStart; line < nextDelta.getSource().getPosition() 
+            for (line = intermediateStart; line < nextDelta.getSource().getPosition()
                     && line < origLines.size(); line++) {
                 // output the code between the last Delta and this one
                 buffer.add(" " + origLines.get(line));

From f76abb58f6e022dc58ddb1805f1ce980996917d3 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 27 Sep 2020 18:13:03 +0200
Subject: [PATCH 127/266] improved the documentation of DeltyType a bit fixed
 #99

---
 .../java/com/github/difflib/patch/DeltaType.java    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/DeltaType.java b/java-diff-utils/src/main/java/com/github/difflib/patch/DeltaType.java
index 3c121964..666e803a 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/DeltaType.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/DeltaType.java
@@ -16,7 +16,18 @@
 package com.github.difflib.patch;
 
 /**
- * Specifies the type of the delta.
+ * Specifies the type of the delta. There are three types of modifications from  
+ * the original to get the revised text. 
+ * 
+ * CHANGE: a block of data of the original is replaced by another block of data.
+ * DELETE: a block of data of the original is removed
+ * INSERT: at a position of the original a block of data is inserted
+ * 
+ * to be complete there is also 
+ * 
+ * EQUAL: a block of data of original and the revised text is equal
+ * 
+ * which is no change at all.
  *
  */
 public enum DeltaType {

From dac751bf73b76aa9879be6cb56772a5ca164ea9e Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 27 Sep 2020 21:48:59 +0200
Subject: [PATCH 128/266] fixes #98 - deleted file mode

---
 .../difflib/unifieddiff/UnifiedDiffFile.java  |  9 +++
 .../unifieddiff/UnifiedDiffReader.java        |  9 ++-
 .../unifieddiff/UnifiedDiffReaderTest.java    | 16 ++++++
 .../unifieddiff/problem_diff_issue98.diff     | 55 +++++++++++++++++++
 4 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue98.diff

diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java
index cd7f57a8..bc1ef2f8 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java
@@ -30,6 +30,7 @@ public final class UnifiedDiffFile {
     private String toTimestamp;
     private String index;
     private String newFileMode;
+    private String deletedFileMode;
     private Patch patch = new Patch<>();
 
     public String getDiffCommand() {
@@ -101,4 +102,12 @@ public void setNewFileMode(String newFileMode) {
     public String getNewFileMode() {
         return newFileMode;
     }
+
+    public String getDeletedFileMode() {
+        return deletedFileMode;
+    }
+
+    public void setDeletedFileMode(String deletedFileMode) {
+        this.deletedFileMode = deletedFileMode;
+    }
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
index 04c2f539..e9596932 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
@@ -50,6 +50,8 @@ public final class UnifiedDiffReader {
     private final UnifiedDiffLine TO_FILE = new UnifiedDiffLine(true, "^\\+\\+\\+\\s", this::processToFile);
 
     private final UnifiedDiffLine NEW_FILE_MODE = new UnifiedDiffLine(true, "^new\\sfile\\smode\\s(\\d+)", this::processNewFileMode);
+    
+    private final UnifiedDiffLine DELETED_FILE_MODE = new UnifiedDiffLine(true, "^deleted\\sfile\\smode\\s(\\d+)", this::processDeletedFileMode);
 
     private final UnifiedDiffLine CHUNK = new UnifiedDiffLine(false, UNIFIED_DIFF_CHUNK_REGEXP, this::processChunk);
     private final UnifiedDiffLine LINE_NORMAL = new UnifiedDiffLine("^\\s", this::processNormalLine);
@@ -89,7 +91,7 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
             if (!CHUNK.validLine(line)) {
                 initFileIfNecessary();
                 while (line != null && !CHUNK.validLine(line)) {
-                    if (processLine(line, DIFF_COMMAND, INDEX, FROM_FILE, TO_FILE, NEW_FILE_MODE) == false) {
+                    if (processLine(line, DIFF_COMMAND, INDEX, FROM_FILE, TO_FILE, NEW_FILE_MODE, DELETED_FILE_MODE) == false) {
                         throw new UnifiedDiffParserException("expected file start line not found");
                     }
                     line = READER.readLine();
@@ -254,6 +256,11 @@ private void processNewFileMode(MatchResult match, String line) {
         //initFileIfNecessary();
         actualFile.setNewFileMode(match.group(1));
     }
+    
+    private void processDeletedFileMode(MatchResult match, String line) {
+        //initFileIfNecessary();
+        actualFile.setDeletedFileMode(match.group(1));
+    }
 
     private String extractFileName(String _line) {
         Matcher matcher = TIMESTAMP_REGEXP.matcher(_line);
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
index a8556113..ed792c88 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -220,4 +220,20 @@ public void testParseIssue85() throws IOException {
     public void testTimeStampRegexp() {
         assertThat("2019-04-18 13:49:39.516149751 +0200").matches(UnifiedDiffReader.TIMESTAMP_REGEXP);
     }
+    
+    @Test
+    public void testParseIssue98() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue98.diff"));
+
+        assertThat(diff.getFiles().size()).isEqualTo(1);
+
+        assertEquals(1, diff.getFiles().size());
+
+        final UnifiedDiffFile file1 = diff.getFiles().get(0);
+        assertEquals("100644",
+                file1.getDeletedFileMode());
+        assertEquals("src/test/java/se/bjurr/violations/lib/model/ViolationTest.java", file1.getFromFile());
+        assertThat(diff.getTail()).isEqualTo("2.25.1");
+    }
 }
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue98.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue98.diff
new file mode 100644
index 00000000..e5f7f8da
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue98.diff
@@ -0,0 +1,55 @@
+From fd940c6f66126734e82c00889e7c987e11deea91 Mon Sep 17 00:00:00 2001
+From: Tomas Bjerre 
+Date: Sun, 6 Sep 2020 11:20:34 +0200
+Subject: [PATCH] removing file
+
+---
+ .../violations/lib/model/ViolationTest.java   | 37 -------------------
+ 1 file changed, 37 deletions(-)
+ delete mode 100644 src/test/java/se/bjurr/violations/lib/model/ViolationTest.java
+
+diff --git a/src/test/java/se/bjurr/violations/lib/model/ViolationTest.java b/src/test/java/se/bjurr/violations/lib/model/ViolationTest.java
+deleted file mode 100644
+index 3e40b52..0000000
+--- a/src/test/java/se/bjurr/violations/lib/model/ViolationTest.java
++++ /dev/null
+@@ -1,37 +0,0 @@
+-package se.bjurr.violations.lib.model;
+-
+-import static org.assertj.core.api.Assertions.assertThat;
+-import static se.bjurr.violations.lib.model.SEVERITY.ERROR;
+-import static se.bjurr.violations.lib.model.Violation.violationBuilder;
+-import static se.bjurr.violations.lib.reports.Parser.CHECKSTYLE;
+-
+-import org.junit.Test;
+-import se.bjurr.violations.lib.model.Violation.ViolationBuilder;
+-import uk.co.jemos.podam.api.PodamFactoryImpl;
+-
+-public class ViolationTest {
+-
+-  @Test
+-  public void testThatFilePathsAreAlwaysFronSlashes() {
+-    final Violation violation =
+-        violationBuilder() //
+-            .setParser(CHECKSTYLE) //
+-            .setFile("c:\\path\\to\\file.xml") //
+-            .setMessage("message") //
+-            .setSeverity(ERROR) //
+-            .setStartLine(1) //
+-            .build();
+-    assertThat(violation.getFile()) //
+-        .isEqualTo("c:/path/to/file.xml");
+-  }
+-
+-  @Test
+-  public void testThatCopyConstructorWorks() {
+-    final ViolationBuilder originalBuilder =
+-        new PodamFactoryImpl().manufacturePojo(ViolationBuilder.class);
+-    final Violation original = originalBuilder.build();
+-    final Violation copied = new Violation(original);
+-    assertThat(copied) //
+-        .isEqualTo(original);
+-  }
+-}
+-- 
+2.25.1

From 694e93143d38ebff1bfc3a448d8fc603a8968360 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 27 Sep 2020 22:03:18 +0200
Subject: [PATCH 129/266]

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc5d4a60..2c0444b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,10 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 This project uses a custom versioning scheme (and not [Semantic Versioning](https://semver.org/spec/v2.0.0.html)).
 
-## [Unreleased]
+## [4.8]
 
 ### Changed
 
+* some bugfixes regarding unified diff writer
+* UnifiedDiffReader improved for **deleted file mode** and better timestamp recognition
 * UnifiedDiffReader improved for **new file mode** and better timestamp recognition
 
 ## [4.7]

From 7d88486bdc74b579da3e9daed9670309accf9f95 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 27 Sep 2020 22:04:44 +0200
Subject: [PATCH 130/266]

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c0444b1..48b36225 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 This project uses a custom versioning scheme (and not [Semantic Versioning](https://semver.org/spec/v2.0.0.html)).
 
+## [unreleased]
+
+### Changed
+
 ## [4.8]
 
 ### Changed

From 76ae5f3b6fe591288141c4e95c58262e1facfc83 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 27 Sep 2020 22:07:59 +0200
Subject: [PATCH 131/266] [maven-release-plugin] prepare release
 java-diff-utils-parent-4.8

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index 7497c326..4f312c11 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.8-SNAPSHOT
+        4.8
     
     java-diff-utils-jgit
     java-diff-utils-jgit
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index 6fb5d71f..43437653 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -7,7 +7,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.8-SNAPSHOT
+        4.8
     
     
         UTF-8
diff --git a/pom.xml b/pom.xml
index 07ea0726..14aa2c9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.8-SNAPSHOT
+    4.8
     java-diff-utils-parent
     pom
     
@@ -29,7 +29,7 @@
         scm:git:https://github.com/java-diff-utils/java-diff-utils.git
         scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
         https://github.com/java-diff-utils/java-diff-utils.git
-        HEAD
+        java-diff-utils-parent-4.8
     
     
         GitHub Issues

From 21f9e9d415bfa2e45161ff251fdb338e707dddd2 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 27 Sep 2020 22:08:04 +0200
Subject: [PATCH 132/266] [maven-release-plugin] prepare for next development
 iteration

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index 4f312c11..514c887b 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.8
+        4.9-SNAPSHOT
     
     java-diff-utils-jgit
     java-diff-utils-jgit
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index 43437653..76c62bd5 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -7,7 +7,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.8
+        4.9-SNAPSHOT
     
     
         UTF-8
diff --git a/pom.xml b/pom.xml
index 14aa2c9d..dc46e5d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.8
+    4.9-SNAPSHOT
     java-diff-utils-parent
     pom
     
@@ -29,7 +29,7 @@
         scm:git:https://github.com/java-diff-utils/java-diff-utils.git
         scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
         https://github.com/java-diff-utils/java-diff-utils.git
-        java-diff-utils-parent-4.8
+        HEAD
     
     
         GitHub Issues

From 4ee56d2554a91510aa31f99e93e8283bdffd6392 Mon Sep 17 00:00:00 2001
From: Alon Harel <4370226+alonhar@users.noreply.github.com>
Date: Mon, 26 Oct 2020 14:34:23 +0200
Subject: [PATCH 133/266] make patch serializable (#101)

---
 .../github/difflib/patch/AbstractDelta.java   |  3 +-
 .../java/com/github/difflib/patch/Chunk.java  |  3 +-
 .../java/com/github/difflib/patch/Patch.java  |  4 +-
 .../com/github/difflib/patch/PatchTest.java   | 37 +++++++++++++++++--
 4 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
index e98874e8..fe599dc8 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
@@ -15,6 +15,7 @@
  */
 package com.github.difflib.patch;
 
+import java.io.Serializable;
 import java.util.List;
 import java.util.Objects;
 
@@ -22,7 +23,7 @@
  * Abstract delta between a source and a target. 
  * @author Tobias Warneke (t.warneke@gmx.net)
  */
-public abstract class AbstractDelta {
+public abstract class AbstractDelta implements Serializable {
     private final Chunk source;
     private final Chunk target;
     private final DeltaType type;
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
index 87af9a28..f45bbb4f 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
@@ -15,6 +15,7 @@
  */
 package com.github.difflib.patch;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -33,7 +34,7 @@
  * @author Dmitry Naumenko
  * @param  The type of the compared elements in the 'lines'.
  */
-public final class Patch {
+public final class Patch implements Serializable {
 
     private final List> deltas;
 
diff --git a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java
index e2d1abac..84208da9 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java
@@ -1,12 +1,20 @@
 package com.github.difflib.patch;
 
-import com.github.difflib.DiffUtils;
-import java.util.Arrays;
-import java.util.List;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Arrays;
+import java.util.List;
+
 import org.junit.jupiter.api.Test;
 
+import com.github.difflib.DiffUtils;
+
 public class PatchTest {
 
     @Test
@@ -47,4 +55,27 @@ public void testPatch_Change() {
             fail(e.getMessage());
         }
     }
+
+    @Test
+    public void testPatch_Serializable() throws IOException, ClassNotFoundException {
+        final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
+        final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
+
+        final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to);
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        ObjectOutputStream out = new ObjectOutputStream(baos);
+        out.writeObject(patch);
+        out.close();
+        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+        ObjectInputStream in = new ObjectInputStream(bais);
+        Patch result = (Patch) in.readObject();
+        in.close();
+
+        try {
+            assertEquals(changeTest_to, DiffUtils.patch(changeTest_from, result));
+        } catch (PatchFailedException e) {
+            fail(e.getMessage());
+        }
+
+    }
 }

From fcf83e918f0f6935ad705eb0de1d35a415184faf Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 1 Nov 2020 20:03:18 +0100
Subject: [PATCH 134/266]

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48b36225..5530ff3a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ This project uses a custom versioning scheme (and not [Semantic Versioning](http
 
 ### Changed
 
+* make patch serializable
+
 ## [4.8]
 
 ### Changed

From 1ec708fe301b585b858af92a1c590142616709a5 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 1 Nov 2020 21:32:21 +0100
Subject: [PATCH 135/266] [maven-release-plugin] prepare release
 java-diff-utils-parent-4.9

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index 514c887b..309dc0da 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.9-SNAPSHOT
+        4.9
     
     java-diff-utils-jgit
     java-diff-utils-jgit
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index 76c62bd5..fe365746 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -7,7 +7,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.9-SNAPSHOT
+        4.9
     
     
         UTF-8
diff --git a/pom.xml b/pom.xml
index dc46e5d1..c0f713b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.9-SNAPSHOT
+    4.9
     java-diff-utils-parent
     pom
     
@@ -29,7 +29,7 @@
         scm:git:https://github.com/java-diff-utils/java-diff-utils.git
         scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
         https://github.com/java-diff-utils/java-diff-utils.git
-        HEAD
+        java-diff-utils-parent-4.9
     
     
         GitHub Issues

From e4ab41bf046863e98f938da51ad1dbee683eaca1 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 1 Nov 2020 21:32:22 +0100
Subject: [PATCH 136/266] [maven-release-plugin] prepare for next development
 iteration

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index 309dc0da..f3b2c1ad 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.9
+        4.10-SNAPSHOT
     
     java-diff-utils-jgit
     java-diff-utils-jgit
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index fe365746..8f8fd0b5 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -7,7 +7,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.9
+        4.10-SNAPSHOT
     
     
         UTF-8
diff --git a/pom.xml b/pom.xml
index c0f713b6..2427bd65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.9
+    4.10-SNAPSHOT
     java-diff-utils-parent
     pom
     
@@ -29,7 +29,7 @@
         scm:git:https://github.com/java-diff-utils/java-diff-utils.git
         scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
         https://github.com/java-diff-utils/java-diff-utils.git
-        java-diff-utils-parent-4.9
+        HEAD
     
     
         GitHub Issues

From 55d71fea7175c48437774b66fbdcbc6450cb7980 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 1 Nov 2020 22:06:19 +0100
Subject: [PATCH 137/266]

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5530ff3a..8f195bdb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,10 @@ This project uses a custom versioning scheme (and not [Semantic Versioning](http
 
 ### Changed
 
+## [4.9]
+
+### Changed
+
 * make patch serializable
 
 ## [4.8]

From 5338313a54c6eed065c3339a71870ba2d6fd0d0f Mon Sep 17 00:00:00 2001
From: Mike Samuel 
Date: Sun, 22 Nov 2020 13:48:05 -0500
Subject: [PATCH 138/266] StringUtils.wrapText will not split surrogate pair.
 (#103)

Previously,

    StringUtils.wrapText(".\uD800\uDC00.", 2)
    //                           ^ index 2 points here

would insert a `
` between two paired surrogates.

Now, it shifts the insertion point to a whole code-point boundary.
---
 .../com/github/difflib/text/StringUtils.java     | 16 +++++++++++++---
 .../com/github/difflib/text/StringUtilsTest.java |  2 ++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/StringUtils.java b/java-diff-utils/src/main/java/com/github/difflib/text/StringUtils.java
index a1425488..b7e35495 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/text/StringUtils.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/StringUtils.java
@@ -21,10 +21,10 @@
 final class StringUtils {
 
     /**
-     * Replaces all opening an closing tags with < or >.
+     * Replaces all opening and closing tags with < or >.
      *
      * @param str
-     * @return
+     * @return str with some HTML meta characters escaped.
      */
     public static String htmlEntites(String str) {
         return str.replace("<", "<").replace(">", ">");
@@ -61,7 +61,17 @@ public static String wrapText(String line, int columnWidth) {
         StringBuilder b = new StringBuilder(line);
 
         for (int count = 0; length > widthIndex; count++) {
-            b.insert(widthIndex + delimiter * count, "
");
+            int breakPoint = widthIndex + delimiter * count;
+            if (Character.isHighSurrogate(b.charAt(breakPoint - 1)) &&
+                Character.isLowSurrogate(b.charAt(breakPoint))) {
+              // Shift a breakpoint that would split a supplemental code-point.
+              breakPoint += 1;
+              if (breakPoint == b.length()) {
+                // Break before instead of after if this is the last code-point.
+                breakPoint -= 2;
+              }
+            }
+            b.insert(breakPoint, "
");
             widthIndex += columnWidth;
         }
 
diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/StringUtilsTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/StringUtilsTest.java
index c4b2acce..68670723 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/text/StringUtilsTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/text/StringUtilsTest.java
@@ -49,6 +49,8 @@ public void testWrapText_String_int() {
         assertEquals("te
st", StringUtils.wrapText("test", 2));
         assertEquals("tes
t", StringUtils.wrapText("test", 3));
         assertEquals("test", StringUtils.wrapText("test", 10));
+        assertEquals(".\uD800\uDC01
.", StringUtils.wrapText(".\uD800\uDC01.", 2));
+        assertEquals("..
\uD800\uDC01", StringUtils.wrapText("..\uD800\uDC01", 3));
     }
 
     @Test

From c6d3f73d225d73caba353d926564fb8dd241ec03 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 12 Dec 2020 00:35:11 +0100
Subject: [PATCH 139/266] fixes #104

---
 .../unifieddiff/UnifiedDiffReader.java        |   4 +-
 .../unifieddiff/UnifiedDiffReaderTest.java    |  16 +
 .../problem_diff_parsing_issue104.diff        | 291 ++++++++++++++++++
 3 files changed, 309 insertions(+), 2 deletions(-)
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_parsing_issue104.diff

diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
index e9596932..9c113f45 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
@@ -219,9 +219,9 @@ private void processDelLine(MatchResult match, String line) {
     private void processChunk(MatchResult match, String chunkStart) {
         // finalizeChunk();
         old_ln = toInteger(match, 1, 1);
-        old_size = toInteger(match, 2, 0);
+        old_size = toInteger(match, 2, 1);
         new_ln = toInteger(match, 3, 1);
-        new_size = toInteger(match, 4, 0);
+        new_size = toInteger(match, 4, 1);
         if (old_ln == 0) {
             old_ln = 1;
         }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
index ed792c88..b53bf166 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -236,4 +236,20 @@ public void testParseIssue98() throws IOException {
         assertEquals("src/test/java/se/bjurr/violations/lib/model/ViolationTest.java", file1.getFromFile());
         assertThat(diff.getTail()).isEqualTo("2.25.1");
     }
+    
+    @Test
+    public void testParseIssue104() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_parsing_issue104.diff"));
+
+        assertThat(diff.getFiles().size()).isEqualTo(6);
+
+        final UnifiedDiffFile file = diff.getFiles().get(2);
+        assertThat(file.getFromFile()).isEqualTo("/dev/null");
+        assertThat(file.getToFile()).isEqualTo("doc/samba_data_tool_path.xml.in");
+                
+        assertThat(file.getPatch().toString()).isEqualTo("Patch{deltas=[[ChangeDelta, position: 0, lines: [] to [@SAMBA_DATA_TOOL@]]]}");
+
+        assertThat(diff.getTail()).isEqualTo("2.14.4");
+    }
 }
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_parsing_issue104.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_parsing_issue104.diff
new file mode 100644
index 00000000..19631eed
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_parsing_issue104.diff
@@ -0,0 +1,291 @@
+From 9b73f79a2436760b8278377014bf78a144a427ae Mon Sep 17 00:00:00 2001
+From: Sumit Bose 
+Date: Thu, 1 Feb 2018 14:26:22 +0100
+Subject: [PATCH 15/23] make Samba data tool configurable
+
+Allow to specify an alternative path to Samba's net utility at configure
+time and at run time.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=100118
+
+Reviewed-by: Jakub Hrozek 
+---
+ configure.ac                    | 13 ++++++++++++
+ doc/adcli.xml                   | 21 ++++++++++++++++++-
+ doc/samba_data_tool_path.xml.in |  1 +
+ library/adenroll.c              | 46 ++++++++++++++++++++++++++++++++++-------
+ library/adenroll.h              |  5 +++++
+ tools/computer.c                | 16 ++++++++++++++
+ 7 files changed, 95 insertions(+), 8 deletions(-)
+ create mode 100644 doc/samba_data_tool_path.xml.in
+
+diff --git a/configure.ac b/configure.ac
+index fe86638..68877c7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -291,6 +291,18 @@ else
+ 	AC_DEFINE_UNQUOTED(BIN_ECHO, "$BIN_ECHO", [path to echo, used in unit test])
+ fi
+ 
++AC_MSG_CHECKING([where is Samba's net utility])
++AC_ARG_WITH([samba_data_tool],
++              AC_HELP_STRING([--with-samba-data-tool=/path],
++              [Path to Samba's net utility]),
++              [],
++              [with_samba_data_tool=/usr/bin/net])
++AC_MSG_RESULT([$with_samba_data_tool])
++
++AC_DEFINE_UNQUOTED(SAMBA_DATA_TOOL, "$with_samba_data_tool",
++                   [Path to Samba's net utility])
++
++AC_SUBST(SAMBA_DATA_TOOL, [$with_samba_data_tool])
+ # ---------------------------------------------------------------------
+ 
+ ADCLI_LT_RELEASE=$ADCLI_CURRENT:$ADCLI_REVISION:$ADCLI_AGE
+@@ -300,6 +312,7 @@ AC_CONFIG_FILES([Makefile
+ 	build/Makefile
+ 	doc/Makefile
+ 	doc/version.xml
++	doc/samba_data_tool_path.xml
+ 	library/Makefile
+ 	tools/Makefile
+ ])
+diff --git a/doc/adcli.xml b/doc/adcli.xml
+index fbc6c63..c2b7760 100644
+--- a/doc/adcli.xml
++++ b/doc/adcli.xml
+@@ -1,6 +1,9 @@
+ 
+ 
++	"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
++[
++	
++]>
+ 
+ 
+ 
+@@ -307,6 +310,14 @@ Password for Administrator:
+ 			smb.conf5
+ 			for details.
+ 		
++		
++			
++			If Samba's net
++			cannot be found at
++			&samba_data_tool; this option can
++			be used to specific an alternative location with the
++			help of an absolute path.
++		
+ 	
+ 
+ 
+@@ -412,6 +423,14 @@ $ adcli update --login-ccache=/tmp/krbcc_123
+ 			smb.conf5
+ 			for details.
+ 		
++		
++			
++			If Samba's net
++			cannot be found at
++			&samba_data_tool; this option can
++			be used to specific an alternative location with the
++			help of an absolute path.
++		
+ 	
+ 
+ 
+diff --git a/doc/samba_data_tool_path.xml.in b/doc/samba_data_tool_path.xml.in
+new file mode 100644
+index 0000000..a667c57
+--- /dev/null
++++ b/doc/samba_data_tool_path.xml.in
+@@ -0,0 +1 @@
++@SAMBA_DATA_TOOL@
+diff --git a/library/adenroll.c b/library/adenroll.c
+index 20731cd..a693049 100644
+--- a/library/adenroll.c
++++ b/library/adenroll.c
+@@ -42,6 +42,10 @@
+ #include 
+ #include 
+ 
++#ifndef SAMBA_DATA_TOOL
++#define SAMBA_DATA_TOOL "/usr/bin/net"
++#endif
++
+ static krb5_enctype v60_later_enctypes[] = {
+ 	ENCTYPE_AES256_CTS_HMAC_SHA1_96,
+ 	ENCTYPE_AES128_CTS_HMAC_SHA1_96,
+@@ -100,6 +104,7 @@ struct _adcli_enroll {
+ 	int keytab_enctypes_explicit;
+ 	unsigned int computer_password_lifetime;
+ 	int computer_password_lifetime_explicit;
++	char *samba_data_tool;
+ };
+ 
+ static adcli_result
+@@ -1537,26 +1542,33 @@ static adcli_result
+ update_samba_data (adcli_enroll *enroll)
+ {
+ 	int ret;
+-	char *argv_pw[] = { "/usr/bin/net", "changesecretpw", "-i", "-f", NULL };
+-	char *argv_sid[] = { "/usr/bin/net", "setdomainsid", NULL, NULL };
++	char *argv_pw[] = { NULL, "changesecretpw", "-i", "-f", NULL };
++	char *argv_sid[] = { NULL, "setdomainsid", NULL, NULL };
++
++	argv_pw[0] = (char *) adcli_enroll_get_samba_data_tool (enroll);
++	if (argv_pw[0] ==NULL) {
++		_adcli_err ("Samba data tool not available.");
++		return ADCLI_ERR_FAIL;
++	}
++	argv_sid[0] = argv_pw[0];
+ 
+-	_adcli_info ("Trying to set Samba secret.\n");
++	_adcli_info ("Trying to set Samba secret.");
+ 	ret = _adcli_call_external_program (argv_pw[0], argv_pw,
+ 	                                    enroll->computer_password, NULL, NULL);
+ 	if (ret != ADCLI_SUCCESS) {
+-		_adcli_err ("Failed to set Samba computer account password.\n");
++		_adcli_err ("Failed to set Samba computer account password.");
+ 	}
+ 
+ 	argv_sid[2] = (char *) adcli_conn_get_domain_sid (enroll->conn);
+ 	if (argv_sid[2] == NULL) {
+-		_adcli_err ("Domain SID not available.\n");
++		_adcli_err ("Domain SID not available.");
+ 	} else {
+-		_adcli_info ("Trying to set domain SID %s for Samba.\n",
++		_adcli_info ("Trying to set domain SID %s for Samba.",
+ 		             argv_sid[2]);
+ 		ret = _adcli_call_external_program (argv_sid[0], argv_sid,
+ 		                                    NULL, NULL, NULL);
+ 		if (ret != ADCLI_SUCCESS) {
+-			_adcli_err ("Failed to set Samba domain SID.\n");
++			_adcli_err ("Failed to set Samba domain SID.");
+ 		}
+ 	}
+ 
+@@ -1951,6 +1963,9 @@ adcli_enroll_new (adcli_conn *conn)
+ 	enroll->os_name = strdup (value);
+ 	return_val_if_fail (enroll->os_name != NULL, NULL);
+ 
++	enroll->samba_data_tool = strdup (SAMBA_DATA_TOOL);
++	return_val_if_fail (enroll->samba_data_tool != NULL, NULL);
++
+ 	return enroll;
+ }
+ 
+@@ -1978,6 +1993,7 @@ enroll_free (adcli_enroll *enroll)
+ 	free (enroll->os_name);
+ 	free (enroll->os_version);
+ 	free (enroll->os_service_pack);
++	free (enroll->samba_data_tool);
+ 
+ 	free (enroll->user_principal);
+ 	_adcli_strv_free (enroll->service_names);
+@@ -2343,3 +2359,19 @@ adcli_enroll_set_computer_password_lifetime (adcli_enroll *enroll,
+ 
+ 	enroll->computer_password_lifetime_explicit = 1;
+ }
++
++void
++adcli_enroll_set_samba_data_tool (adcli_enroll *enroll, const char *value)
++{
++	return_if_fail (enroll != NULL);
++	if (value != NULL && value[0] != '\0') {
++		_adcli_str_set (&enroll->samba_data_tool, value);
++	}
++}
++
++const char *
++adcli_enroll_get_samba_data_tool (adcli_enroll *enroll)
++{
++	return_val_if_fail (enroll != NULL, NULL);
++	return enroll->samba_data_tool;
++}
+diff --git a/library/adenroll.h b/library/adenroll.h
+index 32c9764..31ca0bc 100644
+--- a/library/adenroll.h
++++ b/library/adenroll.h
+@@ -141,4 +141,9 @@ const char *       adcli_enroll_get_os_service_pack     (adcli_enroll *enroll);
+ void               adcli_enroll_set_os_service_pack     (adcli_enroll *enroll,
+                                                          const char *value);
+ 
++void               adcli_enroll_set_samba_data_tool     (adcli_enroll *enroll,
++                                                         const char *value);
++
++const char *       adcli_enroll_get_samba_data_tool     (adcli_enroll *enroll);
++
+ #endif /* ADENROLL_H_ */
+diff --git a/tools/computer.c b/tools/computer.c
+index fc646f2..f86548b 100644
+--- a/tools/computer.c
++++ b/tools/computer.c
+@@ -30,6 +30,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ static void
+ dump_details (adcli_conn *conn,
+@@ -107,6 +108,7 @@ typedef enum {
+ 	opt_user_principal,
+ 	opt_computer_password_lifetime,
+ 	opt_add_samba_data,
++	opt_samba_data_tool,
+ } Option;
+ 
+ static adcli_tool_desc common_usages[] = {
+@@ -145,6 +147,7 @@ static adcli_tool_desc common_usages[] = {
+ 	                     "successful join" },
+ 	{ opt_add_samba_data, "add domain SID and computer account password\n"
+ 	                      "to the Samba specific configuration database" },
++	{ opt_samba_data_tool, "Absolute path to the tool used for add-samba-data" },
+ 	{ opt_verbose, "show verbose progress and failure messages", },
+ 	{ 0 },
+ };
+@@ -160,6 +163,7 @@ parse_option (Option opt,
+ 	static int stdin_password = 0;
+ 	char *endptr;
+ 	unsigned int lifetime;
++	int ret;
+ 
+ 	switch (opt) {
+ 	case opt_login_ccache:
+@@ -265,6 +269,16 @@ parse_option (Option opt,
+ 
+ 		adcli_enroll_set_computer_password_lifetime (enroll, lifetime);
+ 		return;
++	case opt_samba_data_tool:
++		errno = 0;
++		ret = access (optarg, X_OK);
++		if (ret != 0) {
++			ret = errno;
++			errx (EUSAGE, "Failed to access tool to add Samba data: %s", strerror (ret));
++		} else {
++			adcli_enroll_set_samba_data_tool (enroll, optarg);
++		}
++		return;
+ 	case opt_verbose:
+ 		return;
+ 
+@@ -331,6 +345,7 @@ adcli_tool_computer_join (adcli_conn *conn,
+ 		{ "show-details", no_argument, NULL, opt_show_details },
+ 		{ "show-password", no_argument, NULL, opt_show_password },
+ 		{ "add-samba-data", no_argument, NULL, opt_add_samba_data },
++		{ "samba-data-tool", no_argument, NULL, opt_samba_data_tool },
+ 		{ "verbose", no_argument, NULL, opt_verbose },
+ 		{ "help", no_argument, NULL, 'h' },
+ 		{ 0 },
+@@ -434,6 +449,7 @@ adcli_tool_computer_update (adcli_conn *conn,
+ 		{ "show-details", no_argument, NULL, opt_show_details },
+ 		{ "show-password", no_argument, NULL, opt_show_password },
+ 		{ "add-samba-data", no_argument, NULL, opt_add_samba_data },
++		{ "samba-data-tool", no_argument, NULL, opt_samba_data_tool },
+ 		{ "verbose", no_argument, NULL, opt_verbose },
+ 		{ "help", no_argument, NULL, 'h' },
+ 		{ 0 },
+-- 
+2.14.4

From 1fdea352adf5432fc24808d90661732695f63f01 Mon Sep 17 00:00:00 2001
From: Tobias 
Date: Sun, 13 Dec 2020 22:34:53 +0100
Subject: [PATCH 140/266] Create stale.yml

---
 .github/workflows/stale.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 .github/workflows/stale.yml

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
new file mode 100644
index 00000000..b671fc09
--- /dev/null
+++ b/.github/workflows/stale.yml
@@ -0,0 +1,19 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: "30 1 * * *"
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/stale@v3
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'Stale issue message'
+        stale-pr-message: 'Stale pull request message'
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'

From 7d8b87a0eccb8ea4c7fb83ed9727ee754aab28ec Mon Sep 17 00:00:00 2001
From: Tobias 
Date: Sun, 13 Dec 2020 22:41:38 +0100
Subject: [PATCH 141/266] Create maven.yml

---
 .github/workflows/maven.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .github/workflows/maven.yml

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 00000000..c8aeb3a2
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,24 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml

From b8aef6a3da357b12fc92b02c0e73a086e8c953db Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 13 Dec 2020 22:47:15 +0100
Subject: [PATCH 142/266]

---
 .../src/main/java/com/github/difflib/patch/Patch.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
index c5783211..066f2353 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
@@ -30,7 +30,7 @@
 
 /**
  * Describes the patch holding all deltas between the original and revised texts.
- *
+ * 
  * @author Dmitry Naumenko
  * @param  The type of the compared elements in the 'lines'.
  */

From d7a5247b1d88f9ebe6cbb039d34579f7f6aa4a2b Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 13 Dec 2020 22:58:42 +0100
Subject: [PATCH 143/266]

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 34c09e6f..e7668a2d 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,10 @@
 ## Status
 
 [![Build Status](https://travis-ci.org/java-diff-utils/java-diff-utils.svg?branch=master)](https://travis-ci.org/java-diff-utils/java-diff-utils)
+
+![Build Status using Github Actions](https://github.com/java-diff-utils/java-diff-utils/workflows/Java CI with Maven/badge.svg)
+
+
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/7eba77f10bed4c2a8d08ac8dc8da4a86)](https://www.codacy.com/app/wumpz/java-diff-utils?utm_source=github.com&utm_medium=referral&utm_content=java-diff-utils/java-diff-utils&utm_campaign=Badge_Grade)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.java-diff-utils/java-diff-utils/badge.svg)](http://maven-badges.herokuapp.com/maven-central/io.github.java-diff-utils/java-diff-utils)
 

From d62e9a9fb6bc59ee3b472cb1b55ff9cbb146df3e Mon Sep 17 00:00:00 2001
From: Tobias 
Date: Sun, 13 Dec 2020 23:00:10 +0100
Subject: [PATCH 144/266] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e7668a2d..113c5a34 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 [![Build Status](https://travis-ci.org/java-diff-utils/java-diff-utils.svg?branch=master)](https://travis-ci.org/java-diff-utils/java-diff-utils)
 
-![Build Status using Github Actions](https://github.com/java-diff-utils/java-diff-utils/workflows/Java CI with Maven/badge.svg)
+[![Build Status using Github Actions](https://github.com/java-diff-utils/java-diff-utils/workflows/Java CI with Maven/badge.svg)]
 
 
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/7eba77f10bed4c2a8d08ac8dc8da4a86)](https://www.codacy.com/app/wumpz/java-diff-utils?utm_source=github.com&utm_medium=referral&utm_content=java-diff-utils/java-diff-utils&utm_campaign=Badge_Grade)

From ba3c31344090099a4c1bd0acdd7f1da5d14bf9ff Mon Sep 17 00:00:00 2001
From: Tobias 
Date: Sun, 13 Dec 2020 23:01:23 +0100
Subject: [PATCH 145/266] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 113c5a34..fa276c09 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 [![Build Status](https://travis-ci.org/java-diff-utils/java-diff-utils.svg?branch=master)](https://travis-ci.org/java-diff-utils/java-diff-utils)
 
-[![Build Status using Github Actions](https://github.com/java-diff-utils/java-diff-utils/workflows/Java CI with Maven/badge.svg)]
+![Build Status using Github Actions](https://github.com/java-diff-utils/java-diff-utils/workflows/Java%20CI%20with%20Maven/badge.svg)
 
 
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/7eba77f10bed4c2a8d08ac8dc8da4a86)](https://www.codacy.com/app/wumpz/java-diff-utils?utm_source=github.com&utm_medium=referral&utm_content=java-diff-utils/java-diff-utils&utm_campaign=Badge_Grade)

From b927e6f477ac88d99cd9f789be010eebf9e7c396 Mon Sep 17 00:00:00 2001
From: Tobias 
Date: Sun, 13 Dec 2020 23:02:54 +0100
Subject: [PATCH 146/266] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fa276c09..49846f9c 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 [![Build Status](https://travis-ci.org/java-diff-utils/java-diff-utils.svg?branch=master)](https://travis-ci.org/java-diff-utils/java-diff-utils)
 
-![Build Status using Github Actions](https://github.com/java-diff-utils/java-diff-utils/workflows/Java%20CI%20with%20Maven/badge.svg)
+[![Build Status using Github Actions](https://github.com/java-diff-utils/java-diff-utils/workflows/Java%20CI%20with%20Maven/badge.svg)](https://github.com/java-diff-utils/java-diff-utils/actions?query=workflow%3A%22Java+CI+with+Maven%22)
 
 
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/7eba77f10bed4c2a8d08ac8dc8da4a86)](https://www.codacy.com/app/wumpz/java-diff-utils?utm_source=github.com&utm_medium=referral&utm_content=java-diff-utils/java-diff-utils&utm_campaign=Badge_Grade)

From 26be87091bdf42cd404e0237e5f897f27e6128ae Mon Sep 17 00:00:00 2001
From: Tobias 
Date: Sun, 13 Dec 2020 23:12:31 +0100
Subject: [PATCH 147/266] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 49846f9c..660f9d67 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,8 @@
 
 [![Build Status using Github Actions](https://github.com/java-diff-utils/java-diff-utils/workflows/Java%20CI%20with%20Maven/badge.svg)](https://github.com/java-diff-utils/java-diff-utils/actions?query=workflow%3A%22Java+CI+with+Maven%22)
 
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/002c53aa0c924f71ac80a2f65446dfdd)](https://www.codacy.com/gh/java-diff-utils/java-diff-utils/dashboard?utm_source=github.com&utm_medium=referral&utm_content=java-diff-utils/java-diff-utils&utm_campaign=Badge_Grade)
 
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/7eba77f10bed4c2a8d08ac8dc8da4a86)](https://www.codacy.com/app/wumpz/java-diff-utils?utm_source=github.com&utm_medium=referral&utm_content=java-diff-utils/java-diff-utils&utm_campaign=Badge_Grade)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.java-diff-utils/java-diff-utils/badge.svg)](http://maven-badges.herokuapp.com/maven-central/io.github.java-diff-utils/java-diff-utils)
 
 ## Intro

From 06f1e0593efc61c24dfc723ae6474e49d605d1d5 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 13 Dec 2020 23:48:24 +0100
Subject: [PATCH 148/266]

---
 .../main/java/com/github/difflib/patch/AbstractDelta.java    | 5 +----
 .../com/github/difflib/unifieddiff/UnifiedDiffReader.java    | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
index fe599dc8..a089d74d 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
@@ -90,9 +90,6 @@ public boolean equals(Object obj) {
         if (!Objects.equals(this.target, other.target)) {
             return false;
         }
-        if (this.type != other.type) {
-            return false;
-        }
-        return true;
+        return this.type == other.type;
     }
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
index 9c113f45..362703f2 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
@@ -91,7 +91,7 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
             if (!CHUNK.validLine(line)) {
                 initFileIfNecessary();
                 while (line != null && !CHUNK.validLine(line)) {
-                    if (processLine(line, DIFF_COMMAND, INDEX, FROM_FILE, TO_FILE, NEW_FILE_MODE, DELETED_FILE_MODE) == false) {
+                    if (!processLine(line, DIFF_COMMAND, INDEX, FROM_FILE, TO_FILE, NEW_FILE_MODE, DELETED_FILE_MODE)) {
                         throw new UnifiedDiffParserException("expected file start line not found");
                     }
                     line = READER.readLine();
@@ -100,7 +100,7 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
             if (line != null) {
                 processLine(line, CHUNK);
                 while ((line = READER.readLine()) != null) {
-                    if (processLine(line, LINE_NORMAL, LINE_ADD, LINE_DEL) == false) {
+                    if (!processLine(line, LINE_NORMAL, LINE_ADD, LINE_DEL)) {
                         throw new UnifiedDiffParserException("expected data line not found");
                     }
                     if ((originalTxt.size() == old_size && revisedTxt.size() == new_size)

From 270754fb8cb3011058d18e594c0a51369a83b353 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 13 Dec 2020 23:54:12 +0100
Subject: [PATCH 149/266]

---
 .../src/main/java/com/github/difflib/patch/Patch.java            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
index 066f2353..0247c5bc 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
@@ -142,6 +142,7 @@ public static  Patch generate(List original, List revised, List(orgChunk, revChunk));
                     break;
+                default:
             }
 
             startOriginal = change.endOriginal;

From 759a2ba67aef5efce5a891b16bcdb5c91fc9316c Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Thu, 17 Dec 2020 22:55:11 +0100
Subject: [PATCH 150/266] changed action to matrix build project using java 8
 and 11

---
 .github/workflows/maven.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index c8aeb3a2..f8d96999 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -11,14 +11,16 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
+    strategy:
+      matrix: 
+        java: [8, 11]
+    name: Java ${{ matrix.java }} building ... 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up Java ${{ matrix.java }} 
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: ${{ matrix.java }} 
     - name: Build with Maven
-      run: mvn -B package --file pom.xml
+      run: mvn -B package --file pom.xml
\ No newline at end of file

From 7647c0a39ecf2f5503eb93ddb4269ecfb5b16de9 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Thu, 17 Dec 2020 23:02:05 +0100
Subject: [PATCH 151/266] removed author entry that was accidently introduced
 into the new implementation of UnifiedDiff tools

---
 .../java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java
index 320e6858..8d6c58bf 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java
@@ -193,7 +193,6 @@ private static void processDeltas(Consumer writer,
      *
      * @param delta - the Delta to output
      * @return list of String lines of code.
-     * @author Bill James (tankerbay@gmail.com)
      */
     private static void getDeltaText(Consumer writer, AbstractDelta delta) {
         for (String line : delta.getSource().getLines()) {

From ab76d7229a176f13cee752ad1b10b1466093fd40 Mon Sep 17 00:00:00 2001
From: Jerry James 
Date: Thu, 17 Dec 2020 15:08:59 -0700
Subject: [PATCH 152/266] Eliminate most unchecked and unsafe operation
 warnings (#108)

Thx for improving java-diff-utils.
---
 .../com/github/difflib/algorithm/jgit/HistogramDiffTest.java  | 4 ++--
 .../github/difflib/algorithm/jgit/LRHistogramDiffTest.java    | 2 +-
 .../src/main/java/com/github/difflib/patch/ChangeDelta.java   | 2 +-
 .../src/main/java/com/github/difflib/patch/Chunk.java         | 2 +-
 .../src/main/java/com/github/difflib/patch/DeleteDelta.java   | 2 +-
 .../src/main/java/com/github/difflib/patch/EqualDelta.java    | 2 +-
 .../src/main/java/com/github/difflib/patch/InsertDelta.java   | 2 +-
 .../src/main/java/com/github/difflib/patch/Patch.java         | 4 ++--
 .../src/test/java/com/github/difflib/DiffUtilsTest.java       | 2 +-
 .../test/java/com/github/difflib/GenerateUnifiedDiffTest.java | 4 ++--
 .../com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java | 2 +-
 11 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java b/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java
index 4a06ef9f..ac85f985 100644
--- a/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java
+++ b/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java
@@ -41,7 +41,7 @@ public HistogramDiffTest() {
     public void testDiff() throws PatchFailedException {
         List orgList = Arrays.asList("A", "B", "C", "A", "B", "B", "A");
         List revList = Arrays.asList("C", "B", "A", "B", "A", "C");
-        final Patch patch = Patch.generate(orgList, revList, new HistogramDiff().computeDiff(orgList, revList, null));
+        final Patch patch = Patch.generate(orgList, revList, new HistogramDiff().computeDiff(orgList, revList, null));
         System.out.println(patch);
         assertNotNull(patch);
         assertEquals(3, patch.getDeltas().size());
@@ -57,7 +57,7 @@ public void testDiffWithListener() throws PatchFailedException {
         List revList = Arrays.asList("C", "B", "A", "B", "A", "C");
         
         List logdata = new ArrayList<>();
-        final Patch patch = Patch.generate(orgList, revList, new HistogramDiff().computeDiff(orgList, revList, new DiffAlgorithmListener() {
+        final Patch patch = Patch.generate(orgList, revList, new HistogramDiff().computeDiff(orgList, revList, new DiffAlgorithmListener() {
             @Override
             public void diffStart() {
                 logdata.add("start");
diff --git a/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java b/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java
index 9bb0a8f4..ccbc2f30 100644
--- a/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java
+++ b/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java
@@ -45,7 +45,7 @@ public void testPossibleDiffHangOnLargeDatasetDnaumenkoIssue26() throws IOExcept
         List revised = readStringListFromInputStream(zip.getInputStream(zip.getEntry("tb")));
 
         List logdata = new ArrayList<>();
-        Patch patch = Patch.generate(original, revised, new HistogramDiff().computeDiff(original, revised, new DiffAlgorithmListener() {
+        Patch patch = Patch.generate(original, revised, new HistogramDiff().computeDiff(original, revised, new DiffAlgorithmListener() {
             @Override
             public void diffStart() {
                 logdata.add("start");
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java
index eddb279d..39b82a55 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java
@@ -75,6 +75,6 @@ public String toString() {
 
     @Override
     public AbstractDelta withChunks(Chunk original, Chunk revised) {
-        return new ChangeDelta(original, revised);
+        return new ChangeDelta(original, revised);
     }
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
index f45bbb4f..f108bf5e 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
@@ -156,7 +156,7 @@ public boolean equals(Object obj) {
         if (getClass() != obj.getClass()) {
             return false;
         }
-        Chunk other = (Chunk) obj;
+        Chunk other = (Chunk) obj;
         if (lines == null) {
             if (other.lines != null) {
                 return false;
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java
index b33114fe..f4ee14c4 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java
@@ -62,6 +62,6 @@ public String toString() {
     
     @Override
     public AbstractDelta withChunks(Chunk original, Chunk revised) {
-        return new DeleteDelta(original, revised);
+        return new DeleteDelta(original, revised);
     }
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java
index dbfdf46a..167b0b70 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java
@@ -44,6 +44,6 @@ public String toString() {
     
     @Override
     public AbstractDelta withChunks(Chunk original, Chunk revised) {
-        return new EqualDelta(original, revised);
+        return new EqualDelta(original, revised);
     }
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java
index 16742d25..0f6a65fb 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java
@@ -62,6 +62,6 @@ public String toString() {
     
     @Override
     public AbstractDelta withChunks(Chunk original, Chunk revised) {
-        return new InsertDelta(original, revised);
+        return new InsertDelta(original, revised);
     }
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
index 0247c5bc..8e8066d7 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
@@ -125,7 +125,7 @@ public static  Patch generate(List original, List revised, List(
                         buildChunk(startOriginal, change.startOriginal, original),
                         buildChunk(startRevised, change.startRevised, revised)));
             }
@@ -150,7 +150,7 @@ public static  Patch generate(List original, List revised, List(
                     buildChunk(startOriginal, original.size(), original),
                     buildChunk(startRevised, revised.size(), revised)));
         }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java b/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
index c02c4446..000b095a 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
@@ -112,7 +112,7 @@ public void testDiffIntegerList() {
 
         final Patch patch = DiffUtils.diff(original, revised);
 
-        for (AbstractDelta delta : patch.getDeltas()) {
+        for (AbstractDelta delta : patch.getDeltas()) {
             System.out.println(delta);
         }
 
diff --git a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
index 8febc309..c1674108 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
@@ -147,7 +147,7 @@ public void testChagngePosition() throws IOException {
 
     private void validateChangePosition(Patch patch, int index, List realRemoveList,
                                         List realAddList ) {
-        final Chunk originChunk = patch.getDeltas().get(index).getSource();
+        final Chunk originChunk = patch.getDeltas().get(index).getSource();
         List removeList = originChunk.getChangePosition();
         assertEquals(realRemoveList.size(), removeList.size());
         for (Integer ele: realRemoveList) {
@@ -156,7 +156,7 @@ private void validateChangePosition(Patch patch, int index, List targetChunk = patch.getDeltas().get(index).getTarget();
         List addList = targetChunk.getChangePosition();
         assertEquals(realAddList.size(), addList.size());
         for (Integer ele: realAddList) {
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java
index 5527fe17..af48d485 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java
@@ -46,7 +46,7 @@ public void testWrite() throws URISyntaxException, IOException {
         UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(new ByteArrayInputStream(str.getBytes()));
 
         StringWriter writer = new StringWriter();
-        UnifiedDiffWriter.write(diff, f -> Collections.EMPTY_LIST, writer, 5);
+        UnifiedDiffWriter.write(diff, f -> Collections.emptyList(), writer, 5);
         System.out.println(writer.toString());
     }
     

From 445381b2773de2079fd0534c7f877067c05700b2 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 19 Dec 2020 00:11:32 +0100
Subject: [PATCH 153/266] fixes #107 process "\ No newline at end of file"

---
 .../difflib/unifieddiff/UnifiedDiffFile.java  |     9 +
 .../unifieddiff/UnifiedDiffReader.java        |     7 +-
 .../unifieddiff/UnifiedDiffReaderTest.java    |    31 +
 .../01-bazel-strip-unused.patch_issue107.diff | 54401 ++++++++++++++++
 .../unifieddiff/problem_diff_issue107.diff    |    13 +
 5 files changed, 54460 insertions(+), 1 deletion(-)
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/01-bazel-strip-unused.patch_issue107.diff
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue107.diff

diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java
index bc1ef2f8..13ff9363 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java
@@ -32,6 +32,7 @@ public final class UnifiedDiffFile {
     private String newFileMode;
     private String deletedFileMode;
     private Patch patch = new Patch<>();
+    private boolean noNewLineAtTheEndOfTheFile = false;
 
     public String getDiffCommand() {
         return diffCommand;
@@ -110,4 +111,12 @@ public String getDeletedFileMode() {
     public void setDeletedFileMode(String deletedFileMode) {
         this.deletedFileMode = deletedFileMode;
     }
+
+    public boolean isNoNewLineAtTheEndOfTheFile() {
+        return noNewLineAtTheEndOfTheFile;
+    }
+
+    public void setNoNewLineAtTheEndOfTheFile(boolean noNewLineAtTheEndOfTheFile) {
+        this.noNewLineAtTheEndOfTheFile = noNewLineAtTheEndOfTheFile;
+    }
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
index 362703f2..bac87590 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
@@ -111,8 +111,13 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
                     }
                 }
                 line = READER.readLine();
+                
+                if ("\\ No newline at end of file".equals(line)) {                   
+                    actualFile.setNoNewLineAtTheEndOfTheFile(true);
+                    line = READER.readLine();
+                }
             }
-            if (line == null || line.startsWith("--")) {
+            if (line == null || (line.startsWith("--") && !line.startsWith("---"))) {
                 break;
             }
         }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
index b53bf166..bdc8db9c 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -252,4 +252,35 @@ public void testParseIssue104() throws IOException {
 
         assertThat(diff.getTail()).isEqualTo("2.14.4");
     }
+    
+    @Test
+    public void testParseIssue107BazelDiff() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("01-bazel-strip-unused.patch.diff"));
+
+        assertThat(diff.getFiles().size()).isEqualTo(450);
+
+        final UnifiedDiffFile file = diff.getFiles().get(0);
+        assertThat(file.getFromFile()).isEqualTo("./src/main/java/com/amazonaws/AbortedException.java");
+        assertThat(file.getToFile()).isEqualTo("/home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/AbortedException.java");
+                
+        assertThat(diff.getFiles().stream()
+                .filter(f -> f.isNoNewLineAtTheEndOfTheFile())
+                .count())
+                    .isEqualTo(48);
+    }
+    
+    @Test
+    public void testParseIssue107_2() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue107.diff"));
+
+        assertThat(diff.getFiles().size()).isEqualTo(2);
+
+        final UnifiedDiffFile file = diff.getFiles().get(0);
+        UnifiedDiffFile file1 = diff.getFiles().get(0);
+        assertThat(file1.getFromFile()).isEqualTo("Main.java");
+        assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
+        
+    }
 }
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/01-bazel-strip-unused.patch_issue107.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/01-bazel-strip-unused.patch_issue107.diff
new file mode 100644
index 00000000..7876d70b
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/01-bazel-strip-unused.patch_issue107.diff
@@ -0,0 +1,54401 @@
+# This patch strips out code that is currently unused from the upstream
+# AWS SDK, this code is not needed to support AWS auth methods
+# and adds little outside of extra code to bazel 
+diff -Nau8r ./src/main/java/com/amazonaws/AbortedException.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/AbortedException.java
+--- ./src/main/java/com/amazonaws/AbortedException.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/AbortedException.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,47 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws;
+-
+-/**
+- * SDK operation aborted exception.
+- */
+-public class AbortedException extends SdkClientException {
+-    private static final long serialVersionUID = 1L;
+-
+-    public AbortedException(String message, Throwable t) {
+-        super(message, t);
+-    }
+-
+-    public AbortedException(Throwable t) {
+-        super("", t);
+-    }
+-
+-    public AbortedException(String message) {
+-        super(message);
+-    }
+-
+-    public AbortedException() {
+-        super("");
+-    }
+-
+-    /**
+-     * {@inheritDoc}
+-     * An aborted exception is not intended to be retried.
+-     */
+-    @Override
+-    public boolean isRetryable() {
+-        return false;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/adapters/types/StringToByteBufferAdapter.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/adapters/types/StringToByteBufferAdapter.java
+--- ./src/main/java/com/amazonaws/adapters/types/StringToByteBufferAdapter.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/adapters/types/StringToByteBufferAdapter.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,35 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights
+- * Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.adapters.types;
+-
+-import java.nio.ByteBuffer;
+-
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.util.StringUtils;
+-
+-@SdkProtectedApi
+-public class StringToByteBufferAdapter implements TypeAdapter {
+-
+-    @Override
+-    public ByteBuffer adapt(String source) {
+-        if (source == null) {
+-            return null;
+-        } else {
+-            return ByteBuffer.wrap(source.getBytes(StringUtils.UTF8));
+-        }
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/adapters/types/StringToInputStreamAdapter.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/adapters/types/StringToInputStreamAdapter.java
+--- ./src/main/java/com/amazonaws/adapters/types/StringToInputStreamAdapter.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/adapters/types/StringToInputStreamAdapter.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,39 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights
+- * Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.adapters.types;
+-
+-import java.io.InputStream;
+-import java.io.UnsupportedEncodingException;
+-
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.util.StringInputStream;
+-
+-@SdkProtectedApi
+-public class StringToInputStreamAdapter implements TypeAdapter {
+-
+-    @Override
+-    public InputStream adapt(String source) {
+-        if (source == null) {
+-            return null;
+-        }
+-        try {
+-            return new StringInputStream(source);
+-        } catch (UnsupportedEncodingException e) {
+-            throw new SdkClientException(e);
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/adapters/types/TypeAdapter.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/adapters/types/TypeAdapter.java
+--- ./src/main/java/com/amazonaws/adapters/types/TypeAdapter.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/adapters/types/TypeAdapter.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,33 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights
+- * Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.adapters.types;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-
+-/**
+- * Adapter interface to convert one type to another
+- *
+- * @param 
+- *            Source type
+- * @param 
+- *            Destination type
+- */
+-@SdkInternalApi
+-public interface TypeAdapter {
+-
+-    Destination adapt(Source source);
+-
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/AmazonWebServiceClient.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/AmazonWebServiceClient.java
+--- ./src/main/java/com/amazonaws/AmazonWebServiceClient.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/AmazonWebServiceClient.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,964 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws;
+-
+-import static com.amazonaws.SDKGlobalConfiguration.PROFILING_SYSTEM_PROPERTY;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.auth.EndpointPrefixAwareSigner;
+-import com.amazonaws.auth.RegionAwareSigner;
+-import com.amazonaws.auth.Signer;
+-import com.amazonaws.auth.SignerFactory;
+-import com.amazonaws.client.AwsSyncClientParams;
+-import com.amazonaws.client.builder.AwsClientBuilder;
+-import com.amazonaws.handlers.RequestHandler;
+-import com.amazonaws.handlers.RequestHandler2;
+-import com.amazonaws.http.AmazonHttpClient;
+-import com.amazonaws.http.ExecutionContext;
+-import com.amazonaws.internal.DefaultServiceEndpointBuilder;
+-import com.amazonaws.internal.auth.DefaultSignerProvider;
+-import com.amazonaws.internal.auth.SignerProvider;
+-import com.amazonaws.internal.auth.SignerProviderContext;
+-import com.amazonaws.log.CommonsLogFactory;
+-import com.amazonaws.metrics.AwsSdkMetrics;
+-import com.amazonaws.metrics.RequestMetricCollector;
+-import com.amazonaws.regions.Region;
+-import com.amazonaws.regions.Regions;
+-import com.amazonaws.util.AWSRequestMetrics;
+-import com.amazonaws.util.AWSRequestMetrics.Field;
+-import com.amazonaws.util.AwsHostNameUtils;
+-import com.amazonaws.util.Classes;
+-import com.amazonaws.util.RuntimeHttpUtils;
+-import com.amazonaws.util.StringUtils;
+-import java.net.URI;
+-import java.util.List;
+-import java.util.concurrent.CopyOnWriteArrayList;
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-
+-/**
+- * Abstract base class for Amazon Web Service Java clients.
+- * 

+- * Responsible for basic client capabilities that are the same across all AWS
+- * SDK Java clients (ex: setting the client endpoint).
+- */
+-public abstract class AmazonWebServiceClient {
+-
+-    /**
+-     * @deprecated No longer used.
+-     */
+-    @Deprecated
+-    public static final boolean LOGGING_AWS_REQUEST_METRIC = true;
+-
+-    private static final String AMAZON = "Amazon";
+-    private static final String AWS = "AWS";
+-
+-    private static final Log log =
+-        LogFactory.getLog(AmazonWebServiceClient.class);
+-
+-    static {
+-        // Configures the internal logging of the signers and core
+-        // classes to use Jakarta Commons Logging to stay consistent with the
+-        // rest of the library.
+-        boolean success = com.amazonaws.log.InternalLogFactory.configureFactory(
+-                            new CommonsLogFactory());
+-        if (log.isDebugEnabled())
+-            log.debug("Internal logging successfully configured to commons logger: "
+-                    + success);
+-    }
+-
+-    /**
+-     * Flag indicating whether a client is mutable or not. Legacy clients built via the constructors
+-     * are mutable. Clients built with the fluent builders are immutable.
+-     */
+-    private volatile boolean isImmutable = false;
+-
+-    /**
+-     * The service endpoint to which this client will send requests.
+-     * 

+-     * Subclass should only read but not assign to this field, at least not
+-     * without synchronization on the enclosing object for thread-safety
+-     * reason.
+-     */
+-    protected volatile URI endpoint;
+-
+-    /**
+-     * Used to explicitly override the internal signer region computed by the
+-     * default implementation. This field is typically null.
+-     */
+-    private volatile String signerRegionOverride;
+-
+-    /** The client configuration */
+-    protected ClientConfiguration clientConfiguration;
+-
+-    /** Low level client for sending requests to AWS services. */
+-    protected AmazonHttpClient client;
+-
+-    /** Optional request handlers for additional request processing. */
+-    protected final List requestHandler2s;
+-
+-    /** Optional offset (in seconds) to use when signing requests */
+-    protected int timeOffset;
+-
+-    private volatile SignerProvider signerProvider;
+-
+-    /**
+-     * The cached service abbreviation for this service, used for identifying
+-     * service endpoints by region, identifying the necessary signer, etc.
+-     * Thread safe so it's backward compatible.
+-     */
+-    private volatile String serviceName;
+-
+-    /**
+-     * The service name in region metadata, i.e. the prefix of endpoint.
+-     */
+-    private volatile String endpointPrefix;
+-
+-    /**
+-     * Region used to sign requests.
+-     */
+-    private volatile String signingRegion;
+-
+-    /**
+-     * Constructs a new AmazonWebServiceClient object using the specified
+-     * configuration.
+-     *
+-     * @param clientConfiguration
+-     *            The client configuration for this client.
+-     */
+-    public AmazonWebServiceClient(ClientConfiguration clientConfiguration) {
+-        this(clientConfiguration, null);
+-    }
+-
+-    /**
+-     * Constructs a new AmazonWebServiceClient object using the specified
+-     * configuration and request metric collector.
+-     *
+-     * @param clientConfiguration
+-     *            The client configuration for this client.
+-     * @param requestMetricCollector
+-     *            optional request metric collector to be used at the http
+-     *            client level; can be null.
+-     */
+-    public AmazonWebServiceClient(ClientConfiguration clientConfiguration,
+-            RequestMetricCollector requestMetricCollector) {
+-        this(clientConfiguration, requestMetricCollector, false);
+-    }
+-
+-    @SdkProtectedApi
+-    protected AmazonWebServiceClient(ClientConfiguration clientConfiguration,
+-                                     RequestMetricCollector requestMetricCollector,
+-                                     boolean disableStrictHostNameVerification) {
+-        this.clientConfiguration = clientConfiguration;
+-        requestHandler2s = new CopyOnWriteArrayList();
+-        client = new AmazonHttpClient(clientConfiguration,
+-                requestMetricCollector, disableStrictHostNameVerification,
+-                calculateCRC32FromCompressedData());
+-    }
+-
+-    protected AmazonWebServiceClient(AwsSyncClientParams clientParams) {
+-        this.clientConfiguration = clientParams.getClientConfiguration();
+-        requestHandler2s = clientParams.getRequestHandlers();
+-        client = new AmazonHttpClient(clientConfiguration, clientParams.getRequestMetricCollector(),
+-                                      !useStrictHostNameVerification(),
+-                                      calculateCRC32FromCompressedData());
+-    }
+-
+-    /**
+-     * Returns the signer.
+-     * 

+-     * Note, however, the signer configured for S3 is incomplete at this stage
+-     * as the information on the S3 bucket and key is not yet known.
+-     */
+-    @Deprecated
+-    protected Signer getSigner() {
+-        return signerProvider.getSigner(SignerProviderContext.builder().build());
+-    }
+-
+-    /**
+-     * @return Current SignerProvider instance.
+-     */
+-    @SdkProtectedApi
+-    protected SignerProvider getSignerProvider() {
+-        return signerProvider;
+-    }
+-
+-    /**
+-     * Overrides the default endpoint for this client. Callers can use this
+-     * method to control which AWS region they want to work with.
+-     * 

+-     * This method is not threadsafe. Endpoints should be configured when the
+-     * client is created and before any service requests are made. Changing it
+-     * afterwards creates inevitable race conditions for any service requests in
+-     * transit.
+-     * 

+-     * Callers can pass in just the endpoint (ex: "ec2.amazonaws.com") or a full
+-     * URL, including the protocol (ex: "https://ec2.amazonaws.com"). If the
+-     * protocol is not specified here, the default protocol from this client's
+-     * {@link ClientConfiguration} will be used, which by default is HTTPS.
+-     * 

+-     * For more information on using AWS regions with the AWS SDK for Java, and
+-     * a complete list of all available endpoints for all AWS services, see:
+-     * 
+-     * http://developer.amazonwebservices.com/connect/entry.jspa?externalID=3912
+-     *
+-     * @param endpoint
+-     *            The endpoint (ex: "ec2.amazonaws.com") or a full URL,
+-     *            including the protocol (ex: "https://ec2.amazonaws.com") of
+-     *            the region specific AWS endpoint this client will communicate
+-     *            with.
+-     * @throws IllegalArgumentException
+-     *             If any problems are detected with the specified endpoint.
+-     *
+-     * @deprecated use {@link AwsClientBuilder#setEndpointConfiguration(AwsClientBuilder.EndpointConfiguration)} for example:
+-     * {@code builder.setEndpointConfiguration(new EndpointConfiguration(endpoint, signingRegion));}
+-     */
+-    @Deprecated
+-    public void setEndpoint(String endpoint) throws IllegalArgumentException {
+-        checkMutability();
+-        URI uri = toURI(endpoint);
+-        Signer signer = computeSignerByURI(uri, signerRegionOverride, false);
+-        synchronized (this) {
+-            this.endpoint = uri;
+-            this.signerProvider = createSignerProvider(signer);
+-            this.signingRegion = AwsHostNameUtils.parseRegion(endpoint, getEndpointPrefix());
+-        }
+-    }
+-
+-    /** Returns the endpoint as a URI. */
+-    private URI toURI(String endpoint) throws IllegalArgumentException {
+-        return RuntimeHttpUtils.toUri(endpoint, clientConfiguration);
+-    }
+-
+-    /**
+-     * Allows specifying the endpoint along with signing information (service name and signing region). This method will
+-     * overwrite any information set previously by any set/with/configure Region/Endpoint methods.
+-     * 

+-     * Overrides the default endpoint for this client
+-     * ("http://dynamodb.us-east-1.amazonaws.com/") and explicitly provides an
+-     * AWS region ID and AWS service name to use when the client calculates a
+-     * signature for requests. In almost all cases, this region ID and service
+-     * name are automatically determined from the endpoint, and callers should
+-     * use the simpler one-argument form of setEndpoint instead of this method.
+-     * 

+-     * Callers can pass in just the endpoint (ex:
+-     * "dynamodb.us-east-1.amazonaws.com/") or a full URL, including the
+-     * protocol (ex: "http://dynamodb.us-east-1.amazonaws.com/"). If the
+-     * protocol is not specified here, the default protocol from this client's
+-     * {@link ClientConfiguration} will be used, which by default is HTTPS.
+-     * 

+-     * For more information on using AWS regions with the AWS SDK for Java, and
+-     * a complete list of all available endpoints for all AWS services, see:  http://developer.amazonwebservices.com/connect/entry.jspa?externalID=
+-     * 3912
+-     *
+-     * @param endpoint
+-     *            The endpoint (ex: "dynamodb.us-east-1.amazonaws.com/") or a
+-     *            full URL, including the protocol (ex:
+-     *            "http://dynamodb.us-east-1.amazonaws.com/") of the region
+-     *            specific AWS endpoint this client will communicate with.
+-     * @param serviceName
+-     *            This parameter is ignored.
+-     * @param regionId
+-     *            The ID of the region in which this service resides AND the
+-     *            overriding region for signing purposes.
+-     *
+-     * @throws IllegalArgumentException
+-     *             If any problems are detected with the specified endpoint.
+-     * @deprecated Please use the client builders instead. The
+-     * {@link AwsClientBuilder#withEndpointConfiguration(AwsClientBuilder.EndpointConfiguration)} method on the builder allows
+-     * setting both endpoint and signing region. See
+-     * Creating Service Clients
+-     * for more information.
+-     */
+-    @Deprecated
+-    public void setEndpoint(String endpoint, String serviceName, String regionId) {
+-        URI uri = toURI(endpoint);
+-        Signer signer = computeSignerByServiceRegion(serviceName, regionId,
+-                                                     regionId, true);
+-        synchronized (this) {
+-            setServiceNameIntern(serviceName);
+-            this.signerProvider = createSignerProvider(signer);
+-            this.endpoint = uri;
+-            this.signerRegionOverride = regionId;
+-            this.signingRegion = regionId;
+-        }
+-    }
+-
+-    /**
+-     * Returns the signer based on the given URI and the current AWS client
+-     * configuration. Currently only the SQS client can have different region on
+-     * a per request basis. For other AWS clients, the region remains the same
+-     * on a per AWS client level.
+-     * 

+-     * Note, however, the signer returned for S3 is incomplete at this stage as
+-     * the information on the S3 bucket and key is not yet known.
+-     */
+-    public Signer getSignerByURI(URI uri) {
+-        return computeSignerByURI(uri, signerRegionOverride, true);
+-    }
+-
+-    /**
+-     * Returns the signer for the given uri and the current client
+-     * configuration.
+-     * 

+-     * Note, however, the signer returned for S3 is incomplete at this stage as
+-     * the information on the S3 bucket and key is not yet known.
+-     *
+-     * @param signerRegionOverride
+-     *            the overriding signer region; or null if there is none.
+-     * @param isRegionIdAsSignerParam
+-     *            true if the "regionId" is used to configure the signer if
+-     *            applicable; false if this method is called for the purpose of
+-     *            purely setting the communication end point of this AWS client,
+-     *            and therefore the "regionId" parameter will not be used
+-     *            directly for configuring the signer.
+-     */
+-    private Signer computeSignerByURI(URI uri, String signerRegionOverride,
+-            boolean isRegionIdAsSignerParam) {
+-        if (uri == null) {
+-            throw new IllegalArgumentException(
+-                    "Endpoint is not set. Use setEndpoint to set an endpoint before performing any request.");
+-        }
+-        String service = getServiceNameIntern();
+-        String region = AwsHostNameUtils.parseRegionName(uri.getHost(), getEndpointPrefix());
+-        return computeSignerByServiceRegion(
+-                service, region, signerRegionOverride, isRegionIdAsSignerParam);
+-    }
+-
+-    /**
+-     * Returns the signer for the given service name, region id, and the current
+-     * client configuration.
+-     * 

+-     * Note, however, the signer returned for S3 is incomplete at this stage as
+-     * the information on the S3 bucket and key is not yet known.
+-     *
+-     * @param regionId
+-     *            the region for sending AWS requests
+-     * @param signerRegionOverride
+-     *            the overriding signer region; or null if there is none.
+-     * @param isRegionIdAsSignerParam
+-     *            true if the "regionId" is used to configure the signer if
+-     *            applicable; false if this method is called for the purpose of
+-     *            purely setting the communication end point of this AWS client,
+-     *            and therefore the "regionId" parameter will not be used
+-     *            directly for configuring the signer.
+-     */
+-    private Signer computeSignerByServiceRegion(
+-            String serviceName, String regionId,
+-            String signerRegionOverride,
+-            boolean isRegionIdAsSignerParam) {
+-        String signerType = clientConfiguration.getSignerOverride();
+-        Signer signer = signerType == null
+-             ? SignerFactory.getSigner(serviceName, regionId)
+-             : SignerFactory.getSignerByTypeAndService(signerType, serviceName)
+-             ;
+-
+-        if (signer instanceof RegionAwareSigner) {
+-             // Overrides the default region computed
+-             RegionAwareSigner regionAwareSigner = (RegionAwareSigner)signer;
+-            // (signerRegionOverride != null) means that it is likely to be AWS
+-            // internal dev work, as "signerRegionOverride" is typically null
+-             // when used in the external release
+-             if (signerRegionOverride != null)
+-                 regionAwareSigner.setRegionName(signerRegionOverride);
+-             else if (regionId != null && isRegionIdAsSignerParam)
+-                 regionAwareSigner.setRegionName(regionId);
+-         }
+-
+-         if (signer instanceof EndpointPrefixAwareSigner) {
+-             EndpointPrefixAwareSigner endpointPrefixAwareSigner = (EndpointPrefixAwareSigner) signer;
+-             /*
+-              * This will be used to compute the region name required for signing
+-              * if signerRegionOverride is not provided
+-              */
+-             endpointPrefixAwareSigner.setEndpointPrefix(endpointPrefix);
+-         }
+-
+-         return signer;
+-    }
+-
+-    /**
+-     * An alternative to {@link AmazonWebServiceClient#setEndpoint(String)}, sets the regional
+-     * endpoint for this client's service calls. Callers can use this method to control which AWS
+-     * region they want to work with.
+-     * 

+-     * This method is not threadsafe. A region should be configured when the client is created
+-     * and before any service requests are made. Changing it afterwards creates inevitable race
+-     * conditions for any service requests in transit or retrying.
+-     * 

+-     * By default, all service endpoints in all regions use the https protocol. To use http instead,
+-     * specify it in the {@link ClientConfiguration} supplied at construction.
+-     *
+-     * @param region
+-     *            The region this client will communicate with. See
+-     *            {@link Region#getRegion(com.amazonaws.regions.Regions)} for accessing a given
+-     *            region.
+-     * @throws java.lang.IllegalArgumentException
+-     *             If the given region is null, or if this service isn't available in the given
+-     *             region. See {@link Region#isServiceSupported(String)}
+-     * @see Region#getRegion(com.amazonaws.regions.Regions)
+-     * @see Region#createClient(Class, com.amazonaws.auth.AWSCredentialsProvider,
+-     *      ClientConfiguration)
+-     * @deprecated use {@link AwsClientBuilder#setRegion(String)}
+-     */
+-    @Deprecated
+-    public void setRegion(Region region) throws IllegalArgumentException {
+-        checkMutability();
+-        if (region == null) {
+-            throw new IllegalArgumentException("No region provided");
+-        }
+-        final String serviceNameForEndpoint = getEndpointPrefix();
+-        final String serviceNameForSigner = getServiceNameIntern();
+-        URI uri = new DefaultServiceEndpointBuilder(serviceNameForEndpoint, clientConfiguration.getProtocol()
+-                .toString()).withRegion(region).getServiceEndpoint();
+-        Signer signer = computeSignerByServiceRegion(serviceNameForSigner, region.getName(), signerRegionOverride, false);
+-        synchronized (this) {
+-            this.endpoint = uri;
+-            this.signerProvider = createSignerProvider(signer);
+-            this.signingRegion = AwsHostNameUtils.parseRegion(endpoint.toString(), getEndpointPrefix());
+-        }
+-    }
+-
+-    /**
+-     * Convenient method for setting region.
+-     *
+-     * @param region region to set to; must not be null.
+-     *
+-     * @see #setRegion(Region)
+-     * @deprecated use {@link AwsClientBuilder#setRegion(String)}
+-     */
+-    @Deprecated
+-    public final void configureRegion(Regions region) {
+-        checkMutability();
+-        if (region == null)
+-            throw new IllegalArgumentException("No region provided");
+-        this.setRegion(Region.getRegion(region));
+-    }
+-
+-    /**
+-     * Shuts down this client object, releasing any resources that might be held
+-     * open. This is an optional method, and callers are not expected to call
+-     * it, but can if they want to explicitly release any open resources. Once a
+-     * client has been shutdown, it should not be used to make any more
+-     * requests.
+-     */
+-    public void shutdown() {
+-        client.shutdown();
+-    }
+-
+-    /**
+-     * @deprecated by {@link #addRequestHandler(RequestHandler2)}.
+-     *
+-     * Appends a request handler to the list of registered handlers that are run
+-     * as part of a request's lifecycle.
+-     *
+-     * @param requestHandler
+-     *            The new handler to add to the current list of request
+-     *            handlers.
+-     */
+-    @Deprecated
+-    public void addRequestHandler(RequestHandler requestHandler) {
+-        checkMutability();
+-        requestHandler2s.add(RequestHandler2.adapt(requestHandler));
+-    }
+-
+-    /**
+-     * Appends a request handler to the list of registered handlers that are run
+-     * as part of a request's lifecycle.
+-     *
+-     * @param requestHandler2
+-     *            The new handler to add to the current list of request
+-     *            handlers.
+-     * @deprecated use {@link AwsClientBuilder#withRequestHandlers(RequestHandler2...)}
+-     */
+-    @Deprecated
+-    public void addRequestHandler(RequestHandler2 requestHandler2) {
+-        checkMutability();
+-        requestHandler2s.add(requestHandler2);
+-    }
+-
+-    /**
+-     * Removes a request handler from the list of registered handlers that are run
+-     * as part of a request's lifecycle.
+-     *
+-     * @param requestHandler
+-     *            The handler to remove from the current list of request
+-     *            handlers.
+-     * @deprecated use {@link AwsClientBuilder#withRequestHandlers(RequestHandler2...)}
+-     */
+-    @Deprecated
+-    public void removeRequestHandler(RequestHandler requestHandler) {
+-        checkMutability();
+-        requestHandler2s.remove(RequestHandler2.adapt(requestHandler));
+-    }
+-
+-    /**
+-     * @deprecated use {@link AwsClientBuilder#withRequestHandlers(RequestHandler2...)}
+-     */
+-    @Deprecated
+-    public void removeRequestHandler(RequestHandler2 requestHandler2) {
+-        checkMutability();
+-        requestHandler2s.remove(requestHandler2);
+-    }
+-
+-    /**
+-     * Runs the {@code beforeMarshalling} method of any
+-     * {@code RequestHandler2}s associated with this client.
+-     *
+-     * @param request the request passed in from the user
+-     * @return the (possibly different) request to marshal
+-     */
+-    @SuppressWarnings("unchecked")
+-    protected final  T beforeMarshalling(
+-            T request) {
+-
+-        T local = request;
+-        for (RequestHandler2 handler : requestHandler2s) {
+-            local = (T) handler.beforeMarshalling(local);
+-        }
+-        return local;
+-    }
+-
+-    protected ExecutionContext createExecutionContext(AmazonWebServiceRequest req) {
+-        return createExecutionContext(req, signerProvider);
+-    }
+-
+-    protected ExecutionContext createExecutionContext(AmazonWebServiceRequest req,
+-                                                      SignerProvider signerProvider) {
+-        boolean isMetricsEnabled = isRequestMetricsEnabled(req) || isProfilingEnabled();
+-        return ExecutionContext.builder()
+-                .withRequestHandler2s(requestHandler2s)
+-                .withUseRequestMetrics(isMetricsEnabled)
+-                .withAwsClient(this)
+-                .withSignerProvider(signerProvider).build();
+-    }
+-
+-    protected final ExecutionContext createExecutionContext(Request req) {
+-        return createExecutionContext(req.getOriginalRequest());
+-    }
+-
+-    protected SignerProvider createSignerProvider(Signer signer) {
+-        return new DefaultSignerProvider(this, signer);
+-    }
+-
+-    /* Check the profiling system property and return true if set */
+-    protected static boolean isProfilingEnabled() {
+-        return System.getProperty(PROFILING_SYSTEM_PROPERTY) != null;
+-    }
+-
+-    /**
+-     * Returns true if request metric collection is applicable to the given
+-     * request; false otherwise.
+-     */
+-    protected final boolean isRequestMetricsEnabled(AmazonWebServiceRequest req) {
+-        RequestMetricCollector c = req.getRequestMetricCollector(); // request level collector
+-        if (c != null && c.isEnabled()) {
+-            return true;
+-        }
+-        return isRMCEnabledAtClientOrSdkLevel();
+-    }
+-
+-    /**
+-     * Returns true if request metric collection is enabled at the service
+-     * client or AWS SDK level request; false otherwise.
+-     */
+-    private boolean isRMCEnabledAtClientOrSdkLevel() {
+-        RequestMetricCollector c = requestMetricCollector();
+-        return c != null && c.isEnabled();
+-    }
+-
+-    /**
+-     * Sets the optional value for time offset for this client.  This
+-     * value will be applied to all requests processed through this client.
+-     * Value is in seconds, positive values imply the current clock is "fast",
+-     * negative values imply clock is slow.
+-     *
+-     * @param timeOffset
+-     *            The optional value for time offset (in seconds) for this client.
+-     */
+-    public void setTimeOffset(int timeOffset) {
+-        checkMutability();
+-        this.timeOffset = timeOffset;
+-    }
+-
+-    /**
+-     * Sets the optional value for time offset for this client.  This
+-     * value will be applied to all requests processed through this client.
+-     * Value is in seconds, positive values imply the current clock is "fast",
+-     * negative values imply clock is slow.
+-     *
+-     * @param timeOffset
+-     *            The optional value for time offset (in seconds) for this client.
+-     *
+-     * @return the updated web service client
+-     */
+-    public AmazonWebServiceClient withTimeOffset(int timeOffset) {
+-        checkMutability();
+-        setTimeOffset(timeOffset);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the optional value for time offset for this client.  This
+-     * value will be applied to all requests processed through this client.
+-     * Value is in seconds, positive values imply the current clock is "fast",
+-     * negative values imply clock is slow.
+-     *
+-     * @return The optional value for time offset (in seconds) for this client.
+-     */
+-    public int getTimeOffset() {
+-        return timeOffset;
+-    }
+-
+-    /**
+-     * Returns the client specific {@link RequestMetricCollector}; or null if
+-     * there is none.
+-     */
+-    public RequestMetricCollector getRequestMetricsCollector() {
+-        return client.getRequestMetricCollector();
+-    }
+-
+-    /**
+-     * Returns the client specific request metric collector if there is one; or
+-     * the one at the AWS SDK level otherwise.
+-     */
+-    protected RequestMetricCollector requestMetricCollector() {
+-        RequestMetricCollector mc = client.getRequestMetricCollector();
+-        return mc == null ? AwsSdkMetrics.getRequestMetricCollector() : mc;
+-    }
+-
+-    /**
+-     * Returns the most specific request metric collector, starting from the request level, then
+-     * client level, then finally the AWS SDK level.
+-     */
+-    private final RequestMetricCollector findRequestMetricCollector(
+-            RequestMetricCollector reqLevelMetricsCollector) {
+-        if (reqLevelMetricsCollector != null) {
+-            return reqLevelMetricsCollector;
+-        } else if (getRequestMetricsCollector() != null) {
+-            return getRequestMetricsCollector();
+-        } else {
+-            return AwsSdkMetrics.getRequestMetricCollector();
+-        }
+-    }
+-
+-    /**
+-     * Notify request handlers that we are about to start execution.
+-     */
+-    protected final  T beforeClientExecution(T request) {
+-        T local = request;
+-        for (RequestHandler2 handler : requestHandler2s) {
+-            local = (T) handler.beforeExecution(local);
+-        }
+-        return local;
+-    }
+-
+-    /**
+-     * Convenient method to end the client execution without logging the
+-     * awsRequestMetrics.
+-     */
+-    protected final void endClientExecution(
+-            AWSRequestMetrics awsRequestMetrics, Request request,
+-            Response response) {
+-        this.endClientExecution(awsRequestMetrics, request, response,
+-                !LOGGING_AWS_REQUEST_METRIC);
+-    }
+-
+-    /**
+-     * Common routine to end a client AWS request/response execution and collect
+-     * the request metrics.  Caller of this routine is responsible for starting
+-     * the event for {@link Field#ClientExecuteTime} and call this method
+-     * in a try-finally block.
+-     *
+-     * @param loggingAwsRequestMetrics deprecated and ignored
+-     */
+-    protected final void endClientExecution(
+-            AWSRequestMetrics awsRequestMetrics, Request request,
+-            Response response, @Deprecated boolean loggingAwsRequestMetrics) {
+-        if (request != null) {
+-            awsRequestMetrics.endEvent(Field.ClientExecuteTime);
+-            awsRequestMetrics.getTimingInfo().endTiming();
+-            RequestMetricCollector c = findRequestMetricCollector(
+-                    request.getOriginalRequest().getRequestMetricCollector());
+-            c.collectMetrics(request, response);
+-            awsRequestMetrics.log();
+-        }
+-    }
+-
+-    /**
+-     * @deprecated by {@link #getServiceName()}.
+-     */
+-    @Deprecated
+-    protected String getServiceAbbreviation() {
+-        return getServiceNameIntern();
+-    }
+-
+-    /**
+-     * Returns the service abbreviation for this service, used for identifying
+-     * service endpoints by region, identifying the necessary signer, etc.
+-     * Used to be call "getServiceAbbreviation".
+-     */
+-    public String getServiceName() {
+-        return getServiceNameIntern();
+-    }
+-
+-    /**
+-     * @return the service name that should be used when computing the region
+-     *         endpoints. This method returns the value of the
+-     *         regionMetadataServiceName configuration in the internal config
+-     *         file if such configuration is specified for the current client,
+-     *         otherwise it returns the same service name that is used for
+-     *         request signing.
+-     */
+-    public String getEndpointPrefix() {
+-        if (endpointPrefix != null) {
+-            return endpointPrefix;
+-        }
+-
+-        String httpClientName = getHttpClientName();
+-        String serviceNameInRegionMetadata = ServiceNameFactory.
+-                getServiceNameInRegionMetadata(httpClientName);
+-
+-        synchronized (this) {
+-            if (endpointPrefix != null) {
+-                return endpointPrefix;
+-            }
+-            if (serviceNameInRegionMetadata != null) {
+-                return endpointPrefix = serviceNameInRegionMetadata;
+-            } else {
+-                return endpointPrefix = getServiceNameIntern();
+-            }
+-        }
+-    }
+-
+-    /**
+-     * @return The region used to sign requests with AWS SigV4 auth.
+-     */
+-    @SdkProtectedApi
+-    protected String getSigningRegion() {
+-        return this.signingRegion;
+-    }
+-
+-    /**
+-     * An internal method used to explicitly override the service name for region metadata.
+-     * This service name is used to compute the region endpoints.
+-     */
+-    protected void setEndpointPrefix(String endpointPrefix) {
+-        if (endpointPrefix == null) {
+-            throw new IllegalArgumentException(
+-                    "The parameter endpointPrefix must be specified!");
+-        }
+-        this.endpointPrefix = endpointPrefix;
+-    }
+-
+-    /**
+-     * Internal method for implementing {@link #getServiceName()}. Method is
+-     * protected by intent so peculiar subclass that don't follow the class
+-     * naming convention can choose to return whatever service name as needed.
+-     */
+-    protected String getServiceNameIntern() {
+-        if (serviceName == null) {
+-            synchronized (this) {
+-                if (serviceName == null) {
+-                    return serviceName = computeServiceName();
+-                }
+-            }
+-        }
+-        return serviceName;
+-    }
+-
+-    /**
+-     * An internal method used to explicitly override the service name
+-     * computed by the default implementation. This method is not expected to be
+-     * normally called except for AWS internal development purposes.
+-     */
+-    public final void setServiceNameIntern(String serviceName) {
+-        if (serviceName == null)
+-            throw new IllegalArgumentException(
+-                    "The parameter serviceName must be specified!");
+-        this.serviceName = serviceName;
+-    }
+-
+-    /**
+-     * Returns the service name of this AWS http client by first looking it up from the SDK internal
+-     * configuration, and if not found, derive it from the class name of the immediate subclass of
+-     * {@link AmazonWebServiceClient}. No configuration is necessary if the simple class name of the
+-     * http client follows the convention of (Amazon|AWS).*(JavaClient|Client).
+-     */
+-    private String computeServiceName() {
+-        final String httpClientName = getHttpClientName();
+-        String service = ServiceNameFactory.getServiceName(httpClientName);
+-        if (service != null) {
+-            return service; // only if it is so explicitly configured
+-        }
+-        // Otherwise, make use of convention over configuration
+-        int j = httpClientName.indexOf("JavaClient");
+-        if (j == -1) {
+-            j = httpClientName.indexOf("Client");
+-            if (j == -1) {
+-                throw new IllegalStateException(
+-                        "Unrecognized suffix for the AWS http client class name " + httpClientName);
+-            }
+-        }
+-        int i = httpClientName.indexOf(AMAZON);
+-        int len;
+-        if (i == -1) {
+-            i = httpClientName.indexOf(AWS);
+-            if (i == -1) {
+-                throw new IllegalStateException(
+-                        "Unrecognized prefix for the AWS http client class name " + httpClientName);
+-            }
+-            len = AWS.length();
+-        } else {
+-            len = AMAZON.length();
+-        }
+-        if (i >= j) {
+-            throw new IllegalStateException(
+-                    "Unrecognized AWS http client class name " + httpClientName);
+-        }
+-        String serviceName = httpClientName.substring(i + len, j);
+-        return StringUtils.lowerCase(serviceName);
+-    }
+-
+-    private String getHttpClientName() {
+-        Class httpClientClass = Classes.childClassOf(AmazonWebServiceClient.class, this);
+-        return httpClientClass.getSimpleName();
+-    }
+-
+-    /**
+-     * Returns the signer region override.
+-     *
+-     * @see #setSignerRegionOverride(String).
+-     */
+-    public final String getSignerRegionOverride() {
+-        return signerRegionOverride;
+-    }
+-
+-    /**
+-     * An internal method used to explicitly override the internal signer region
+-     * computed by the default implementation. This method is not expected to be
+-     * normally called except for AWS internal development purposes.
+-     */
+-    public final void setSignerRegionOverride(String signerRegionOverride) {
+-        checkMutability();
+-        Signer signer = computeSignerByURI(endpoint, signerRegionOverride, true);
+-        synchronized(this)  {
+-            this.signerRegionOverride = signerRegionOverride;
+-            this.signerProvider = createSignerProvider(signer);
+-            this.signingRegion = signerRegionOverride;
+-        }
+-    }
+-
+-    /**
+-     * Fluent method for {@link #setRegion(Region)}.
+-     *
+-     * Example:
+-     *
+-     *   AmazonDynamoDBClient client = new AmazonDynamoDBClient(...).withRegion(...);
+-     *

+-     * @see #setRegion(Region)
+-     * @deprecated use {@link AwsClientBuilder#withRegion(Region)} for example:
+-     * {@code AmazonSNSClientBuilder.standard().withRegion(region).build();}
+-     */
+-    @Deprecated
+-    public  T withRegion(Region region) {
+-        setRegion(region);
+-        @SuppressWarnings("unchecked") T t= (T)this;
+-        return t;
+-    }
+-
+-    /**
+-     * Convenient fluent method for setting region.
+-     *
+-     * @param region region to set to; must not be null.
+-     *
+-     * @see #withRegion(Region)
+-     * @deprecated use {@link AwsClientBuilder#withRegion(Regions)} for example:
+-     * {@code AmazonSNSClientBuilder.standard().withRegion(region).build();}
+-     */
+-    @Deprecated
+-    public  T withRegion(Regions region) {
+-        configureRegion(region);
+-        @SuppressWarnings("unchecked") T t= (T)this;
+-        return t;
+-    }
+-    /**
+-     * Fluent method for {@link #setEndpoint(String)}.
+-     *
+-     * Example:
+-     *
+-     *   AmazonDynamoDBClient client = new AmazonDynamoDBClient(...).withEndPoint(...);
+-     *

+-     * @see #setEndpoint(String)
+-     * @deprecated use {@link AwsClientBuilder#withEndpointConfiguration(AwsClientBuilder.EndpointConfiguration)} for example:
+-     * {@code AmazonSNSClientBuilder.standard().withEndpointConfiguration(new EndpointConfiguration(endpoint, signingRegion)).build();}
+-     */
+-    @Deprecated
+-    public  T withEndpoint(String endpoint) {
+-        setEndpoint(endpoint);
+-        @SuppressWarnings("unchecked") T t= (T)this;
+-        return t;
+-    }
+-
+-    /**
+-     * Internal only API to lock a client's mutable methods. Only intended for use by the fluent
+-     * builders.
+-     */
+-    @Deprecated
+-    @SdkInternalApi
+-    public final void makeImmutable() {
+-        this.isImmutable = true;
+-    }
+-
+-    /**
+-     * If the client has been marked as immutable then throw an {@link
+-     * UnsupportedOperationException}, otherwise do nothing. Should be called by each mutating
+-     * method.
+-     */
+-    @SdkProtectedApi
+-    protected final void checkMutability() {
+-        if (isImmutable) {
+-            throw new UnsupportedOperationException(
+-                    "Client is immutable when created with the builder.");
+-        }
+-    }
+-
+-    /**
+-     * Hook to allow S3 client to disable strict hostname verification since it uses wildcard
+-     * certificates.
+-     *
+-     * @return True if strict hostname verification should be used, false otherwise.
+-     */
+-    protected boolean useStrictHostNameVerification() {
+-        return true;
+-    }
+-
+-    /**
+-     * Hook to allow clients to override CRC32 calculation behavior. Currently, only exercised by DynamoDB.
+-     *
+-     * @return True if the service returns CRC32 checksum from the compressed data, false otherwise.
+-     */
+-    protected boolean calculateCRC32FromCompressedData() {
+-        return false;
+-    }
+-
+-    public String getSignerOverride() {
+-        return clientConfiguration.getSignerOverride();
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/AmazonWebServiceRequest.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/AmazonWebServiceRequest.java
+--- ./src/main/java/com/amazonaws/AmazonWebServiceRequest.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/AmazonWebServiceRequest.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,601 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws;
+-
+-import com.amazonaws.annotation.NotThreadSafe;
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.auth.AWSCredentials;
+-import com.amazonaws.auth.AWSCredentialsProvider;
+-import com.amazonaws.event.ProgressListener;
+-import com.amazonaws.handlers.HandlerContextKey;
+-import com.amazonaws.internal.StaticCredentialsProvider;
+-import com.amazonaws.metrics.RequestMetricCollector;
+-import java.util.Collections;
+-import java.util.HashMap;
+-import java.util.LinkedList;
+-import java.util.List;
+-import java.util.Map;
+-
+-/**
+- * Base class for all user facing web service requests.
+- */
+-@NotThreadSafe
+-public abstract class AmazonWebServiceRequest implements Cloneable, ReadLimitInfo, HandlerContextAware {
+-
+-    public static final AmazonWebServiceRequest NOOP = new AmazonWebServiceRequest() {
+-    };
+-
+-    /**
+-     * The optional progress listener for receiving updates about the progress of the request.
+-     */
+-    private ProgressListener progressListener = ProgressListener.NOOP;
+-
+-    /**
+-     * Arbitrary options storage for individual {@link AmazonWebServiceRequest}s. This field is not
+-     * intended to be used by clients.
+-     */
+-    private final RequestClientOptions requestClientOptions = new RequestClientOptions();
+-
+-    /**
+-     * A request metric collector used for this specific service request; or null if there is none.
+-     * This collector always takes precedence over the ones specified at the http client level and
+-     * AWS SDK level.
+-     */
+-    private RequestMetricCollector requestMetricCollector;
+-
+-    /**
+-     * The optional credentials to use for this request - overrides the default credentials set at
+-     * the client level.
+-     */
+-    private AWSCredentialsProvider credentialsProvider;
+-
+-    /**
+-     * A map of custom header names to header values.
+-     */
+-    private Map customRequestHeaders;
+-
+-    /**
+-     * Custom query parameters for the request.
+-     */
+-    private Map> customQueryParameters;
+-
+-    /**
+-     * User-defined context for the request.
+-     */
+-    private transient Map, Object> handlerContext = new HashMap, Object>();
+-
+-    /**
+-     * The source object from which the current object was cloned; or null if there isn't one.
+-     */
+-    private AmazonWebServiceRequest cloneSource;
+-
+-    private Integer sdkRequestTimeout = null;
+-
+-    private Integer sdkClientExecutionTimeout = null;
+-
+-    /**
+-     * Sets the optional credentials to use for this request, overriding the default credentials set at the client level.
+-     *
+-     * @param credentials The optional AWS security credentials to use for this request, overriding the default credentials set at
+-     *                    the client level.
+-     * @deprecated by {@link #setRequestCredentialsProvider(AWSCredentialsProvider)}. If you must use {@link AWSCredentials} you
+-     * can wrap it with a {@link com.amazonaws.auth.AWSStaticCredentialsProvider}.
+-     */
+-    @Deprecated
+-    public void setRequestCredentials(AWSCredentials credentials) {
+-        this.credentialsProvider = credentials == null ? null : new StaticCredentialsProvider(credentials);
+-    }
+-
+-    /**
+-     * Returns the optional credentials to use to sign this request, overriding the default
+-     * credentials set at the client level.
+-     *
+-     * @return The optional credentials to use to sign this request, overriding the default
+-     *         credentials set at the client level.
+-     *
+-     * @deprecated by {@link #getRequestCredentialsProvider()}
+-     */
+-    @Deprecated
+-    public AWSCredentials getRequestCredentials() {
+-        return credentialsProvider == null ? null : credentialsProvider.getCredentials();
+-    }
+-
+-    /**
+-     * Sets the optional credentials provider to use for this request, overriding the default credentials
+-     * provider at the client level.
+-     *
+-     * @param credentialsProvider
+-     *            The optional AWS security credentials provider to use for this request, overriding the
+-     *            default credentials provider at the client level.
+-     */
+-    public void setRequestCredentialsProvider(AWSCredentialsProvider credentialsProvider) {
+-        this.credentialsProvider = credentialsProvider;
+-    }
+-
+-    /**
+-     * Returns the optional credentials provider to use to sign this request, overriding the default
+-     * credentials provider at the client level.
+-     *
+-     * @return The optional credentials provider to use to sign this request, overriding the default
+-     *         credentials provider at the client level.
+-     */
+-    public AWSCredentialsProvider getRequestCredentialsProvider() {
+-        return credentialsProvider;
+-    }
+-
+-    /**
+-     * Sets the optional credentials provider to use for this request, overriding the default credentials
+-     * provider at the client level.
+-     *
+-     * @param credentialsProvider
+-     *            The optional AWS security credentials provider to use for this request, overriding the
+-     *            default credentials provider at the client level.
+-     * @return A reference to this updated object so that method calls can be chained together.
+-     */
+-    public  T withRequestCredentialsProvider(final AWSCredentialsProvider credentialsProvider) {
+-        setRequestCredentialsProvider(credentialsProvider);
+-        @SuppressWarnings("unchecked")
+-        T t = (T) this;
+-        return t;
+-    }
+-
+-    /**
+-     * Gets the options stored with this request object. Intended for internal use only.
+-     */
+-    public RequestClientOptions getRequestClientOptions() {
+-        return requestClientOptions;
+-    }
+-
+-    /**
+-     * Returns a request level metric collector; or null if not specified.
+-     */
+-    public RequestMetricCollector getRequestMetricCollector() {
+-        return requestMetricCollector;
+-    }
+-
+-    /**
+-     * Sets a request level request metric collector which takes precedence over the ones at the
+-     * http client level and AWS SDK level.
+-     */
+-    public void setRequestMetricCollector(RequestMetricCollector requestMetricCollector) {
+-        this.requestMetricCollector = requestMetricCollector;
+-    }
+-
+-    /**
+-     * Specifies a request level metric collector which takes precedence over the ones at the http
+-     * client level and AWS SDK level.
+-     */
+-    public  T withRequestMetricCollector(RequestMetricCollector metricCollector) {
+-        setRequestMetricCollector(metricCollector);
+-        @SuppressWarnings("unchecked")
+-        T t = (T) this;
+-        return t;
+-    }
+-
+-    /**
+-     * Sets the optional progress listener for receiving updates about the progress of the request.
+-     *
+-     * @param progressListener
+-     *            The new progress listener.
+-     */
+-    public void setGeneralProgressListener(ProgressListener progressListener) {
+-        this.progressListener = progressListener == null ? ProgressListener.NOOP : progressListener;
+-    }
+-
+-    /**
+-     * Returns the optional progress listener for receiving updates about the progress of the
+-     * request.
+-     *
+-     * @return the optional progress listener for receiving updates about the progress of the
+-     *         request.
+-     */
+-    public ProgressListener getGeneralProgressListener() {
+-        return progressListener;
+-    }
+-
+-    /**
+-     * Sets the optional progress listener for receiving updates about the progress of the request,
+-     * and returns a reference to this object so that method calls can be chained together.
+-     *
+-     * @param progressListener
+-     *            The new progress listener.
+-     * @return A reference to this updated object so that method calls can be chained together.
+-     */
+-    public  T withGeneralProgressListener(ProgressListener progressListener) {
+-        setGeneralProgressListener(progressListener);
+-        @SuppressWarnings("unchecked")
+-        T t = (T) this;
+-        return t;
+-    }
+-
+-    /**
+-     * Returns an immutable map of custom header names to header values.
+-     *
+-     * @return The immutable map of custom header names to header values.
+-     */
+-    public Map getCustomRequestHeaders() {
+-        if (customRequestHeaders == null) {
+-            return null;
+-        }
+-        return Collections.unmodifiableMap(customRequestHeaders);
+-    }
+-
+-    /**
+-     * Put a new custom header to the map of custom header names to custom header values, and return
+-     * the previous value if the header has already been set in this map.
+-     * 

+-     * Any custom headers that are defined are used in the HTTP request to the AWS service. These
+-     * headers will be silently ignored in the event that AWS does not recognize them.
+-     * 

+-     * NOTE: Custom header values set via this method will overwrite any conflicting values coming
+-     * from the request parameters.
+-     *
+-     * @param name
+-     *            The name of the header to add
+-     * @param value
+-     *            The value of the header to add
+-     * @return the previous value for the name if it was set, null otherwise
+-     */
+-    public String putCustomRequestHeader(String name, String value) {
+-        if (customRequestHeaders == null) {
+-            customRequestHeaders = new HashMap();
+-        }
+-        return customRequestHeaders.put(name, value);
+-    }
+-
+-    /**
+-     * @return the immutable map of custom query parameters. The parameter value is modeled as a
+-     *         list of strings because multiple values can be specified for the same parameter name.
+-     */
+-    public Map> getCustomQueryParameters() {
+-        if (customQueryParameters == null) {
+-            return null;
+-        }
+-        return Collections.unmodifiableMap(customQueryParameters);
+-    }
+-
+-    /**
+-     * Add a custom query parameter for the request. Since multiple values are allowed for the same
+-     * query parameter, this method does NOT overwrite any existing parameter values in the request.
+-     * 

+-     * Any custom query parameters that are defined are used in the HTTP request to the AWS service.
+-     *
+-     * @param name
+-     *            The name of the query parameter
+-     * @param value
+-     *            The value of the query parameter. Only the parameter name will be added in the URI
+-     *            if the value is set to null. For example, putCustomQueryParameter("param", null)
+-     *            will be serialized to "?param", while putCustomQueryParameter("param", "") will be
+-     *            serialized to "?param=".
+-     */
+-    public void putCustomQueryParameter(String name, String value) {
+-        if (customQueryParameters == null) {
+-            customQueryParameters = new HashMap>();
+-        }
+-        List paramList = customQueryParameters.get(name);
+-        if (paramList == null) {
+-            paramList = new LinkedList();
+-            customQueryParameters.put(name, paramList);
+-        }
+-        paramList.add(value);
+-    }
+-
+-    @Override
+-    public final int getReadLimit() {
+-        return requestClientOptions.getReadLimit();
+-    }
+-
+-    /**
+-     * Copies the internal state of this base class to that of the target request.
+-     *
+-     * @return the target request
+-     */
+-    protected final  T copyBaseTo(T target) {
+-        if (customRequestHeaders != null) {
+-            for (Map.Entry e : customRequestHeaders.entrySet())
+-                target.putCustomRequestHeader(e.getKey(), e.getValue());
+-        }
+-        if (customQueryParameters != null) {
+-            for (Map.Entry> e : customQueryParameters.entrySet()) {
+-                if (e.getValue() != null) {
+-                    for (String value : e.getValue()) {
+-                        target.putCustomQueryParameter(e.getKey(), value);
+-                    }
+-                }
+-            }
+-        }
+-
+-        target.setRequestCredentialsProvider(credentialsProvider);
+-        target.setGeneralProgressListener(progressListener);
+-        target.setRequestMetricCollector(requestMetricCollector);
+-        requestClientOptions.copyTo(target.getRequestClientOptions());
+-        return target;
+-    }
+-
+-    /**
+-     * Returns the source object from which the current object was cloned; or null if there isn't
+-     * one.
+-     */
+-    public AmazonWebServiceRequest getCloneSource() {
+-        return cloneSource;
+-    }
+-
+-    /**
+-     * Returns the root object from which the current object was cloned; or null if there isn't one.
+-     */
+-    public AmazonWebServiceRequest getCloneRoot() {
+-        AmazonWebServiceRequest cloneRoot = cloneSource;
+-        if (cloneRoot != null) {
+-            while (cloneRoot.getCloneSource() != null) {
+-                cloneRoot = cloneRoot.getCloneSource();
+-            }
+-        }
+-        return cloneRoot;
+-    }
+-
+-    private void setCloneSource(AmazonWebServiceRequest cloneSource) {
+-        this.cloneSource = cloneSource;
+-    }
+-
+-    /**
+-     * Returns the amount of time to wait (in milliseconds) for the request to complete before
+-     * giving up and timing out. A non-positive value disables this feature.
+-     * 

+-     * This feature requires buffering the entire response (for non-streaming APIs) into memory to
+-     * enforce a hard timeout when reading the response. For APIs that return large responses this
+-     * could be expensive.
+-     * 

+-     * 

+-     * The request timeout feature doesn't have strict guarantees on how quickly a request is
+-     * aborted when the timeout is breached. The typical case aborts the request within a few
+-     * milliseconds but there may occasionally be requests that don't get aborted until several
+-     * seconds after the timer has been breached. Because of this the request timeout feature should
+-     * not be used when absolute precision is needed.
+-     * 

+-     * 

+-     * Note: This feature is not compatible with Java 1.6.
+-     * 

+-     *
+-     * @return The amount of time to wait (in milliseconds) for the request to complete before
+-     *         giving up and timing out. A non-positive value disables the timeout for this request.
+-     * @see {@link AmazonWebServiceRequest#setSdkClientExecutionTimeout(int)} to enforce a timeout
+-     *      across all retries
+-     */
+-    public Integer getSdkRequestTimeout() {
+-        return sdkRequestTimeout;
+-    }
+-
+-    /**
+-     * Sets the amount of time to wait (in milliseconds) for the request to complete before giving
+-     * up and timing out. A non-positive value disables this feature.
+-     * 

+-     * This feature requires buffering the entire response (for non-streaming APIs) into memory to
+-     * enforce a hard timeout when reading the response. For APIs that return large responses this
+-     * could be expensive.
+-     * 

+-     * 

+-     * The request timeout feature doesn't have strict guarantees on how quickly a request is
+-     * aborted when the timeout is breached. The typical case aborts the request within a few
+-     * milliseconds but there may occasionally be requests that don't get aborted until several
+-     * seconds after the timer has been breached. Because of this the request timeout feature should
+-     * not be used when absolute precision is needed.
+-     * 

+-     * 

+-     * Note: This feature is not compatible with Java 1.6.
+-     * 

+-     *
+-     * @param sdkRequestTimeout
+-     *            The amount of time to wait (in milliseconds) for the request to complete before
+-     *            giving up and timing out. A non-positive value disables the timeout for this
+-     *            request.
+-     * @see {@link AmazonWebServiceRequest#setSdkClientExecutionTimeout(int)} to enforce a timeout
+-     *      across all retries
+-     */
+-    public void setSdkRequestTimeout(int sdkRequestTimeout) {
+-        this.sdkRequestTimeout = sdkRequestTimeout;
+-    }
+-
+-    /**
+-     * Sets the amount of time to wait (in milliseconds) for the request to complete before giving
+-     * up and timing out. A non-positive value disables this feature. Returns the updated
+-     * AmazonWebServiceRequest object so that additional method calls may be chained together.
+-     * 

+-     * This feature requires buffering the entire response (for non-streaming APIs) into memory to
+-     * enforce a hard timeout when reading the response. For APIs that return large responses this
+-     * could be expensive.
+-     * 

+-     * 

+-     * The request timeout feature doesn't have strict guarantees on how quickly a request is
+-     * aborted when the timeout is breached. The typical case aborts the request within a few
+-     * milliseconds but there may occasionally be requests that don't get aborted until several
+-     * seconds after the timer has been breached. Because of this the request timeout feature should
+-     * not be used when absolute precision is needed.
+-     * 

+-     * 

+-     * Note: This feature is not compatible with Java 1.6.
+-     * 

+-     *
+-     * @param sdkRequestTimeout
+-     *            The amount of time to wait (in milliseconds) for the request to complete before
+-     *            giving up and timing out. A non-positive value disables the timeout for this
+-     *            request.
+-     * @return The updated {@link AmazonWebServiceRequest} object.
+-     * @see {@link AmazonWebServiceRequest#setSdkClientExecutionTimeout(int)} to enforce a timeout
+-     *      across all retries
+-     */
+-    public  T withSdkRequestTimeout(int sdkRequestTimeout) {
+-        setSdkRequestTimeout(sdkRequestTimeout);
+-        @SuppressWarnings("unchecked")
+-        T t = (T) this;
+-        return t;
+-    }
+-
+-    /**
+-     * Returns the amount of time (in milliseconds) to allow the client to complete the execution of
+-     * an API call. This timeout covers the entire client execution except for marshalling. This
+-     * includes request handler execution, all HTTP request including retries, unmarshalling, etc.
+-     * 

+-     * This feature requires buffering the entire response (for non-streaming APIs) into memory to
+-     * enforce a hard timeout when reading the response. For APIs that return large responses this
+-     * could be expensive.
+-     * 

+-     * 

+-     * The client execution timeout feature doesn't have strict guarantees on how quickly a request
+-     * is aborted when the timeout is breached. The typical case aborts the request within a few
+-     * milliseconds but there may occasionally be requests that don't get aborted until several
+-     * seconds after the timer has been breached. Because of this the client execution timeout
+-     * feature should not be used when absolute precision is needed.
+-     * 

+-     * 

+-     * This may be used together with {@link AmazonWebServiceRequest#setSdkRequestTimeout(int)} to
+-     * enforce both a timeout on each individual HTTP request (i.e. each retry) and the total time
+-     * spent on all requests across retries (i.e. the 'client execution' time). A non-positive value
+-     * disables this feature.
+-     * 

+-     * 

+-     * Note: This feature is not compatible with Java 1.6.
+-     * 

+-     *
+-     * @return The amount of time (in milliseconds) to allow the client to complete the execution of
+-     *         an API call. A non-positive value disables the timeout for this request.
+-     * @see {@link AmazonWebServiceRequest#setSdkRequestTimeout(int)} to enforce a timeout per HTTP
+-     *      request
+-     */
+-    public Integer getSdkClientExecutionTimeout() {
+-        return this.sdkClientExecutionTimeout;
+-    }
+-
+-    /**
+-     * Sets the amount of time (in milliseconds) to allow the client to complete the execution of
+-     * an API call. This timeout covers the entire client execution except for marshalling. This
+-     * includes request handler execution, all HTTP request including retries, unmarshalling, etc.
+-     * 

+-     * This feature requires buffering the entire response (for non-streaming APIs) into memory to
+-     * enforce a hard timeout when reading the response. For APIs that return large responses this
+-     * could be expensive.
+-     * 

+-     * 

+-     * The client execution timeout feature doesn't have strict guarantees on how quickly a request
+-     * is aborted when the timeout is breached. The typical case aborts the request within a few
+-     * milliseconds but there may occasionally be requests that don't get aborted until several
+-     * seconds after the timer has been breached. Because of this the client execution timeout
+-     * feature should not be used when absolute precision is needed.
+-     * 

+-     * 

+-     * This may be used together with {@link AmazonWebServiceRequest#setSdkRequestTimeout(int)} to
+-     * enforce both a timeout on each individual HTTP request (i.e. each retry) and the total time
+-     * spent on all requests across retries (i.e. the 'client execution' time). A non-positive value
+-     * disables this feature.
+-     * 

+-     * 

+-     * Note: This feature is not compatible with Java 1.6.
+-     * 

+-     *
+-     * @param sdkClientExecutionTimeout
+-     *            The amount of time (in milliseconds) to allow the client to complete the execution
+-     *            of an API call. A non-positive value disables the timeout for this request.
+-     * @see {@link AmazonWebServiceRequest#setSdkRequestTimeout(int)} to enforce a timeout per HTTP
+-     *      request
+-     */
+-    public void setSdkClientExecutionTimeout(int sdkClientExecutionTimeout) {
+-        this.sdkClientExecutionTimeout = sdkClientExecutionTimeout;
+-    }
+-
+-    /**
+-     * Sets the amount of time (in milliseconds) to allow the client to complete the execution of
+-     * an API call. This timeout covers the entire client execution except for marshalling. This
+-     * includes request handler execution, all HTTP request including retries, unmarshalling, etc.
+-     * 

+-     * This feature requires buffering the entire response (for non-streaming APIs) into memory to
+-     * enforce a hard timeout when reading the response. For APIs that return large responses this
+-     * could be expensive.
+-     * 

+-     * 

+-     * The client execution timeout feature doesn't have strict guarantees on how quickly a request
+-     * is aborted when the timeout is breached. The typical case aborts the request within a few
+-     * milliseconds but there may occasionally be requests that don't get aborted until several
+-     * seconds after the timer has been breached. Because of this the client execution timeout
+-     * feature should not be used when absolute precision is needed.
+-     * 

+-     * 

+-     * This may be used together with {@link AmazonWebServiceRequest#setSdkRequestTimeout(int)} to
+-     * enforce both a timeout on each individual HTTP request (i.e. each retry) and the total time
+-     * spent on all requests across retries (i.e. the 'client execution' time). A non-positive value
+-     * disables this feature.
+-     * 

+-     * 

+-     * Note: This feature is not compatible with Java 1.6.
+-     * 

+-     *
+-     * @param sdkClientExecutionTimeout
+-     *            The amount of time (in milliseconds) to allow the client to complete the execution
+-     *            of an API call. A non-positive value disables the timeout for this request.
+-     * @return The updated AmazonWebServiceRequest object for method chaining
+-     * @see {@link AmazonWebServiceRequest#setSdkRequestTimeout(int)} to enforce a timeout per HTTP
+-     *      request
+-     */
+-    public  T withSdkClientExecutionTimeout(int sdkClientExecutionTimeout) {
+-        setSdkClientExecutionTimeout(sdkClientExecutionTimeout);
+-        @SuppressWarnings("unchecked")
+-        T t = (T) this;
+-        return t;
+-    }
+-
+-    @Override
+-    public  void addHandlerContext(HandlerContextKey key, X value) {
+-        this.handlerContext.put(key, value);
+-    }
+-
+-    @Override
+-    @SuppressWarnings("unchecked")
+-    public  X getHandlerContext(HandlerContextKey key) {
+-        return (X) this.handlerContext.get(key);
+-    }
+-
+-    /**
+-     * Retrieve an unmodifiable collection of all handler context objects. This allows a {@link Request} derived from a
+-     * {@link AmazonWebServiceRequest} to inherit its context. This does not protect the objects within the map from being
+-     * modified.
+-     *
+-     * 
This should not be used by customers.

+-     */
+-    @SdkInternalApi
+-    Map, Object> getHandlerContext() {
+-        return Collections.unmodifiableMap(this.handlerContext);
+-    }
+-
+-    /**
+-     * Creates a shallow clone of this object for all fields except the handler context. Explicitly does not clone the
+-     * deep structure of the other fields in the message.
+-     *
+-     * @see Object#clone()
+-     */
+-    @Override
+-    public AmazonWebServiceRequest clone() {
+-        try {
+-            AmazonWebServiceRequest cloned = (AmazonWebServiceRequest) super.clone();
+-            cloned.setCloneSource(this);
+-
+-            // Deep-copy context to ensure modifications made by the handlers do not leak back to the caller or other uses of the
+-            // same request.
+-            cloned.handlerContext = new HashMap, Object>(cloned.handlerContext);
+-
+-            return cloned;
+-        } catch (CloneNotSupportedException e) {
+-            throw new IllegalStateException(
+-                    "Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/AmazonWebServiceResponse.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/AmazonWebServiceResponse.java
+--- ./src/main/java/com/amazonaws/AmazonWebServiceResponse.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/AmazonWebServiceResponse.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,88 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws;
+-
+-/**
+- * Represents the response from an AWS service, including the result payload and
+- * any response metadata. AWS response metadata consists primarily of the AWS
+- * request ID, which can be used for debugging purposes when services aren't
+- * acting as expected.
+- *
+- * @param 
+- *            The type of result contained by this response.
+- */
+-public class AmazonWebServiceResponse {
+-
+-    /** The result contained by this response */
+-    private T result;
+-
+-    /** Additional AWS metadata for this response */
+-    private ResponseMetadata responseMetadata;
+-
+-    /**
+-     * Returns the result contained by this response.
+-     *
+-     * @return The result contained by this response.
+-     */
+-    public T getResult() {
+-        return result;
+-    }
+-
+-    /**
+-     * Sets the result contained by this response.
+-     *
+-     * @param result
+-     *            The result contained by this response.
+-     */
+-    public void setResult(T result) {
+-        this.result = result;
+-    }
+-
+-    /**
+-     * Sets the response metadata associated with this response.
+-     * 
+-     * @param responseMetadata
+-     *            The response metadata for this response.
+-     */
+-    public void setResponseMetadata(ResponseMetadata responseMetadata) {
+-        this.responseMetadata = responseMetadata;
+-    }
+-
+-    /**
+-     * Returns the response metadata for this response. Response metadata
+-     * provides additional information about a response that isn't necessarily
+-     * directly part of the data the service is returning. Response metadata is
+-     * primarily used for debugging issues with AWS support when a service isn't
+-     * working as expected.
+-     * 
+-     * @return The response metadata for this response.
+-     */
+-    public ResponseMetadata getResponseMetadata() {
+-        return responseMetadata;
+-    }
+-
+-    /**
+-     * Returns the AWS request ID from the response metadata section of an AWS
+-     * response.
+-     *
+-     * @return The AWS request ID from the response metadata section of an AWS
+-     *         response.
+-     */
+-    public String getRequestId() {
+-        if (responseMetadata == null) return null;
+-        return responseMetadata.getRequestId();
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/AmazonWebServiceResult.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/AmazonWebServiceResult.java
+--- ./src/main/java/com/amazonaws/AmazonWebServiceResult.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/AmazonWebServiceResult.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,54 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws;
+-
+-import com.amazonaws.http.SdkHttpMetadata;
+-
+-/**
+- * Base type for all AWS response objects. Exposes metadata about the request such as the request
+- * id and access to details in the HTTP response.
+- *
+- * @param  Type of {@link ResponseMetadata}.
+- */
+-public class AmazonWebServiceResult {
+-
+-    private T sdkResponseMetadata;
+-
+-    private SdkHttpMetadata sdkHttpMetadata;
+-
+-    /**
+-     * @return The response metadata associated with this request.
+-     */
+-    public T getSdkResponseMetadata() {
+-        return sdkResponseMetadata;
+-    }
+-
+-    public AmazonWebServiceResult setSdkResponseMetadata(T sdkResponseMetadata) {
+-        this.sdkResponseMetadata = sdkResponseMetadata;
+-        return this;
+-    }
+-
+-    /**
+-     * @return HTTP related metadata like headers and status code.
+-     */
+-    public SdkHttpMetadata getSdkHttpMetadata() {
+-        return sdkHttpMetadata;
+-    }
+-
+-    public AmazonWebServiceResult setSdkHttpMetadata(SdkHttpMetadata sdkHttpMetadata) {
+-        this.sdkHttpMetadata = sdkHttpMetadata;
+-        return this;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/annotation/Beta.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/annotation/Beta.java
+--- ./src/main/java/com/amazonaws/annotation/Beta.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/annotation/Beta.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,32 +0,0 @@
+-/*
+- * Copyright 2012-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
+- * the License. A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+- * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
+- * and limitations under the License.
+- */
+-package com.amazonaws.annotation;
+-
+-import java.lang.annotation.Documented;
+-import java.lang.annotation.ElementType;
+-import java.lang.annotation.Retention;
+-import java.lang.annotation.RetentionPolicy;
+-import java.lang.annotation.Target;
+-
+-/**
+- * The class or method to which this annotation is applied is in beta mode. This
+- * means the annotated class or method is a relatively new API that may have
+- * bugs, complexity and usability issues that we have not fully anticipated. We
+- * will remove this annotation from the class or method once things get more
+- * settled.
+- */
+-@Documented
+-@Target({ ElementType.TYPE, ElementType.METHOD })
+-@Retention(RetentionPolicy.CLASS)
+-public @interface Beta {
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/annotation/GuardedBy.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/annotation/GuardedBy.java
+--- ./src/main/java/com/amazonaws/annotation/GuardedBy.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/annotation/GuardedBy.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,30 +0,0 @@
+-/*
+- * Copyright 2012-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
+- * the License. A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+- * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
+- * and limitations under the License.
+- */
+-package com.amazonaws.annotation;
+-
+-import java.lang.annotation.Documented;
+-import java.lang.annotation.ElementType;
+-import java.lang.annotation.Retention;
+-import java.lang.annotation.RetentionPolicy;
+-import java.lang.annotation.Target;
+-
+-/**
+- * Documenting annotation to indicate the field or method on which this is applied can only be accessed
+- * when holding the given lock (identified by value).
+- */
+-@Documented
+-@Target({ElementType.FIELD, ElementType.METHOD})
+-@Retention(RetentionPolicy.CLASS)
+-public @interface GuardedBy {
+-    String value();
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/annotation/NotThreadSafe.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/annotation/NotThreadSafe.java
+--- ./src/main/java/com/amazonaws/annotation/NotThreadSafe.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/annotation/NotThreadSafe.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,31 +0,0 @@
+-/*
+- * Copyright 2012-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
+- * the License. A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+- * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
+- * and limitations under the License.
+- */
+-package com.amazonaws.annotation;
+-
+-
+-import java.lang.annotation.Documented;
+-import java.lang.annotation.ElementType;
+-import java.lang.annotation.Retention;
+-import java.lang.annotation.RetentionPolicy;
+-import java.lang.annotation.Target;
+-
+-/**
+- * Documenting annotation to indicate a class is not thread-safe and should not be used in a multi-threaded context.
+- *
+- * @see ThreadSafe
+- */
+-@Documented
+-@Target(ElementType.TYPE)
+-@Retention(RetentionPolicy.CLASS)
+-public @interface NotThreadSafe {
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/annotation/SdkTestInternalApi.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/annotation/SdkTestInternalApi.java
+--- ./src/main/java/com/amazonaws/annotation/SdkTestInternalApi.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/annotation/SdkTestInternalApi.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,29 +0,0 @@
+-/*
+- * Copyright 2012-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
+- * the License. A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+- * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
+- * and limitations under the License.
+- */
+-package com.amazonaws.annotation;
+-
+-import java.lang.annotation.ElementType;
+-import java.lang.annotation.Target;
+-
+-/**
+- * Marker interface for methods used by test code in the same module. Methods/Constructors annotated
+- * with this method should not be accessed in production code. This annotation should be used
+- * sparingly as it's a code smell to need access to internal data/functionality to properly unit
+- * test a class. Typically there is a better way to test a class.
+- * 

+- * TODO: Write a linter that makes sure only test code depends on methods or constructors annotated
+- * with this method
+- */
+-@Target({ ElementType.CONSTRUCTOR, ElementType.METHOD, ElementType.FIELD })
+-public @interface SdkTestInternalApi {
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/ApacheHttpClientConfig.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/ApacheHttpClientConfig.java
+--- ./src/main/java/com/amazonaws/ApacheHttpClientConfig.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/ApacheHttpClientConfig.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,64 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws;
+-
+-import com.amazonaws.annotation.NotThreadSafe;
+-
+-import org.apache.http.conn.socket.ConnectionSocketFactory;
+-
+-/**
+- * Used for Apache HTTP client specific custom configurations.
+- */
+-@NotThreadSafe
+-public final class ApacheHttpClientConfig {
+-    private ConnectionSocketFactory sslSocketFactory;
+-
+-    ApacheHttpClientConfig() {}
+-
+-    ApacheHttpClientConfig(ApacheHttpClientConfig that) {
+-        this.sslSocketFactory = that.sslSocketFactory;
+-    }
+-
+-    /**
+-     * Returns a custom Apache HTTP client specific SSL socket factory; 
+-     * or null if there is none.
+-     */
+-    public ConnectionSocketFactory getSslSocketFactory() {
+-        return sslSocketFactory;
+-    }
+-
+-    /**
+-     * Sets a custom Apache HTTP client specific SSL socket factory.
+-     * 
+-     * @param sslSocketFactory a custom Apache HTTP client specific SSL socket 
+-     * factory; or null if there is none.
+-     */
+-    public void setSslSocketFactory(ConnectionSocketFactory sslSocketFactory) {
+-        this.sslSocketFactory = sslSocketFactory;
+-    }
+-
+-    /**
+-     * Fluent API for setting a custom Apache HTTP client specific SSL socket
+-     * factory.
+-     * 
+-     * @param sslSocketFactory a custom Apache HTTP client specific SSL socket 
+-     * factory; or null if there is none.
+-     */
+-    public ApacheHttpClientConfig withSslSocketFactory(
+-            ConnectionSocketFactory sslSocketFactory) {
+-        this.sslSocketFactory = sslSocketFactory;
+-        return this;
+-    }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/auth/AbstractAWSSigner.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/AbstractAWSSigner.java
+--- ./src/main/java/com/amazonaws/auth/AbstractAWSSigner.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/AbstractAWSSigner.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,483 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth;
+-
+-import static com.amazonaws.util.StringUtils.UTF8;
+-
+-import java.io.ByteArrayInputStream;
+-import java.io.ByteArrayOutputStream;
+-import java.io.InputStream;
+-import java.net.URI;
+-import java.security.DigestInputStream;
+-import java.security.MessageDigest;
+-import java.security.NoSuchAlgorithmException;
+-import java.util.*;
+-
+-import javax.crypto.Mac;
+-import javax.crypto.spec.SecretKeySpec;
+-
+-import com.amazonaws.AmazonClientException;
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.ReadLimitInfo;
+-import com.amazonaws.SDKGlobalTime;
+-import com.amazonaws.SignableRequest;
+-import com.amazonaws.internal.SdkDigestInputStream;
+-import com.amazonaws.util.Base64;
+-import com.amazonaws.util.BinaryUtils;
+-import com.amazonaws.util.SdkHttpUtils;
+-import com.amazonaws.util.StringUtils;
+-
+-/**
+- * Abstract base class for AWS signing protocol implementations. Provides
+- * utilities commonly needed by signing protocols such as computing
+- * canonicalized host names, query string parameters, etc.
+- * 

+- * Not intended to be sub-classed by developers.
+- */
+-public abstract class AbstractAWSSigner implements Signer {
+-
+-    public static final String EMPTY_STRING_SHA256_HEX;
+-    private static final ThreadLocal SHA256_MESSAGE_DIGEST;
+-
+-    static {
+-        SHA256_MESSAGE_DIGEST = new ThreadLocal() {
+-            @Override
+-            protected MessageDigest initialValue() {
+-                try {
+-                    return MessageDigest.getInstance("SHA-256");
+-                } catch (NoSuchAlgorithmException e) {
+-                    throw new SdkClientException(
+-                            "Unable to get SHA256 Function"
+-                                    + e.getMessage(), e);
+-                }
+-            }
+-        };
+-        EMPTY_STRING_SHA256_HEX = BinaryUtils.toHex(doHash(""));
+-    }
+-
+-    /**
+-     * Computes an RFC 2104-compliant HMAC signature and returns the result as a
+-     * Base64 encoded string.
+-     */
+-    protected String signAndBase64Encode(String data, String key,
+-            SigningAlgorithm algorithm) throws SdkClientException {
+-        return signAndBase64Encode(data.getBytes(UTF8), key, algorithm);
+-    }
+-
+-    /**
+-     * Computes an RFC 2104-compliant HMAC signature for an array of bytes and
+-     * returns the result as a Base64 encoded string.
+-     */
+-    protected String signAndBase64Encode(byte[] data, String key,
+-            SigningAlgorithm algorithm) throws SdkClientException {
+-        try {
+-            byte[] signature = sign(data, key.getBytes(UTF8), algorithm);
+-            return Base64.encodeAsString(signature);
+-        } catch (Exception e) {
+-            throw new SdkClientException(
+-                    "Unable to calculate a request signature: "
+-                            + e.getMessage(), e);
+-        }
+-    }
+-
+-    public byte[] sign(String stringData, byte[] key,
+-            SigningAlgorithm algorithm) throws SdkClientException {
+-        try {
+-            byte[] data = stringData.getBytes(UTF8);
+-            return sign(data, key, algorithm);
+-        } catch (Exception e) {
+-            throw new SdkClientException(
+-                    "Unable to calculate a request signature: "
+-                            + e.getMessage(), e);
+-        }
+-    }
+-
+-    public byte[] signWithMac(String stringData, Mac mac) {
+-        try {
+-            return mac.doFinal(stringData.getBytes(UTF8));
+-        } catch (Exception e) {
+-            throw new SdkClientException(
+-                    "Unable to calculate a request signature: "
+-                            + e.getMessage(), e);
+-        }
+-    }
+-
+-    protected byte[] sign(byte[] data, byte[] key,
+-            SigningAlgorithm algorithm) throws SdkClientException {
+-        try {
+-            Mac mac = algorithm.getMac();
+-            mac.init(new SecretKeySpec(key, algorithm.toString()));
+-            return mac.doFinal(data);
+-        } catch (Exception e) {
+-            throw new SdkClientException(
+-                    "Unable to calculate a request signature: "
+-                            + e.getMessage(), e);
+-        }
+-    }
+-
+-    /**
+-     * Hashes the string contents (assumed to be UTF-8) using the SHA-256
+-     * algorithm.
+-     *
+-     * @param text
+-     *            The string to hash.
+-     *
+-     * @return The hashed bytes from the specified string.
+-     *
+-     * @throws SdkClientException
+-     *             If the hash cannot be computed.
+-     */
+-    public byte[] hash(String text) throws SdkClientException {
+-        return AbstractAWSSigner.doHash(text);
+-    }
+-
+-    private static byte[] doHash(String text) throws SdkClientException {
+-        try {
+-            MessageDigest md = getMessageDigestInstance();
+-            md.update(text.getBytes(UTF8));
+-            return md.digest();
+-        } catch (Exception e) {
+-            throw new SdkClientException(
+-                    "Unable to compute hash while signing request: "
+-                            + e.getMessage(), e);
+-        }
+-    }
+-
+-    protected byte[] hash(InputStream input) throws SdkClientException {
+-        try {
+-            MessageDigest md = getMessageDigestInstance();
+-            @SuppressWarnings("resource")
+-            DigestInputStream digestInputStream = new SdkDigestInputStream(
+-                    input, md);
+-            byte[] buffer = new byte[1024];
+-            while (digestInputStream.read(buffer) > -1)
+-                ;
+-            return digestInputStream.getMessageDigest().digest();
+-        } catch (Exception e) {
+-            throw new SdkClientException(
+-                    "Unable to compute hash while signing request: "
+-                            + e.getMessage(), e);
+-        }
+-    }
+-
+-    /**
+-     * Hashes the binary data using the SHA-256 algorithm.
+-     *
+-     * @param data
+-     *            The binary data to hash.
+-     *
+-     * @return The hashed bytes from the specified data.
+-     *
+-     * @throws SdkClientException
+-     *             If the hash cannot be computed.
+-     */
+-    public byte[] hash(byte[] data) throws SdkClientException {
+-        try {
+-            MessageDigest md =  getMessageDigestInstance();
+-            md.update(data);
+-            return md.digest();
+-        } catch (Exception e) {
+-            throw new SdkClientException(
+-                    "Unable to compute hash while signing request: "
+-                            + e.getMessage(), e);
+-        }
+-    }
+-    /**
+-     * Examines the specified query string parameters and returns a
+-     * canonicalized form.
+-     * 

+-     * The canonicalized query string is formed by first sorting all the query
+-     * string parameters, then URI encoding both the key and value and then
+-     * joining them, in order, separating key value pairs with an '&'.
+-     *
+-     * @param parameters
+-     *            The query string parameters to be canonicalized.
+-     *
+-     * @return A canonicalized form for the specified query string parameters.
+-     */
+-    protected String getCanonicalizedQueryString(Map> parameters) {
+-
+-        final SortedMap> sorted = new TreeMap>();
+-
+-        /**
+-         * Signing protocol expects the param values also to be sorted after url
+-         * encoding in addition to sorted parameter names.
+-         */
+-        for (Map.Entry> entry : parameters.entrySet()) {
+-            final String encodedParamName = SdkHttpUtils.urlEncode(
+-                    entry.getKey(), false);
+-            final List paramValues = entry.getValue();
+-            final List encodedValues = new ArrayList(
+-                    paramValues.size());
+-            for (String value : paramValues) {
+-                encodedValues.add(SdkHttpUtils.urlEncode(value, false));
+-            }
+-            Collections.sort(encodedValues);
+-            sorted.put(encodedParamName, encodedValues);
+-
+-        }
+-
+-        final StringBuilder result = new StringBuilder();
+-        for(Map.Entry> entry : sorted.entrySet()) {
+-            for(String value : entry.getValue()) {
+-                if (result.length() > 0) {
+-                    result.append("&");
+-                }
+-                result.append(entry.getKey())
+-                      .append("=")
+-                      .append(value);
+-            }
+-        }
+-
+-        return result.toString();
+-    }
+-
+-    protected String getCanonicalizedQueryString(SignableRequest request) {
+-        /*
+-         * If we're using POST and we don't have any request payload content,
+-         * then any request query parameters will be sent as the payload, and
+-         * not in the actual query string.
+-         */
+-        if (SdkHttpUtils.usePayloadForQueryParameters(request))
+-            return "";
+-        return this.getCanonicalizedQueryString(request.getParameters());
+-    }
+-
+-    /**
+-     * Returns the request's payload as binary data.
+-     *
+-     * @param request
+-     *            The request
+-     * @return The data from the request's payload, as binary data.
+-     */
+-    protected byte[] getBinaryRequestPayload(SignableRequest request) {
+-        if (SdkHttpUtils.usePayloadForQueryParameters(request)) {
+-            String encodedParameters = SdkHttpUtils.encodeParameters(request);
+-            if (encodedParameters == null)
+-                return new byte[0];
+-
+-            return encodedParameters.getBytes(UTF8);
+-        }
+-
+-        return getBinaryRequestPayloadWithoutQueryParams(request);
+-    }
+-
+-    /**
+-     * Returns the request's payload as a String.
+-     *
+-     * @param request
+-     *            The request
+-     * @return The data from the request's payload, as a string.
+-     */
+-    protected String getRequestPayload(SignableRequest request) {
+-        return newString(getBinaryRequestPayload(request));
+-    }
+-
+-    /**
+-     * Returns the request's payload contents as a String, without processing
+-     * any query string params (i.e. no form encoding for query params).
+-     *
+-     * @param request
+-     *            The request
+-     * @return the request's payload contents as a String, not including any
+-     *         form encoding of query string params.
+-     */
+-    protected String getRequestPayloadWithoutQueryParams(SignableRequest request) {
+-        return newString(getBinaryRequestPayloadWithoutQueryParams(request));
+-    }
+-
+-    /**
+-     * Returns the request's payload contents as binary data, without processing
+-     * any query string params (i.e. no form encoding for query params).
+-     *
+-     * @param request
+-     *            The request
+-     * @return The request's payload contents as binary data, not including any
+-     *         form encoding of query string params.
+-     */
+-    protected byte[] getBinaryRequestPayloadWithoutQueryParams(SignableRequest request) {
+-        InputStream content = getBinaryRequestPayloadStreamWithoutQueryParams(request);
+-
+-        try {
+-            ReadLimitInfo info = request.getReadLimitInfo();
+-            content.mark(info == null ? -1 : info.getReadLimit());
+-            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+-            byte[] buffer = new byte[1024 * 5];
+-            while (true) {
+-                int bytesRead = content.read(buffer);
+-                if (bytesRead == -1) break;
+-
+-                byteArrayOutputStream.write(buffer, 0, bytesRead);
+-            }
+-
+-            byteArrayOutputStream.close();
+-            content.reset();
+-
+-            return byteArrayOutputStream.toByteArray();
+-        } catch (Exception e) {
+-            throw new SdkClientException("Unable to read request payload to sign request: " + e.getMessage(), e);
+-        }
+-    }
+-
+-    protected InputStream getBinaryRequestPayloadStream(SignableRequest request) {
+-        if (SdkHttpUtils.usePayloadForQueryParameters(request)) {
+-            String encodedParameters = SdkHttpUtils.encodeParameters(request);
+-            if (encodedParameters == null)
+-                return new ByteArrayInputStream(new byte[0]);
+-
+-            return new ByteArrayInputStream(
+-                    encodedParameters.getBytes(UTF8));
+-        }
+-
+-        return getBinaryRequestPayloadStreamWithoutQueryParams(request);
+-    }
+-
+-    protected InputStream getBinaryRequestPayloadStreamWithoutQueryParams(SignableRequest request) {
+-        try {
+-            InputStream is = request.getContentUnwrapped();
+-            if (is == null)
+-                return new ByteArrayInputStream(new byte[0]);
+-            if (!is.markSupported())
+-                throw new SdkClientException("Unable to read request payload to sign request.");
+-            return is;
+-        } catch (AmazonClientException e) {
+-            throw e;
+-        } catch (Exception e) {
+-            throw new SdkClientException("Unable to read request payload to sign request: " + e.getMessage(), e);
+-        }
+-    }
+-
+-    protected String getCanonicalizedResourcePath(String resourcePath) {
+-        return getCanonicalizedResourcePath(resourcePath, true);
+-    }
+-
+-    protected String getCanonicalizedResourcePath(String resourcePath, boolean urlEncode) {
+-        if (resourcePath == null || resourcePath.isEmpty()) {
+-            return "/";
+-        } else {
+-            String value = urlEncode ? SdkHttpUtils.urlEncode(resourcePath, true) : resourcePath;
+-            if (value.startsWith("/")) {
+-                return value;
+-            } else {
+-                return "/".concat(value);
+-            }
+-        }
+-    }
+-
+-    protected String getCanonicalizedEndpoint(URI endpoint) {
+-        String endpointForStringToSign = StringUtils.lowerCase(endpoint.getHost());
+-        /*
+-         * Apache HttpClient will omit the port in the Host header for default
+-         * port values (i.e. 80 for HTTP and 443 for HTTPS) even if we
+-         * explicitly specify it, so we need to be careful that we use the same
+-         * value here when we calculate the string to sign and in the Host
+-         * header we send in the HTTP request.
+-         */
+-        if (SdkHttpUtils.isUsingNonDefaultPort(endpoint)) {
+-            endpointForStringToSign += ":" + endpoint.getPort();
+-        }
+-
+-        return endpointForStringToSign;
+-    }
+-
+-    /**
+-     * Loads the individual access key ID and secret key from the specified
+-     * credentials, ensuring that access to the credentials is synchronized on
+-     * the credentials object itself, and trimming any extra whitespace from the
+-     * credentials.
+-     * 

+-     * Returns either a {@link BasicSessionCredentials} or a
+-     * {@link BasicAWSCredentials} object, depending on the input type.
+-     *
+-     * @param credentials
+-     * @return A new credentials object with the sanitized credentials.
+-     */
+-    protected AWSCredentials sanitizeCredentials(AWSCredentials credentials) {
+-        String accessKeyId = null;
+-        String secretKey   = null;
+-        String token = null;
+-        synchronized (credentials) {
+-            accessKeyId = credentials.getAWSAccessKeyId();
+-            secretKey   = credentials.getAWSSecretKey();
+-            if ( credentials instanceof AWSSessionCredentials ) {
+-                token = ((AWSSessionCredentials) credentials).getSessionToken();
+-            }
+-        }
+-        if (secretKey != null) secretKey = secretKey.trim();
+-        if (accessKeyId != null) accessKeyId = accessKeyId.trim();
+-        if (token != null) token = token.trim();
+-
+-        if (credentials instanceof AWSSessionCredentials) {
+-            return new BasicSessionCredentials(accessKeyId, secretKey, token);
+-        }
+-
+-        return new BasicAWSCredentials(accessKeyId, secretKey);
+-    }
+-
+-    /**
+-     * Safely converts a UTF-8 encoded byte array into a String.
+-     *
+-     * @param bytes UTF-8 encoded binary character data.
+-     *
+-     * @return The converted String object.
+-     */
+-    protected String newString(byte[] bytes) {
+-        return new String(bytes, UTF8);
+-    }
+-
+-    /**
+-     * Returns the current time minus the given offset in seconds.
+-     * The intent is to adjust the current time in the running JVM to the
+-     * corresponding wall clock time at AWS for request signing purposes.
+-     *
+-     * @param offsetInSeconds
+-     *            offset in seconds
+-     */
+-    protected Date getSignatureDate(int offsetInSeconds) {
+-        return new Date(System.currentTimeMillis() - offsetInSeconds*1000);
+-    }
+-
+-    /**
+-     * Returns the time offset in seconds.
+-     */
+-    @Deprecated
+-    protected int getTimeOffset(SignableRequest request) {
+-        final int globleOffset = SDKGlobalTime.getGlobalTimeOffset();
+-        return globleOffset == 0 ? request.getTimeOffset() : globleOffset;
+-    }
+-
+-    /**
+-     * Adds session credentials to the request given.
+-     *
+-     * @param request
+-     *            The request to add session credentials information to
+-     * @param credentials
+-     *            The session credentials to add to the request
+-     */
+-    protected abstract void addSessionCredentials(SignableRequest request,
+-            AWSSessionCredentials credentials);
+-
+-
+-    /**
+-     * Returns the re-usable thread local version of MessageDigest.
+-     * @return
+-     */
+-    private static MessageDigest getMessageDigestInstance() {
+-        MessageDigest messageDigest = SHA256_MESSAGE_DIGEST.get();
+-        messageDigest.reset();
+-        return messageDigest;
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/AWS3Signer.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/AWS3Signer.java
+--- ./src/main/java/com/amazonaws/auth/AWS3Signer.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/AWS3Signer.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,217 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth;
+-
+-import static com.amazonaws.util.StringUtils.UTF8;
+-
+-import java.net.MalformedURLException;
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.Date;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.SortedMap;
+-import java.util.TreeMap;
+-import java.util.UUID;
+-
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.SignableRequest;
+-import com.amazonaws.log.InternalLogApi;
+-import com.amazonaws.log.InternalLogFactory;
+-import com.amazonaws.util.DateUtils;
+-import com.amazonaws.util.SdkHttpUtils;
+-import com.amazonaws.util.StringUtils;
+-
+-/**
+- * Signer implementation that signs requests with the AWS3 signing protocol.
+- */
+-public class AWS3Signer extends AbstractAWSSigner {
+-    private static final String AUTHORIZATION_HEADER = "X-Amzn-Authorization";
+-    private static final String NONCE_HEADER = "x-amz-nonce";
+-    private static final String HTTP_SCHEME = "AWS3";
+-    private static final String HTTPS_SCHEME = "AWS3-HTTPS";
+-
+-    /** For internal testing only - allows the request's date to be overridden for testing. */
+-    private String overriddenDate;
+-
+-    @Deprecated
+-    protected static final DateUtils dateUtils = new DateUtils();
+-    private static final InternalLogApi log = InternalLogFactory.getLog(AWS3Signer.class);
+-
+-
+-    /**
+-     * Signs the specified request with the AWS3 signing protocol by using the
+-     * AWS account credentials specified when this object was constructed and
+-     * adding the required AWS3 headers to the request.
+-     *
+-     * @param request
+-     *            The request to sign.
+-     */
+-    @Override
+-    public void sign(SignableRequest request, AWSCredentials credentials) throws SdkClientException {
+-        // annonymous credentials, don't sign
+-        if ( credentials instanceof AnonymousAWSCredentials ) {
+-            return;
+-        }
+-
+-        AWSCredentials sanitizedCredentials = sanitizeCredentials(credentials);
+-
+-        SigningAlgorithm algorithm = SigningAlgorithm.HmacSHA256;
+-        String nonce = UUID.randomUUID().toString();
+-
+-        int timeOffset = request.getTimeOffset();
+-        Date dateValue = getSignatureDate(timeOffset);
+-        String date = DateUtils.formatRFC822Date(dateValue);
+-        boolean isHttps = false;
+-
+-        if (overriddenDate != null) date = overriddenDate;
+-        request.addHeader("Date", date);
+-        request.addHeader("X-Amz-Date", date);
+-
+-        // AWS3 HTTP requires that we sign the Host header
+-        // so we have to have it in the request by the time we sign.
+-        String hostHeader = request.getEndpoint().getHost();
+-        if (SdkHttpUtils.isUsingNonDefaultPort(request.getEndpoint())) {
+-            hostHeader += ":" + request.getEndpoint().getPort();
+-        }
+-        request.addHeader("Host", hostHeader);
+-
+-        if ( sanitizedCredentials instanceof AWSSessionCredentials ) {
+-            addSessionCredentials(request, (AWSSessionCredentials) sanitizedCredentials);
+-        }
+-        byte[] bytesToSign;
+-        String stringToSign;
+-        if (isHttps) {
+-            request.addHeader(NONCE_HEADER, nonce);
+-            stringToSign = date + nonce;
+-            bytesToSign = stringToSign.getBytes(UTF8);
+-        } else {
+-            String path = SdkHttpUtils.appendUri(request.getEndpoint().getPath(), request.getResourcePath());
+-
+-            /*
+-             * AWS3 requires all query params to be listed on the third line of
+-             * the string to sign, even if those query params will be sent in
+-             * the request body and not as a query string. POST formatted query
+-             * params should *NOT* be included in the request payload.
+-             */
+-            stringToSign = request.getHttpMethod().toString() + "\n"
+-                    + getCanonicalizedResourcePath(path) + "\n"
+-                    + getCanonicalizedQueryString(request.getParameters()) + "\n"
+-                    + getCanonicalizedHeadersForStringToSign(request) + "\n"
+-                    + getRequestPayloadWithoutQueryParams(request);
+-            bytesToSign = hash(stringToSign);
+-        }
+-        if (log.isDebugEnabled())
+-            log.debug("Calculated StringToSign: " + stringToSign);
+-
+-        String signature = signAndBase64Encode(bytesToSign,
+-                sanitizedCredentials.getAWSSecretKey(), algorithm);
+-
+-        StringBuilder builder = new StringBuilder();
+-        builder.append(isHttps ? HTTPS_SCHEME : HTTP_SCHEME).append(" ");
+-        builder.append("AWSAccessKeyId=" + sanitizedCredentials.getAWSAccessKeyId() + ",");
+-        builder.append("Algorithm=" + algorithm.toString() + ",");
+-
+-        if (!isHttps) {
+-            builder.append(getSignedHeadersComponent(request) + ",");
+-        }
+-
+-        builder.append("Signature=" + signature);
+-        request.addHeader(AUTHORIZATION_HEADER, builder.toString());
+-    }
+-
+-    private String getSignedHeadersComponent(SignableRequest request) {
+-        StringBuilder builder = new StringBuilder();
+-        builder.append("SignedHeaders=");
+-        boolean first = true;
+-        for (String header : getHeadersForStringToSign(request)) {
+-            if (!first) builder.append(";");
+-            builder.append(header);
+-            first = false;
+-        }
+-        return builder.toString();
+-    }
+-
+-    protected List getHeadersForStringToSign(SignableRequest request) {
+-        List headersToSign = new ArrayList();
+-        for (Map.Entry entry : request.getHeaders().entrySet()) {
+-            String key = entry.getKey();
+-            String lowerCaseKey = StringUtils.lowerCase(key);
+-            if (lowerCaseKey.startsWith("x-amz")
+-                    || lowerCaseKey.equals("host")) {
+-                headersToSign.add(key);
+-            }
+-        }
+-
+-        Collections.sort(headersToSign);
+-        return headersToSign;
+-    }
+-
+-    /**
+-     * For internal testing only - allows the date to be overridden for internal
+-     * tests.
+-     *
+-     * @param date
+-     *            The RFC822 date string to use when signing requests.
+-     */
+-    void overrideDate(String date) {
+-        this.overriddenDate = date;
+-    }
+-
+-    protected String getCanonicalizedHeadersForStringToSign(SignableRequest request) {
+-        List headersToSign = getHeadersForStringToSign(request);
+-
+-        for (int i = 0; i < headersToSign.size(); i++) {
+-            headersToSign.set(i, StringUtils.lowerCase(headersToSign.get(i)));
+-        }
+-
+-        SortedMap sortedHeaderMap = new TreeMap();
+-        for (Map.Entry entry : request.getHeaders().entrySet()) {
+-            if (headersToSign.contains(StringUtils.lowerCase(entry.getKey()))) {
+-                sortedHeaderMap.put(StringUtils.lowerCase(entry.getKey()), entry.getValue());
+-            }
+-        }
+-
+-        StringBuilder builder = new StringBuilder();
+-        for (Map.Entry entry : sortedHeaderMap.entrySet()) {
+-            builder.append(StringUtils.lowerCase(entry.getKey())).append(":")
+-            .append(entry.getValue()).append("\n");
+-        }
+-
+-        return builder.toString();
+-    }
+-
+-    protected boolean shouldUseHttpsScheme(SignableRequest request) throws SdkClientException {
+-        try {
+-            String protocol = StringUtils.lowerCase(request.getEndpoint().toURL().getProtocol());
+-            if (protocol.equals("http")) {
+-                return false;
+-            } else if (protocol.equals("https")) {
+-                return true;
+-            } else {
+-                throw new SdkClientException("Unknown request endpoint protocol " +
+-                        "encountered while signing request: " + protocol);
+-            }
+-        } catch (MalformedURLException e) {
+-            throw new SdkClientException("Unable to parse request endpoint during signing", e);
+-        }
+-    }
+-
+-    @Override
+-    protected void addSessionCredentials(SignableRequest request, AWSSessionCredentials credentials) {
+-        request.addHeader("x-amz-security-token", credentials.getSessionToken());
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/AWS4Signer.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/AWS4Signer.java
+--- ./src/main/java/com/amazonaws/auth/AWS4Signer.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/AWS4Signer.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,633 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth;
+-
+-import com.amazonaws.ReadLimitInfo;
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.SignableRequest;
+-import com.amazonaws.annotation.SdkTestInternalApi;
+-import com.amazonaws.auth.internal.AWS4SignerRequestParams;
+-import com.amazonaws.auth.internal.AWS4SignerUtils;
+-import com.amazonaws.auth.internal.SignerKey;
+-import com.amazonaws.internal.FIFOCache;
+-import com.amazonaws.log.InternalLogApi;
+-import com.amazonaws.log.InternalLogFactory;
+-import com.amazonaws.util.BinaryUtils;
+-import com.amazonaws.util.DateUtils;
+-import com.amazonaws.util.SdkHttpUtils;
+-import com.amazonaws.util.StringUtils;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.net.URI;
+-import java.nio.charset.Charset;
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.Collections;
+-import java.util.Date;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.concurrent.TimeUnit;
+-
+-import static com.amazonaws.auth.internal.SignerConstants.AUTHORIZATION;
+-import static com.amazonaws.auth.internal.SignerConstants.AWS4_SIGNING_ALGORITHM;
+-import static com.amazonaws.auth.internal.SignerConstants.AWS4_TERMINATOR;
+-import static com.amazonaws.auth.internal.SignerConstants.HOST;
+-import static com.amazonaws.auth.internal.SignerConstants.LINE_SEPARATOR;
+-import static com.amazonaws.auth.internal.SignerConstants.PRESIGN_URL_MAX_EXPIRATION_SECONDS;
+-import static com.amazonaws.auth.internal.SignerConstants.X_AMZ_ALGORITHM;
+-import static com.amazonaws.auth.internal.SignerConstants.X_AMZ_CONTENT_SHA256;
+-import static com.amazonaws.auth.internal.SignerConstants.X_AMZ_CREDENTIAL;
+-import static com.amazonaws.auth.internal.SignerConstants.X_AMZ_DATE;
+-import static com.amazonaws.auth.internal.SignerConstants.X_AMZ_EXPIRES;
+-import static com.amazonaws.auth.internal.SignerConstants.X_AMZ_SECURITY_TOKEN;
+-import static com.amazonaws.auth.internal.SignerConstants.X_AMZ_SIGNATURE;
+-import static com.amazonaws.auth.internal.SignerConstants.X_AMZ_SIGNED_HEADER;
+-
+-/**
+- * Signer implementation that signs requests with the AWS4 signing protocol.
+- */
+-public class AWS4Signer extends AbstractAWSSigner implements
+-        ServiceAwareSigner, RegionAwareSigner, Presigner, EndpointPrefixAwareSigner {
+-
+-    protected static final InternalLogApi log = InternalLogFactory.getLog(AWS4Signer.class);
+-    private static final int SIGNER_CACHE_MAX_SIZE = 300;
+-    private static final FIFOCache signerCache = new FIFOCache(SIGNER_CACHE_MAX_SIZE);
+-    private static final List listOfHeadersToIgnoreInLowerCase = Arrays.asList("connection", "x-amzn-trace-id");
+-
+-    private final SdkClock clock;
+-
+-    /**
+-     * Service name override for use when the endpoint can't be used to
+-     * determine the service name.
+-     */
+-    protected String serviceName;
+-
+-    /**
+-     * Endpoint prefix to compute the region name for signing
+-     * when the {@link #regionName} is null.
+-     */
+-    private String endpointPrefix;
+-
+-    /**
+-     * Region name override for use when the endpoint can't be used to determine
+-     * the region name.
+-     */
+-    protected String regionName;
+-
+-    /** Date override for testing only */
+-    protected Date overriddenDate;
+-
+-    /**
+-     * Whether double url-encode the resource path when constructing the
+-     * canonical request. By default, we enable double url-encoding.
+-     *
+-     * TODO: Different sigv4 services seem to be inconsistent on this. So for
+-     * services that want to suppress this, they should use new
+-     * AWS4Signer(false).
+-     */
+-    protected boolean doubleUrlEncode;
+-
+-    /**
+-     * Construct a new AWS4 signer instance. By default, enable double
+-     * url-encoding.
+-     */
+-    public AWS4Signer() {
+-        this(true);
+-    }
+-
+-    /**
+-     * Construct a new AWS4 signer instance.
+-     *
+-     * @param doubleUrlEncoding
+-     *            Whether double url-encode the resource path when constructing
+-     *            the canonical request.
+-     */
+-    public AWS4Signer(boolean doubleUrlEncoding) {
+-        this(doubleUrlEncoding, SdkClock.Instance.get());
+-    }
+-
+-    @SdkTestInternalApi
+-    public AWS4Signer(SdkClock clock) {
+-        this(true, clock);
+-    }
+-
+-    private AWS4Signer(boolean doubleUrlEncode, SdkClock clock) {
+-        this.doubleUrlEncode = doubleUrlEncode;
+-        this.clock = clock;
+-    }
+-
+-    /**
+-     * Sets the service name that this signer should use when calculating
+-     * request signatures. This can almost always be determined directly from
+-     * the request's end point, so you shouldn't need this method, but it's
+-     * provided for the edge case where the information is not in the endpoint.
+-     *
+-     * @param serviceName
+-     *            The service name to use when calculating signatures in this
+-     *            signer.
+-     */
+-    @Override
+-    public void setServiceName(String serviceName) {
+-        this.serviceName = serviceName;
+-    }
+-
+-    /**
+-     * Sets the region name that this signer should use when calculating request
+-     * signatures. This can almost always be determined directly from the
+-     * request's end point, so you shouldn't need this method, but it's provided
+-     * for the edge case where the information is not in the endpoint.
+-     *
+-     * @param regionName
+-     *            The region name to use when calculating signatures in this
+-     *            signer.
+-     */
+-    @Override
+-    public void setRegionName(String regionName) {
+-        this.regionName = regionName;
+-    }
+-
+-    /**
+-     * Sets the endpoint prefix which is used to compute the region that is
+-     * used for signing the request.
+-     *
+-     * This value is passed to {@link AWS4SignerRequestParams} class which
+-     * has the logic to compute region.
+-     *
+-     * @param endpointPrefix The endpoint prefix of the service
+-     */
+-    @Override
+-    public void setEndpointPrefix(String endpointPrefix) {
+-        this.endpointPrefix = endpointPrefix;
+-    }
+-
+-    /**
+-     * Sets the date that overrides the signing date in the request. This method
+-     * is internal and should be used only for testing purposes.
+-     */
+-    @SdkTestInternalApi
+-    public void setOverrideDate(Date overriddenDate) {
+-        if (overriddenDate != null) {
+-            this.overriddenDate = new Date(overriddenDate.getTime());
+-        } else {
+-            this.overriddenDate = null;
+-        }
+-    }
+-
+-    /**
+-     * Returns the region name that is used when calculating the signature.
+-     */
+-    public String getRegionName() {
+-        return regionName;
+-    }
+-
+-    /**
+-     * Returns the service name that is used when calculating the signature.
+-     */
+-    public String getServiceName() {
+-        return serviceName;
+-    }
+-
+-    /**
+-     * Returns a copy of date that overrides the signing date in the request.
+-     * Return null by default.
+-     */
+-    public Date getOverriddenDate() {
+-        return overriddenDate == null ? null : new Date(
+-                overriddenDate.getTime());
+-    }
+-
+-    @Override
+-    public void sign(SignableRequest request, AWSCredentials credentials) {
+-        // anonymous credentials, don't sign
+-        if (isAnonymous(credentials)) {
+-            return;
+-        }
+-
+-        AWSCredentials sanitizedCredentials = sanitizeCredentials(credentials);
+-        if (sanitizedCredentials instanceof AWSSessionCredentials) {
+-            addSessionCredentials(request,
+-                    (AWSSessionCredentials) sanitizedCredentials);
+-        }
+-
+-        final AWS4SignerRequestParams signerParams = new AWS4SignerRequestParams(
+-                request, overriddenDate, regionName, serviceName,
+-                AWS4_SIGNING_ALGORITHM, endpointPrefix);
+-
+-        addHostHeader(request);
+-        request.addHeader(X_AMZ_DATE,
+-                signerParams.getFormattedSigningDateTime());
+-
+-        String contentSha256 = calculateContentHash(request);
+-
+-        if ("required".equals(request.getHeaders().get(X_AMZ_CONTENT_SHA256))) {
+-            request.addHeader(X_AMZ_CONTENT_SHA256, contentSha256);
+-        }
+-
+-        final String canonicalRequest = createCanonicalRequest(request,
+-                contentSha256);
+-
+-        final String stringToSign = createStringToSign(canonicalRequest,
+-                signerParams);
+-
+-        final byte[] signingKey = deriveSigningKey(sanitizedCredentials,
+-                signerParams);
+-
+-        final byte[] signature = computeSignature(stringToSign, signingKey,
+-                signerParams);
+-
+-        request.addHeader(
+-                AUTHORIZATION,
+-                buildAuthorizationHeader(request, signature,
+-                        sanitizedCredentials, signerParams));
+-
+-        processRequestPayload(request, signature, signingKey,
+-                signerParams);
+-    }
+-
+-    @Override
+-    public void presignRequest(SignableRequest request, AWSCredentials credentials,
+-            Date userSpecifiedExpirationDate) {
+-
+-        // anonymous credentials, don't sign
+-        if (isAnonymous(credentials)) {
+-            return;
+-        }
+-
+-        long expirationInSeconds = generateExpirationDate(userSpecifiedExpirationDate);
+-
+-        addHostHeader(request);
+-
+-        AWSCredentials sanitizedCredentials = sanitizeCredentials(credentials);
+-        if (sanitizedCredentials instanceof AWSSessionCredentials) {
+-            // For SigV4 pre-signing URL, we need to add "X-Amz-Security-Token"
+-            // as a query string parameter, before constructing the canonical
+-            // request.
+-            request.addParameter(X_AMZ_SECURITY_TOKEN,
+-                    ((AWSSessionCredentials) sanitizedCredentials)
+-                            .getSessionToken());
+-        }
+-
+-        final AWS4SignerRequestParams signerRequestParams = new AWS4SignerRequestParams(
+-                request, overriddenDate, regionName, serviceName,
+-                AWS4_SIGNING_ALGORITHM, endpointPrefix);
+-
+-        // Add the important parameters for v4 signing
+-        final String timeStamp = signerRequestParams.getFormattedSigningDateTime();
+-
+-        addPreSignInformationToRequest(request, sanitizedCredentials,
+-                signerRequestParams, timeStamp, expirationInSeconds);
+-
+-        final String contentSha256 = calculateContentHashPresign(request);
+-
+-        final String canonicalRequest = createCanonicalRequest(request,
+-                contentSha256);
+-
+-        final String stringToSign = createStringToSign(canonicalRequest,
+-                signerRequestParams);
+-
+-        final byte[] signingKey = deriveSigningKey(sanitizedCredentials,
+-                signerRequestParams);
+-
+-        final byte[] signature = computeSignature(stringToSign, signingKey,
+-                signerRequestParams);
+-
+-        request.addParameter(X_AMZ_SIGNATURE, BinaryUtils.toHex(signature));
+-    }
+-
+-    /**
+-     * Step 1 of the AWS Signature version 4 calculation. Refer to
+-     * http://docs.aws
+-     * .amazon.com/general/latest/gr/sigv4-create-canonical-request.html to
+-     * generate the canonical request.
+-     */
+-    protected String createCanonicalRequest(SignableRequest request,
+-            String contentSha256) {
+-        /* This would url-encode the resource path for the first time. */
+-        final String path = SdkHttpUtils.appendUri(
+-                request.getEndpoint().getPath(), request.getResourcePath());
+-
+-        final StringBuilder canonicalRequestBuilder = new StringBuilder(request
+-                .getHttpMethod().toString());
+-
+-        canonicalRequestBuilder.append(LINE_SEPARATOR)
+-                // This would optionally double url-encode the resource path
+-                .append(getCanonicalizedResourcePath(path, doubleUrlEncode))
+-                .append(LINE_SEPARATOR)
+-                .append(getCanonicalizedQueryString(request))
+-                .append(LINE_SEPARATOR)
+-                .append(getCanonicalizedHeaderString(request))
+-                .append(LINE_SEPARATOR)
+-                .append(getSignedHeadersString(request)).append(LINE_SEPARATOR)
+-                .append(contentSha256);
+-
+-        final String canonicalRequest = canonicalRequestBuilder.toString();
+-
+-        if (log.isDebugEnabled())
+-            log.debug("AWS4 Canonical Request: '\"" + canonicalRequest + "\"");
+-
+-        return canonicalRequest;
+-    }
+-
+-    /**
+-     * Step 2 of the AWS Signature version 4 calculation. Refer to
+-     * http://docs.aws
+-     * .amazon.com/general/latest/gr/sigv4-create-string-to-sign.html.
+-     */
+-    protected String createStringToSign(String canonicalRequest,
+-            AWS4SignerRequestParams signerParams) {
+-
+-        final StringBuilder stringToSignBuilder = new StringBuilder(
+-                signerParams.getSigningAlgorithm());
+-        stringToSignBuilder.append(LINE_SEPARATOR)
+-                .append(signerParams.getFormattedSigningDateTime())
+-                .append(LINE_SEPARATOR)
+-                .append(signerParams.getScope())
+-                .append(LINE_SEPARATOR)
+-                .append(BinaryUtils.toHex(hash(canonicalRequest)));
+-
+-        final String stringToSign = stringToSignBuilder.toString();
+-
+-        if (log.isDebugEnabled())
+-            log.debug("AWS4 String to Sign: '\"" + stringToSign + "\"");
+-
+-        return stringToSign;
+-    }
+-
+-    /**
+-     * Step 3 of the AWS Signature version 4 calculation. It involves deriving
+-     * the signing key and computing the signature. Refer to
+-     * http://docs.aws.amazon
+-     * .com/general/latest/gr/sigv4-calculate-signature.html
+-     */
+-    private final byte[] deriveSigningKey(AWSCredentials credentials,
+-            AWS4SignerRequestParams signerRequestParams) {
+-
+-        final String cacheKey = computeSigningCacheKeyName(credentials,
+-                signerRequestParams);
+-        final long daysSinceEpochSigningDate = DateUtils
+-                .numberOfDaysSinceEpoch(signerRequestParams
+-                        .getSigningDateTimeMilli());
+-
+-        SignerKey signerKey = signerCache.get(cacheKey);
+-
+-        if (signerKey != null) {
+-            if (daysSinceEpochSigningDate == signerKey
+-                    .getNumberOfDaysSinceEpoch()) {
+-                return signerKey.getSigningKey();
+-            }
+-        }
+-        if (log.isDebugEnabled()) {
+-            log.debug("Generating a new signing key as the signing key not available in the cache for the date "
+-                    + TimeUnit.DAYS.toMillis(daysSinceEpochSigningDate));
+-        }
+-        byte[] signingKey = newSigningKey(credentials,
+-                signerRequestParams.getFormattedSigningDate(),
+-                signerRequestParams.getRegionName(),
+-                signerRequestParams.getServiceName());
+-        signerCache.add(cacheKey, new SignerKey(
+-                daysSinceEpochSigningDate, signingKey));
+-        return signingKey;
+-    }
+-
+-    /**
+-     * Computes the name to be used to reference the signing key in the cache.
+-     */
+-    private final String computeSigningCacheKeyName(AWSCredentials credentials,
+-            AWS4SignerRequestParams signerRequestParams) {
+-        final StringBuilder hashKeyBuilder = new StringBuilder(
+-                credentials.getAWSSecretKey());
+-
+-        return hashKeyBuilder.append("-")
+-                .append(signerRequestParams.getRegionName())
+-                .append("-")
+-                .append(signerRequestParams.getServiceName()).toString();
+-    }
+-
+-    /**
+-     * Step 3 of the AWS Signature version 4 calculation. It involves deriving
+-     * the signing key and computing the signature. Refer to
+-     * http://docs.aws.amazon
+-     * .com/general/latest/gr/sigv4-calculate-signature.html
+-     */
+-    protected final byte[] computeSignature(String stringToSign,
+-            byte[] signingKey, AWS4SignerRequestParams signerRequestParams) {
+-        return sign(stringToSign.getBytes(Charset.forName("UTF-8")), signingKey,
+-                SigningAlgorithm.HmacSHA256);
+-    }
+-
+-    /**
+-     * Creates the authorization header to be included in the request.
+-     */
+-    private String buildAuthorizationHeader(SignableRequest request,
+-            byte[] signature, AWSCredentials credentials,
+-            AWS4SignerRequestParams signerParams) {
+-        final String signingCredentials = credentials.getAWSAccessKeyId() + "/"
+-                + signerParams.getScope();
+-
+-        final String credential = "Credential="
+-                + signingCredentials;
+-        final String signerHeaders = "SignedHeaders="
+-                + getSignedHeadersString(request);
+-        final String signatureHeader = "Signature="
+-                + BinaryUtils.toHex(signature);
+-
+-        final StringBuilder authHeaderBuilder = new StringBuilder();
+-
+-        authHeaderBuilder.append(AWS4_SIGNING_ALGORITHM)
+-                         .append(" ")
+-                         .append(credential)
+-                         .append(", ")
+-                         .append(signerHeaders)
+-                         .append(", ")
+-                         .append(signatureHeader);
+-
+-        return authHeaderBuilder.toString();
+-    }
+-
+-    /**
+-     * Includes all the signing headers as request parameters for pre-signing.
+-     */
+-    private void addPreSignInformationToRequest(SignableRequest request,
+-            AWSCredentials credentials, AWS4SignerRequestParams signerParams,
+-            String timeStamp, long expirationInSeconds) {
+-
+-        String signingCredentials = credentials.getAWSAccessKeyId() + "/"
+-                + signerParams.getScope();
+-
+-        request.addParameter(X_AMZ_ALGORITHM, AWS4_SIGNING_ALGORITHM);
+-        request.addParameter(X_AMZ_DATE, timeStamp);
+-        request.addParameter(X_AMZ_SIGNED_HEADER,
+-                getSignedHeadersString(request));
+-        request.addParameter(X_AMZ_EXPIRES,
+-                Long.toString(expirationInSeconds));
+-        request.addParameter(X_AMZ_CREDENTIAL, signingCredentials);
+-    }
+-
+-    @Override
+-    protected void addSessionCredentials(SignableRequest request,
+-            AWSSessionCredentials credentials) {
+-        request.addHeader(X_AMZ_SECURITY_TOKEN, credentials.getSessionToken());
+-    }
+-
+-    protected String getCanonicalizedHeaderString(SignableRequest request) {
+-        final List sortedHeaders = new ArrayList(request.getHeaders()
+-                .keySet());
+-        Collections.sort(sortedHeaders, String.CASE_INSENSITIVE_ORDER);
+-
+-        final Map requestHeaders = request.getHeaders();
+-        StringBuilder buffer = new StringBuilder();
+-        for (String header : sortedHeaders) {
+-            if (shouldExcludeHeaderFromSigning(header)) {
+-                continue;
+-            }
+-            String key = StringUtils.lowerCase(header);
+-            String value = requestHeaders.get(header);
+-
+-            StringUtils.appendCompactedString(buffer, key);
+-            buffer.append(":");
+-            if (value != null) {
+-                StringUtils.appendCompactedString(buffer, value);
+-            }
+-
+-            buffer.append("\n");
+-        }
+-
+-        return buffer.toString();
+-    }
+-
+-    protected String getSignedHeadersString(SignableRequest request) {
+-        final List sortedHeaders = new ArrayList(request
+-                .getHeaders().keySet());
+-        Collections.sort(sortedHeaders, String.CASE_INSENSITIVE_ORDER);
+-
+-        StringBuilder buffer = new StringBuilder();
+-        for (String header : sortedHeaders) {
+-            if (shouldExcludeHeaderFromSigning(header)) {
+-                continue;
+-            }
+-            if (buffer.length() > 0)
+-                buffer.append(";");
+-            buffer.append(StringUtils.lowerCase(header));
+-        }
+-
+-        return buffer.toString();
+-    }
+-
+-    protected boolean shouldExcludeHeaderFromSigning(String header) {
+-        return listOfHeadersToIgnoreInLowerCase.contains(header.toLowerCase());
+-    }
+-
+-    protected void addHostHeader(SignableRequest request) {
+-        // AWS4 requires that we sign the Host header so we
+-        // have to have it in the request by the time we sign.
+-
+-        final URI endpoint = request.getEndpoint();
+-        final StringBuilder hostHeaderBuilder = new StringBuilder(
+-                endpoint.getHost());
+-        if (SdkHttpUtils.isUsingNonDefaultPort(endpoint)) {
+-            hostHeaderBuilder.append(":").append(endpoint.getPort());
+-        }
+-
+-        request.addHeader(HOST, hostHeaderBuilder.toString());
+-    }
+-
+-    /**
+-     * Calculate the hash of the request's payload. Subclass could override this
+-     * method to provide different values for "x-amz-content-sha256" header or
+-     * do any other necessary set-ups on the request headers. (e.g. aws-chunked
+-     * uses a pre-defined header value, and needs to change some headers
+-     * relating to content-encoding and content-length.)
+-     */
+-    protected String calculateContentHash(SignableRequest request) {
+-        InputStream payloadStream = getBinaryRequestPayloadStream(request);
+-        ReadLimitInfo info = request.getReadLimitInfo();
+-        payloadStream.mark(info == null ? -1 : info.getReadLimit());
+-        String contentSha256 = BinaryUtils.toHex(hash(payloadStream));
+-        try {
+-            payloadStream.reset();
+-        } catch (IOException e) {
+-            throw new SdkClientException(
+-                    "Unable to reset stream after calculating AWS4 signature",
+-                    e);
+-        }
+-        return contentSha256;
+-    }
+-
+-    /**
+-     * Subclass could override this method to perform any additional procedure
+-     * on the request payload, with access to the result from signing the
+-     * header. (e.g. Signing the payload by chunk-encoding). The default
+-     * implementation doesn't need to do anything.
+-     */
+-    protected void processRequestPayload(SignableRequest request, byte[] signature,
+-            byte[] signingKey, AWS4SignerRequestParams signerRequestParams) {
+-        return;
+-    }
+-
+-    /**
+-     * Calculate the hash of the request's payload. In case of pre-sign, the
+-     * existing code would generate the hash of an empty byte array and returns
+-     * it. This method can be overridden by sub classes to provide different
+-     * values (e.g) For S3 pre-signing, the content hash calculation is
+-     * different from the general implementation.
+-     *
+-     */
+-    protected String calculateContentHashPresign(SignableRequest request) {
+-        return calculateContentHash(request);
+-    }
+-
+-    /**
+-     * Checks if the credentials is an instance of
+-     * AnonymousAWSCredentials
+-     */
+-    private boolean isAnonymous(AWSCredentials credentials) {
+-        return credentials instanceof AnonymousAWSCredentials;
+-    }
+-
+-    /**
+-     * Generates an expiration date for the presigned url. If user has specified
+-     * an expiration date, check if it is in the given limit.
+-     */
+-    private long generateExpirationDate(Date expirationDate) {
+-
+-        long expirationInSeconds = expirationDate != null ? ((expirationDate
+-                .getTime() - clock.currentTimeMillis()) / 1000L)
+-                : PRESIGN_URL_MAX_EXPIRATION_SECONDS;
+-
+-        if (expirationInSeconds > PRESIGN_URL_MAX_EXPIRATION_SECONDS) {
+-            throw new SdkClientException(
+-                    "Requests that are pre-signed by SigV4 algorithm are valid for at most 7 days. "
+-                            + "The expiration date set on the current request ["
+-                            + AWS4SignerUtils.formatTimestamp(expirationDate
+-                                    .getTime()) + "] has exceeded this limit.");
+-        }
+-        return expirationInSeconds;
+-    }
+-
+-    /**
+-     * Generates a new signing key from the given parameters and returns it.
+-     */
+-    protected byte[] newSigningKey(AWSCredentials credentials,
+-            String dateStamp, String regionName, String serviceName) {
+-        byte[] kSecret = ("AWS4" + credentials.getAWSSecretKey())
+-                .getBytes(Charset.forName("UTF-8"));
+-        byte[] kDate = sign(dateStamp, kSecret, SigningAlgorithm.HmacSHA256);
+-        byte[] kRegion = sign(regionName, kDate, SigningAlgorithm.HmacSHA256);
+-        byte[] kService = sign(serviceName, kRegion,
+-                SigningAlgorithm.HmacSHA256);
+-        return sign(AWS4_TERMINATOR, kService, SigningAlgorithm.HmacSHA256);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/AWS4UnsignedPayloadSigner.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/AWS4UnsignedPayloadSigner.java
+--- ./src/main/java/com/amazonaws/auth/AWS4UnsignedPayloadSigner.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/AWS4UnsignedPayloadSigner.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,55 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth;
+-
+-import com.amazonaws.SignableRequest;
+-import com.amazonaws.annotation.SdkTestInternalApi;
+-import com.amazonaws.util.BinaryUtils;
+-
+-import static com.amazonaws.auth.internal.SignerConstants.X_AMZ_CONTENT_SHA256;
+-
+-/**
+- * Exactly the same as {@link AWS4Signer} except if the request is being sent
+- * over HTTPS, then it returns the string UNSIGNED-PAYLOAD as the
+- * content SHA-256 so services that support it can avoid needing to calculate
+- * the value when authorizing the request.
+- * 

+- * Payloads are still signed for requests over HTTP to preserve the request
+- * integrity over a non-secure transport.
+- */
+-public class AWS4UnsignedPayloadSigner extends AWS4Signer {
+-    public AWS4UnsignedPayloadSigner() {
+-        super();
+-    }
+-
+-    @SdkTestInternalApi
+-    public AWS4UnsignedPayloadSigner(SdkClock clock) {
+-        super(clock);
+-    }
+-
+-    @Override
+-    public void sign(SignableRequest request, AWSCredentials credentials) {
+-        request.getHeaders().put(X_AMZ_CONTENT_SHA256, "required");
+-        super.sign(request, credentials);
+-    }
+-
+-    @Override
+-    protected String calculateContentHash(SignableRequest request) {
+-        if ("https".equals(request.getEndpoint().getScheme())) {
+-            return "UNSIGNED-PAYLOAD";
+-        }
+-        return super.calculateContentHash(request);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/CanHandleNullCredentials.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/CanHandleNullCredentials.java
+--- ./src/main/java/com/amazonaws/auth/CanHandleNullCredentials.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/CanHandleNullCredentials.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,24 +0,0 @@
+-/*
+- * Copyright (c) 2016. Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.auth;
+-
+-import com.amazonaws.SignableRequest;
+-
+-/**
+- * Used to explicitly indicate that a {@link com.amazonaws.auth.Signer} can gracefully handle
+- * credentials being null when calling {@link com.amazonaws.auth.Signer#sign(SignableRequest, AWSCredentials)}
+- */
+-public interface CanHandleNullCredentials {}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/EndpointPrefixAwareSigner.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/EndpointPrefixAwareSigner.java
+--- ./src/main/java/com/amazonaws/auth/EndpointPrefixAwareSigner.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/EndpointPrefixAwareSigner.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,36 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at:
+- *
+- *    http://aws.amazon.com/apache2.0
+- *
+- * This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+- * OR CONDITIONS OF ANY KIND, either express or implied. See the
+- * License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package com.amazonaws.auth;
+-
+-/**
+- * A signer that knows the endpoint prefix of the AWS service.
+- *
+- * For example,
+- * s3 is the endpoint prefix for Amazon S3 service.
+- * iot is the endpoint prefix for AWS Iot service.
+- *
+- * The endpoint prefix will be used to compute the region to use
+- * for signing if it is not already computed.
+- */
+-public interface EndpointPrefixAwareSigner extends Signer {
+-
+-    /**
+-     * Configure the signer with the endpoint prefix
+-     * of the service it is talking to.
+-     *
+-     * @param value The endpoint prefix of the service
+-     */
+-    void setEndpointPrefix(String value);
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/internal/AWS4SignerRequestParams.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/internal/AWS4SignerRequestParams.java
+--- ./src/main/java/com/amazonaws/auth/internal/AWS4SignerRequestParams.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/internal/AWS4SignerRequestParams.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,199 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth.internal;
+-
+-import com.amazonaws.auth.SdkClock;
+-import java.util.Date;
+-
+-import com.amazonaws.SignableRequest;
+-import com.amazonaws.util.AwsHostNameUtils;
+-
+-/**
+- * Parameters that are used for computing a AWS 4 signature for a request.
+- */
+-public final class AWS4SignerRequestParams {
+-
+-    /**
+-     * The request for which the signature needs to be computed.
+-     */
+-    private final SignableRequest request;
+-
+-    /**
+-     * The datetime in milliseconds for which the signature needs to be
+-     * computed.
+-     */
+-    private final long signingDateTimeMilli;
+-
+-    /**
+-     * The scope of the signature.
+-     */
+-    private final String scope;
+-
+-    /**
+-     * The AWS region to be used for computing the signature.
+-     */
+-    private final String regionName;
+-
+-    /**
+-     * The name of the AWS service.
+-     */
+-    private final String serviceName;
+-
+-    /**
+-     * UTC formatted version of the signing time stamp.
+-     */
+-    private final String formattedSigningDateTime;
+-
+-    /**
+-     * UTC Formatted Signing date with time stamp stripped
+-     */
+-    private final String formattedSigningDate;
+-
+-    /**
+-     * The signing algorithm to be used for computing the signature.
+-     */
+-    private final String signingAlgorithm;
+-
+-    /**
+-     * Generates an instance of AWS4signerRequestParams that holds the
+-     * parameters used for computing a AWS 4 signature for a request
+-     */
+-    public AWS4SignerRequestParams(SignableRequest request,
+-            Date signingDateOverride, String regionNameOverride,
+-            String serviceName, String signingAlgorithm) {
+-        this(request, signingDateOverride, regionNameOverride,
+-                serviceName, signingAlgorithm, null);
+-    }
+-
+-    /**
+-     * Generates an instance of AWS4signerRequestParams that holds the
+-     * parameters used for computing a AWS 4 signature for a request
+-     */
+-    public AWS4SignerRequestParams(SignableRequest request,
+-                                   Date signingDateOverride, String regionNameOverride,
+-                                   String serviceName, String signingAlgorithm,
+-                                   String endpointPrefix) {
+-        if (request == null) {
+-            throw new IllegalArgumentException("Request cannot be null");
+-        }
+-        if (signingAlgorithm == null) {
+-            throw new IllegalArgumentException(
+-                    "Signing Algorithm cannot be null");
+-        }
+-        this.request = request;
+-        this.signingDateTimeMilli = signingDateOverride != null ? signingDateOverride
+-                .getTime() : getSigningDate(request);
+-        this.formattedSigningDate = AWS4SignerUtils
+-                .formatDateStamp(signingDateTimeMilli);
+-        this.serviceName = serviceName;
+-
+-        this.regionName = regionNameOverride != null
+-                ? regionNameOverride : resolveRegion(endpointPrefix, this.serviceName);
+-
+-        this.scope = generateScope(request, formattedSigningDate, this.serviceName,
+-                regionName);
+-        this.formattedSigningDateTime = AWS4SignerUtils
+-                .formatTimestamp(signingDateTimeMilli);
+-        this.signingAlgorithm = signingAlgorithm;
+-    }
+-
+-    /*
+-     * Ideally, we should be using endpoint prefix to parse the region from host.
+-     *
+-     * Previously we were using service signing name to parse region. It is possible that
+-     * endpoint prefix is null if customers are still using older clients. So using
+-     * service signing name as alternative will prevent any behavior breaking change.
+-     */
+-    private String resolveRegion(String endpointPrefix, String serviceSigningName) {
+-
+-        return AwsHostNameUtils.parseRegionName(request.getEndpoint().getHost(),
+-                endpointPrefix != null ? endpointPrefix : serviceSigningName);
+-    }
+-
+-    /**
+-     * Returns the signing date from the request.
+-     */
+-    private final long getSigningDate(SignableRequest request) {
+-        return SdkClock.Instance.get().currentTimeMillis() - request.getTimeOffset() * 1000L;
+-    }
+-
+-    /**
+-     * Returns the scope to be used for the signing.
+-     */
+-    private String generateScope(SignableRequest request, String dateStamp,
+-            String serviceName, String regionName) {
+-        final StringBuilder scopeBuilder = new StringBuilder();
+-        return scopeBuilder.append(dateStamp).append("/").append(regionName)
+-                .append("/").append(serviceName).append("/")
+-                .append(SignerConstants.AWS4_TERMINATOR).toString();
+-    }
+-
+-    /**
+-     * Returns the request for which the signing needs to be done.
+-     */
+-    public SignableRequest getRequest() {
+-        return request;
+-    }
+-
+-    /**
+-     * Returns the scope of the signing.
+-     */
+-    public String getScope() {
+-        return scope;
+-    }
+-
+-    /**
+-     * Returns the formatted date and time of the signing date in UTC zone.
+-     */
+-    public String getFormattedSigningDateTime() {
+-        return formattedSigningDateTime;
+-    }
+-
+-    /**
+-     * Returns the signing date time in millis for which the signature needs to
+-     * be computed.
+-     */
+-    public long getSigningDateTimeMilli() {
+-        return signingDateTimeMilli;
+-    }
+-
+-    /**
+-     * Returns the AWS region name to be used while computing the signature.
+-     */
+-    public String getRegionName() {
+-        return regionName;
+-    }
+-
+-    /**
+-     * Returns the AWS Service name to be used while computing the signature.
+-     */
+-    public String getServiceName() {
+-        return serviceName;
+-    }
+-
+-    /**
+-     * Returns the formatted date in UTC zone of the signing date.
+-     */
+-    public String getFormattedSigningDate() {
+-        return formattedSigningDate;
+-    }
+-
+-    /**
+-     * Returns the signing algorithm used for computing the signature.
+-     */
+-    public String getSigningAlgorithm() {
+-        return signingAlgorithm;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/internal/AWS4SignerUtils.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/internal/AWS4SignerUtils.java
+--- ./src/main/java/com/amazonaws/auth/internal/AWS4SignerUtils.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/internal/AWS4SignerUtils.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,52 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth.internal;
+-
+-import org.joda.time.format.DateTimeFormat;
+-import org.joda.time.format.DateTimeFormatter;
+-
+-/**
+- * Utility methods that is used by the different AWS Signer implementations.
+- * This class is strictly internal and is subjected to change.
+- */
+-public final class AWS4SignerUtils {
+-
+-    private static final DateTimeFormatter dateFormatter = DateTimeFormat
+-            .forPattern("yyyyMMdd").withZoneUTC();
+-
+-    private static final DateTimeFormatter timeFormatter = DateTimeFormat
+-            .forPattern("yyyyMMdd'T'HHmmss'Z'").withZoneUTC();
+-
+-    /**
+-     * Returns a string representation of the given date time in yyyyMMdd
+-     * format. The date returned is in the UTC zone.
+-     *
+-     * For example, given a time "1416863450581", this method returns "20141124"
+-     */
+-    public static String formatDateStamp(long timeMilli) {
+-        return dateFormatter.print(timeMilli);
+-    }
+-
+-    /**
+-     * Returns a string representation of the given date time in
+-     * yyyyMMdd'T'HHmmss'Z' format. The date returned is in the UTC zone.
+-     *
+-     * For example, given a time "1416863450581", this method returns
+-     * "20141124T211050Z"
+-     */
+-    public static String formatTimestamp(long timeMilli) {
+-        return timeFormatter.print(timeMilli);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/internal/SignerConstants.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/internal/SignerConstants.java
+--- ./src/main/java/com/amazonaws/auth/internal/SignerConstants.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/internal/SignerConstants.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,47 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth.internal;
+-
+-public final class SignerConstants {
+-
+-    public static final String LINE_SEPARATOR = "\n";
+-
+-    public static final String AWS4_TERMINATOR = "aws4_request";
+-
+-    public static final String AWS4_SIGNING_ALGORITHM = "AWS4-HMAC-SHA256";
+-
+-    /** Seconds in a week, which is the max expiration time Sig-v4 accepts */
+-    public static final long PRESIGN_URL_MAX_EXPIRATION_SECONDS = 60 * 60 * 24 * 7;
+-
+-    public static final String X_AMZ_SECURITY_TOKEN = "X-Amz-Security-Token";
+-
+-    public static final String X_AMZ_CREDENTIAL = "X-Amz-Credential";
+-
+-    public static final String X_AMZ_DATE = "X-Amz-Date";
+-
+-    public static final String X_AMZ_EXPIRES = "X-Amz-Expires";
+-
+-    public static final String X_AMZ_SIGNED_HEADER = "X-Amz-SignedHeaders";
+-
+-    public static final String X_AMZ_CONTENT_SHA256 = "x-amz-content-sha256";
+-
+-    public static final String X_AMZ_SIGNATURE = "X-Amz-Signature";
+-
+-    public static final String X_AMZ_ALGORITHM = "X-Amz-Algorithm";
+-
+-    public static final String AUTHORIZATION = "Authorization";
+-
+-    public static final String HOST = "Host";
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/internal/SignerKey.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/internal/SignerKey.java
+--- ./src/main/java/com/amazonaws/auth/internal/SignerKey.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/internal/SignerKey.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,57 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth.internal;
+-
+-import com.amazonaws.annotation.Immutable;
+-
+-/**
+- * Holds the signing key and the number of days since epoch for the date for
+- * which the signing key was generated.
+- */
+-@Immutable
+-public final class SignerKey {
+-
+-    private final long numberOfDaysSinceEpoch;
+-
+-    private final byte[] signingKey;
+-
+-    public SignerKey(long numberOfDaysSinceEpoch, byte[] signingKey) {
+-        if (numberOfDaysSinceEpoch <= 0L) {
+-            throw new IllegalArgumentException(
+-                    "Not able to cache signing key. Signing date to be cached is invalid");
+-        }
+-        if (signingKey == null) {
+-            throw new IllegalArgumentException(
+-                    "Not able to cache signing key. Signing Key to be cached are null");
+-        }
+-        this.numberOfDaysSinceEpoch = numberOfDaysSinceEpoch;
+-        this.signingKey = signingKey.clone();
+-    }
+-
+-    /**
+-     * Returns the number of days since epoch for the date used for generating
+-     * signing key.
+-     */
+-    public long getNumberOfDaysSinceEpoch() {
+-        return numberOfDaysSinceEpoch;
+-    }
+-
+-    /**
+-     * Returns a copy of the signing key.
+-     */
+-    public byte[] getSigningKey() {
+-        return signingKey.clone();
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/NoOpSigner.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/NoOpSigner.java
+--- ./src/main/java/com/amazonaws/auth/NoOpSigner.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/NoOpSigner.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,26 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth;
+-
+-import com.amazonaws.SignableRequest;
+-
+-/**
+- * A No-Op Signer Implementation.
+- */
+-public class NoOpSigner implements Signer {
+-
+-    @Override
+-    public void sign(SignableRequest request, AWSCredentials credentials) { }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/policy/Action.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/Action.java
+--- ./src/main/java/com/amazonaws/auth/policy/Action.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/Action.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,47 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth.policy;
+-
+-/**
+- * An access control policy action identifies a specific action in a service
+- * that can be performed on a resource. For example, sending a message to a
+- * queue.
+- * 

+- * Actions allow you to limit what your access control policy statement affects.
+- * For example, you could create a policy statement that enables a certain group
+- * of users to send messages to your queue, but not allow them to perform any
+- * other actions on your queue.
+- * 

+- * The action is B in the statement
+- * "A has permission to do B to C where D applies."
+- * 

+- * Free form access control policy actions may include a wildcard (*) to match
+- * multiple actions.
+- * 

+- * This class is not intended to be directly implemented, instead developers
+- * should see the classes available in com.amazonaws.auth.policy.actions for
+- * more information on the available actions for each service.
+- */
+-public interface Action {
+-
+-    /**
+-     * Returns the name of this action. For example, 'sqs:SendMessage' is the
+-     * name corresponding to the SQS action that enables users to send a message
+-     * to an SQS queue.
+-     *
+-     * @return The name of this action.
+-     */
+-    public String getActionName();
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/policy/actions/package-info.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/actions/package-info.java
+--- ./src/main/java/com/amazonaws/auth/policy/actions/package-info.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/actions/package-info.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,21 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-/**
+- * Collection of actions for AWS access control policies.  Actions describe how
+- * AWS resources are being accessed or modified when an AWS access control policy
+- * is evaluated for an incoming request.
+- */
+-package com.amazonaws.auth.policy.actions;
+diff -Nau8r ./src/main/java/com/amazonaws/auth/policy/Condition.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/Condition.java
+--- ./src/main/java/com/amazonaws/auth/policy/Condition.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/Condition.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,185 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth.policy;
+-
+-import java.util.Arrays;
+-import java.util.List;
+-
+-import com.amazonaws.auth.policy.conditions.ConditionFactory;
+-import com.amazonaws.auth.policy.conditions.NumericCondition;
+-import com.amazonaws.auth.policy.conditions.NumericCondition.NumericComparisonType;
+-
+-/**
+- * AWS access control policy conditions are contained in {@link Statement}
+- * objects, and affect when a statement is applied. For example, a statement
+- * that allows access to an Amazon SQS queue could use a condition to only apply
+- * the effect of that statement for requests that are made before a certain
+- * date, or that originate from a range of IP addresses.
+- * 

+- * Multiple conditions can be included in a single statement, and all conditions
+- * must evaluate to true in order for the statement to take effect.
+- * 

+- * The set of conditions is D in the statement
+- * "A has permission to do B to C where D applies."
+- * 

+- * A condition is composed of three parts:
+- * 
    
+- * 
  • Condition Key - The condition key declares which value of a
+- * request to pull in and compare against when a policy is evaluated by AWS. For
+- * example, using {@link ConditionFactory#SOURCE_IP_CONDITION_KEY} will cause
+- * AWS to pull in the current request's source IP as the first value to compare
+- * against every time your policy is evaluated.
+- * 
  • Comparison Type - Most condition types allow several ways to
+- * compare the value obtained from the condition key and the comparison value.
+- * For example, the {@link NumericComparisonType} enumerates the ways a
+- * {@link NumericCondition} can be evaluated (less than, greater than, equals,
+- * etc).
+- * 
  • Comparison Value - This is a static value used as the second value
+- * in the comparison when your policy is evaluated. Depending on the comparison
+- * type, this value can optionally use wildcards. See the documentation for
+- * individual comparison types for more information.
+- * 

+- * 

+- * There are many expressive conditions available in the
+- * com.amazonaws.auth.policy.conditions package to use in access
+- * control policy statements.
+- * 

+- * This class is not intended to be directly subclassed by users, instead users
+- * should use the many available conditions and condition factories in the
+- * com.amazonaws.auth.policy.conditions package.
+- */
+-public class Condition {
+-    protected String type;
+-    protected String conditionKey;
+-    protected List values;
+-
+-    /**
+-     * Returns the type of this condition.
+-     *
+-     * @return The type of this condition.
+-     */
+-    public String getType() {
+-        return type;
+-    }
+-
+-    /**
+-     * Sets the type of this condition.
+-     *
+-     * @param type
+-     *            The type of this condition.
+-     */
+-    public void setType(String type) {
+-        this.type = type;
+-    }
+-
+-    /**
+-     * Returns the name of the condition key involved in this condition.
+-     * Condition keys are predefined values supported by AWS that provide input
+-     * to a condition's evaluation, such as the current time, or the IP address
+-     * of the incoming request.
+-     * 

+-     * Your policy is evaluated for each incoming request, and condition keys
+-     * specify what information to pull out of those incoming requests and plug
+-     * into the conditions in your policy.
+-     *
+-     * @return The name of the condition key involved in this condition.
+-     */
+-    public String getConditionKey() {
+-        return conditionKey;
+-    }
+-
+-    /**
+-     * Sets the name of the condition key involved in this condition.
+-     * Condition keys are predefined values supported by AWS that provide
+-     * input to a condition's evaluation, such as the current time, or the IP
+-     * address of the incoming request.
+-     * 

+-     * Your policy is evaluated for each incoming request, and condition keys
+-     * specify what information to pull out of those incoming requests and plug
+-     * into the conditions in your policy.
+-     *
+-     * @param conditionKey
+-     *            The name of the condition key involved in this condition.
+-     */
+-    public void setConditionKey(String conditionKey) {
+-        this.conditionKey = conditionKey;
+-    }
+-
+-    /**
+-     * Returns the values specified for this access control policy condition.
+-     * For example, in a condition that compares the incoming IP address of a
+-     * request to a specified range of IP addresses, the range of IP addresses
+-     * is the single value in the condition.
+-     * 

+-     * Most conditions accept only one value, but multiple values are possible.
+-     *
+-     * @return The values specified for this access control policy condition.
+-     */
+-    public List getValues() {
+-        return values;
+-    }
+-
+-    /**
+-     * Sets the values specified for this access control policy condition. For
+-     * example, in a condition that compares the incoming IP address of a
+-     * request to a specified range of IP addresses, the range of IP addresses
+-     * is the single value in the condition.
+-     * 

+-     * Most conditions accept only one value, but multiple values are possible.
+-     *
+-     * @param values
+-     *            The values specified for this access control policy condition.
+-     */
+-    public void setValues(List values) {
+-        this.values = values;
+-    }
+-
+-    /**
+-     * Fluent version of {@link Condition#setType(String)}
+-     * @return this
+-     */
+-    public Condition withType(String type) {
+-        setType(type);
+-        return this;
+-    }
+-
+-    /**
+-     * Fluent version of {@link Condition#setConditionKey(String)}
+-     * @return this
+-     */
+-    public Condition withConditionKey(String key) {
+-        setConditionKey(key);
+-        return this;
+-    }
+-
+-    /**
+-     * Fluent version of {@link Condition#setValues(List)}
+-     * @return this
+-     */
+-    public Condition withValues(String... values) {
+-        setValues(Arrays.asList(values));
+-        return this;
+-    }
+-
+-
+-    /**
+-     * Fluent version of {@link Condition#setValues(List)}
+-     * @return this
+-     */
+-    public Condition withValues(List values) {
+-        setValues(values);
+-        return this;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/policy/conditions/ArnCondition.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/conditions/ArnCondition.java
+--- ./src/main/java/com/amazonaws/auth/policy/conditions/ArnCondition.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/conditions/ArnCondition.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,94 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth.policy.conditions;
+-
+-import java.util.Arrays;
+-
+-import com.amazonaws.auth.policy.Condition;
+-
+-/**
+- * AWS access control policy condition that allows an access control statement
+- * to be conditionally applied based on the comparison of an Amazon Resource
+- * Name (ARN).
+- * 

+- * An Amazon Resource Name (ARN) takes the following format:
+- * arn:aws:<vendor>:<region>:<namespace>:<relative-id>
+- * 

+- * 
    
+- * 
  • vendor identifies the AWS product (e.g., sns)
    • 
+- * 
  • region is the AWS Region the resource resides in (e.g., us-east-1), if
+- * any
+- * 
  • namespace is the AWS account ID with no hyphens (e.g., 123456789012)
+- * 
  • relative-id is the service specific portion that identifies the specific
+- * resource
+- * 

+- * 

+- * For example, an Amazon SQS queue might be addressed with the following ARN:
+- * arn:aws:sqs:us-east-1:987654321000:MyQueue
+- * 

+- * 

+- * Currently the only valid condition key to use in an ARN condition is
+- * {@link ConditionFactory#SOURCE_ARN_CONDITION_KEY}, which indicates the
+- * source resource that is modifying another resource, for example, an SNS topic
+- * is the source ARN when publishing messages from the topic to an SQS queue.
+- */
+-public class ArnCondition extends Condition {
+-
+-    /**
+-     * Enumeration of the supported ways an ARN comparison can be evaluated.
+-     */
+-    public static enum ArnComparisonType {
+-        /** Exact matching */
+-        ArnEquals,
+-
+-        /**
+-         * Loose case-insensitive matching of the ARN. Each of the six
+-         * colon-delimited components of the ARN is checked separately and each
+-         * can include a multi-character match wildcard (*) or a
+-         * single-character match wildcard (?).
+-         */
+-        ArnLike,
+-
+-        /** Negated form of {@link #ArnEquals} */
+-        ArnNotEquals,
+-
+-        /** Negated form of {@link #ArnLike} */
+-        ArnNotLike;
+-    };
+-
+-    /**
+-     * Constructs a new access control policy condition that compares ARNs
+-     * (Amazon Resource Names).
+-     *
+-     * @param type
+-     *            The type of comparison to perform.
+-     * @param key
+-     *            The access policy condition key specifying where to get the
+-     *            first ARN for the comparison (ex:
+-     *            {@link ConditionFactory#SOURCE_ARN_CONDITION_KEY}).
+-     * @param value
+-     *            The second ARN to compare against. When using
+-     *            {@link ArnComparisonType#ArnLike} or
+-     *            {@link ArnComparisonType#ArnNotLike} this may contain the
+-     *            multi-character wildcard (*) or the single-character wildcard
+-     *            (?).
+-     */
+-    public ArnCondition(ArnComparisonType type, String key, String value) {
+-        super.type = type.toString();
+-        super.conditionKey = key;
+-        super.values = Arrays.asList(new String[] {value});
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/policy/conditions/BooleanCondition.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/conditions/BooleanCondition.java
+--- ./src/main/java/com/amazonaws/auth/policy/conditions/BooleanCondition.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/conditions/BooleanCondition.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,43 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth.policy.conditions;
+-
+-import java.util.Arrays;
+-
+-import com.amazonaws.auth.policy.Condition;
+-
+-/**
+- * AWS access control policy condition that allows an access control statement to be
+- * conditionally applied based on a comparison of boolean values.
+- */
+-public class BooleanCondition extends Condition {
+-
+-    /**
+-     * Constructs a new access policy condition that performs a boolean
+-     * comparison.
+-     *
+-     * @param key
+-     *            The access policy condition key specifying where to get the
+-     *            first boolean value for the comparison (ex:
+-     *            aws:SecureTransport).
+-     * @param value
+-     *            The boolean to compare against.
+-     */
+-    public BooleanCondition(String key, boolean value) {
+-        super.type = "Bool";
+-        super.conditionKey = key;
+-        super.values = Arrays.asList(new String[] {Boolean.toString(value)});
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/policy/conditions/ConditionFactory.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/conditions/ConditionFactory.java
+--- ./src/main/java/com/amazonaws/auth/policy/conditions/ConditionFactory.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/conditions/ConditionFactory.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,174 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth.policy.conditions;
+-
+-import com.amazonaws.auth.policy.Condition;
+-import com.amazonaws.auth.policy.conditions.ArnCondition.ArnComparisonType;
+-import com.amazonaws.auth.policy.conditions.StringCondition.StringComparisonType;
+-
+-/**
+- * Factory for creating common AWS access control policy conditions. These
+- * conditions are common for AWS services and can be expected to work across any
+- * service that supports AWS access control policies.
+- */
+-public class ConditionFactory {
+-
+-    /**
+-     * Condition key for the current time.
+-     * 

+-     * This condition key should only be used with {@link DateCondition}
+-     * objects.
+-     */
+-    public static final String CURRENT_TIME_CONDITION_KEY = "aws:CurrentTime";
+-
+-    /**
+-     * Condition key for whether or not an incoming request is using a secure
+-     * transport to make the request (i.e. HTTPS instead of HTTP).
+-     * 

+-     * This condition key should only be used with {@link BooleanCondition}
+-     * objects.
+-     */
+-    public static final String SECURE_TRANSPORT_CONDITION_KEY = "aws:SecureTransport";
+-
+-    /**
+-     * Condition key for the source IP from which a request originates.
+-     * 

+-     * This condition key should only be used with {@link IpAddressCondition}
+-     * objects.
+-     */
+-    public static final String SOURCE_IP_CONDITION_KEY = "aws:SourceIp";
+-
+-    /**
+-     * Condition key for the user agent included in a request.
+-     * 

+-     * This condition key should only be used with {@link StringCondition}
+-     * objects.
+-     */
+-    public static final String USER_AGENT_CONDITION_KEY = "aws:UserAgent";
+-
+-    /**
+-     * Condition key for the current time, in epoch seconds.
+-     * 

+-     * This condition key should only be used with {@link NumericCondition}
+-     * objects.
+-     */
+-    public static final String EPOCH_TIME_CONDITION_KEY = "aws:EpochTime";
+-
+-    /**
+-     * Condition key for the referer specified by a request.
+-     * 

+-     * This condition key should only be used with {@link StringCondition}
+-     * objects.
+-     */
+-    public static final String REFERER_CONDITION_KEY = "aws:Referer";
+-
+-    /**
+-     * Condition key for the Amazon Resource Name (ARN) of the source specified
+-     * in a request. The source ARN indicates which resource is affecting the
+-     * resource listed in your policy. For example, an SNS topic is the source
+-     * ARN when publishing messages from the topic to an SQS queue.
+-     * 

+-     * This condition key should only be used with {@link ArnCondition} objects.
+-     */
+-    public static final String SOURCE_ARN_CONDITION_KEY = "aws:SourceArn";
+-
+-    private ConditionFactory() {}
+-
+-    /**
+-     * Constructs a new access policy condition that compares the Amazon
+-     * Resource Name (ARN) of the source of an AWS resource that is modifying
+-     * another AWS resource with the specified pattern.
+-     * 

+-     * For example, the source ARN could be an Amazon SNS topic ARN that is
+-     * sending messages to an Amazon SQS queue. In that case, the SNS topic ARN
+-     * would be compared the ARN pattern specified here.
+-     * 

+-     * The endpoint pattern may optionally contain the multi-character wildcard
+-     * (*) or the single-character wildcard (?). Each of the six colon-delimited
+-     * components of the ARN is checked separately and each can include a
+-     * wildcard.
+-     *
+-     * 
+-     * Policy policy = new Policy("MyQueuePolicy");
+-     * policy.withStatements(new Statement("AllowSNSMessages", Effect.Allow)
+-     *         .withPrincipals(new Principal("*")).withActions(SQSActions.SendMessage)
+-     *         .withResources(new Resource(myQueueArn))
+-     *         .withConditions(ConditionFactory.newSourceArnCondition(myTopicArn)));
+-     * 

+-     *
+-     * @param arnPattern
+-     *            The ARN pattern against which the source ARN will be compared.
+-     *            Each of the six colon-delimited components of the ARN is
+-     *            checked separately and each can include a wildcard.
+-     *
+-     * @return A new access control policy condition that compares the ARN of
+-     *         the source specified in an incoming request with the ARN pattern
+-     *         specified here.
+-     */
+-    public static Condition newSourceArnCondition(String arnPattern) {
+-        return new ArnCondition(ArnComparisonType.ArnLike, SOURCE_ARN_CONDITION_KEY, arnPattern);
+-    }
+-
+-    /**
+-     * Constructs a new access control policy condition that tests if the
+-     * incoming request was sent over a secure transport (HTTPS).
+-     *
+-     * @return A new access control policy condition that tests if the incoming
+-     *         request was sent over a secure transport (HTTPS).
+-     */
+-    public static Condition newSecureTransportCondition() {
+-        return new BooleanCondition(SECURE_TRANSPORT_CONDITION_KEY, true);
+-    }
+-
+-    /**
+-     * Constructs a new access control policy condition that tests the incoming
+-     * request's user agent field against the specified value, using the
+-     * specified comparison type. This condition can be used to allow or deny
+-     * access to a resource based on what user agent is specified in the
+-     * request.
+-     *
+-     * @param comparisonType
+-     *            The type of string comparison to perform when testing an
+-     *            incoming request's user agent field with the specified value.
+-     * @param value
+-     *            The value against which to compare the incoming request's user
+-     *            agent.
+-     *
+-     * @return A new access control policy condition that tests an incoming
+-     *         request's user agent field.
+-     */
+-    public static Condition newUserAgentCondition(StringComparisonType comparisonType, String value) {
+-        return new StringCondition(comparisonType, USER_AGENT_CONDITION_KEY, value);
+-    }
+-
+-    /**
+-     * Constructs a new access control policy condition that tests the incoming
+-     * request's referer field against the specified value, using the specified
+-     * comparison type.
+-     *
+-     * @param comparisonType
+-     *            The type of string comparison to perform when testing an
+-     *            incoming request's referer field with the specified value.
+-     * @param value
+-     *            The value against which to compare the incoming request's
+-     *            referer field.
+-     *
+-     * @return A new access control policy condition that tests an incoming
+-     *         request's referer field.
+-     */
+-    public static Condition newRefererCondition(StringComparisonType comparisonType, String value) {
+-        return new StringCondition(comparisonType, REFERER_CONDITION_KEY, value);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/policy/conditions/DateCondition.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/conditions/DateCondition.java
+--- ./src/main/java/com/amazonaws/auth/policy/conditions/DateCondition.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/conditions/DateCondition.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,60 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth.policy.conditions;
+-
+-import java.util.Arrays;
+-import java.util.Date;
+-
+-import com.amazonaws.auth.policy.Condition;
+-import com.amazonaws.util.DateUtils;
+-
+-/**
+- * AWS access control policy condition that allows an access control statement
+- * to be conditionally applied based on the comparison of the current time at
+- * which a request is received, and a specific date.
+- */
+-public class DateCondition extends Condition {
+-
+-    /**
+-     * Enumeration of the supported ways a date comparison can be evaluated.
+-     */
+-    public static enum DateComparisonType {
+-        DateEquals,
+-        DateGreaterThan,
+-        DateGreaterThanEquals,
+-        DateLessThan,
+-        DateLessThanEquals,
+-        DateNotEquals;
+-    };
+-
+-    /**
+-     * Constructs a new access policy condition that compares the current time
+-     * (on the AWS servers) to the specified date.
+-     *
+-     * @param type
+-     *            The type of comparison to perform. For example,
+-     *            {@link DateComparisonType#DateLessThan} will cause this policy
+-     *            condition to evaluate to true if the current date is less than
+-     *            the date specified in the second argument.
+-     * @param date
+-     *            The date to compare against.
+-     */
+-    public DateCondition(DateComparisonType type, Date date) {
+-        super.type = type.toString();
+-        super.conditionKey = ConditionFactory.CURRENT_TIME_CONDITION_KEY;
+-        super.values = Arrays.asList(new String[] {DateUtils.formatISO8601Date(date)});
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/policy/conditions/IpAddressCondition.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/conditions/IpAddressCondition.java
+--- ./src/main/java/com/amazonaws/auth/policy/conditions/IpAddressCondition.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/conditions/IpAddressCondition.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,96 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth.policy.conditions;
+-
+-import java.util.Arrays;
+-
+-import com.amazonaws.auth.policy.Condition;
+-
+-/**
+- * AWS access control policy condition that allows an access control statement
+- * to be conditionally applied based on the comparison of the the incoming
+- * source IP address at the time of a request against a CIDR IP range.
+- * 

+- * For more information about CIDR IP ranges, see 
+- * http://en.wikipedia.org/wiki/CIDR_notation
+- */
+-public class IpAddressCondition extends Condition {
+-
+-    /**
+-     * Enumeration of the supported ways an IP address comparison can be evaluated.
+-     */
+-    public static enum IpAddressComparisonType {
+-        /**
+-         * Matches an IP address against a CIDR IP range, evaluating to true if
+-         * the IP address being tested is in the condition's specified CIDR IP
+-         * range.
+-         * 

+-         * For more information about CIDR IP ranges, see 
+-         * http://en.wikipedia.org/wiki/CIDR_notation
+-         */
+-        IpAddress,
+-
+-        /** Negated form of {@link #IpAddress} */
+-        NotIpAddress,
+-    }
+-
+-    /**
+-     * Constructs a new access policy condition that compares the source IP
+-     * address of the incoming request to an AWS service against the specified
+-     * CIDR range. The condition evaluates to true (meaning the policy statement
+-     * containing it will be applied) if the incoming source IP address is
+-     * within that range.
+-     * 

+-     * To achieve the opposite effect (i.e. cause the condition to evaluate to
+-     * true when the incoming source IP is not in the specified CIDR
+-     * range) use the alternate constructor form and specify
+-     * {@link IpAddressComparisonType#NotIpAddress}
+-     * 

+-     * For more information about CIDR IP ranges, see 
+-     * http://en.wikipedia.org/wiki/CIDR_notation
+-     *
+-     * @param ipAddressRange
+-     *            The CIDR IP range involved in the policy condition.
+-     */
+-    public IpAddressCondition(String ipAddressRange) {
+-        this(IpAddressComparisonType.IpAddress, ipAddressRange);
+-    }
+-
+-    /**
+-     * Constructs a new access policy condition that compares the source IP
+-     * address of the incoming request to an AWS service against the specified
+-     * CIDR range. When the condition evaluates to true (i.e. when the incoming
+-     * source IP address is within the CIDR range or not) depends on the
+-     * specified {@link IpAddressComparisonType}.
+-     * 

+-     * For more information about CIDR IP ranges, see 
+-     * http://en.wikipedia.org/wiki/CIDR_notation
+-     *
+-     * @param type
+-     *            The type of comparison to to perform.
+-     * @param ipAddressRange
+-     *            The CIDR IP range involved in the policy condition.
+-     */
+-    public IpAddressCondition(IpAddressComparisonType type, String ipAddressRange) {
+-        super.type = type.toString();
+-        super.conditionKey = ConditionFactory.SOURCE_IP_CONDITION_KEY;
+-        super.values = Arrays.asList(new String[] {ipAddressRange});
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/policy/conditions/NumericCondition.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/conditions/NumericCondition.java
+--- ./src/main/java/com/amazonaws/auth/policy/conditions/NumericCondition.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/conditions/NumericCondition.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,54 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth.policy.conditions;
+-
+-import java.util.Arrays;
+-
+-import com.amazonaws.auth.policy.Condition;
+-
+-/**
+- * AWS access control policy condition that allows an access control statement to be
+- * conditionally applied based on a numeric comparison.
+- */
+-public class NumericCondition extends Condition {
+-
+-    /** Enumeration of the supported ways a numeric comparison can be evaluated */
+-    public static enum NumericComparisonType {
+-        NumericEquals,
+-        NumericGreaterThan,
+-        NumericGreaterThanEquals,
+-        NumericLessThan,
+-        NumericLessThanEquals,
+-        NumericNotEquals;
+-    };
+-
+-    /**
+-     * Constructs a new access policy condition that compares two numbers.
+-     *
+-     * @param type
+-     *            The type of comparison to perform.
+-     * @param key
+-     *            The access policy condition key specifying where to get the
+-     *            first number for the comparison.
+-     * @param value
+-     *            The second number to compare against.
+-     */
+-    public NumericCondition(NumericComparisonType type, String key, String value) {
+-        super.type = type.toString();
+-        super.conditionKey = key;
+-        super.values = Arrays.asList(new String[] {value});
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/policy/conditions/package-info.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/conditions/package-info.java
+--- ./src/main/java/com/amazonaws/auth/policy/conditions/package-info.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/conditions/package-info.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,32 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-/**
+- * Collection of AWS access control policy conditions.  The primary access policy
+- * conditions are:
+- * 
    
+- *    
  •  {@link com.amazonaws.auth.policy.conditions.ArnCondition}
+- *    
  •  {@link com.amazonaws.auth.policy.conditions.BooleanCondition}
+- *    
  •  {@link com.amazonaws.auth.policy.conditions.DateCondition}
+- *    
  •  {@link com.amazonaws.auth.policy.conditions.IpAddressCondition}
+- *    
  •  {@link com.amazonaws.auth.policy.conditions.NumericCondition}
+- *    
  •  {@link com.amazonaws.auth.policy.conditions.StringCondition}
+- * 

+- *
+- * 

+- * In addition to the primary condition types, service specific functionality
+- * is also provided.
+- */
+-package com.amazonaws.auth.policy.conditions;
+diff -Nau8r ./src/main/java/com/amazonaws/auth/policy/conditions/StringCondition.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/conditions/StringCondition.java
+--- ./src/main/java/com/amazonaws/auth/policy/conditions/StringCondition.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/conditions/StringCondition.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,78 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth.policy.conditions;
+-
+-import java.util.Arrays;
+-
+-import com.amazonaws.auth.policy.Condition;
+-
+-/**
+- * String conditions let you constrain AWS access control policy statements
+- * using string matching rules.
+- */
+-public class StringCondition extends Condition {
+-
+-    /**
+-     * Enumeration of the supported ways a string comparison can be evaluated.
+-     */
+-    public static enum StringComparisonType {
+-        /** Case-sensitive exact string matching */
+-        StringEquals,
+-
+-        /** Case-insensitive string matching */
+-        StringEqualsIgnoreCase,
+-
+-        /**
+-         * Loose case-insensitive matching. The values can include a
+-         * multi-character match wildcard (*) or a single-character match
+-         * wildcard (?) anywhere in the string.
+-         */
+-        StringLike,
+-
+-        /** Negated form of {@link #StringEquals} */
+-        StringNotEquals,
+-
+-        /** Negated form of {@link #StringEqualsIgnoreCase} */
+-        StringNotEqualsIgnoreCase,
+-
+-        /** Negated form of {@link #StringLike} */
+-        StringNotLike;
+-    }
+-
+-    /**
+-     * Constructs a new access control policy condition that compares two
+-     * strings.
+-     *
+-     * @param type
+-     *            The type of comparison to perform.
+-     * @param key
+-     *            The access policy condition key specifying where to get the
+-     *            first string for the comparison (ex: aws:UserAgent). See
+-     *            {@link ConditionFactory} for a list of the condition keys
+-     *            available for all services.
+-     * @param value
+-     *            The second string to compare against. When using
+-     *            {@link StringComparisonType#StringLike} or
+-     *            {@link StringComparisonType#StringNotLike} this may contain
+-     *            the multi-character wildcard (*) or the single-character
+-     *            wildcard (?).
+-     */
+-    public StringCondition(StringComparisonType type, String key, String value) {
+-        super.type = type.toString();
+-        super.conditionKey = key;
+-        super.values = Arrays.asList(new String[] {value});
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/policy/internal/JsonDocumentFields.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/internal/JsonDocumentFields.java
+--- ./src/main/java/com/amazonaws/auth/policy/internal/JsonDocumentFields.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/internal/JsonDocumentFields.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,28 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth.policy.internal;
+-
+-public class JsonDocumentFields {
+-     public static final String VERSION = "Version";
+-     public static final String POLICY_ID = "Id";
+-     public static final String STATEMENT = "Statement";
+-     public static final String STATEMENT_EFFECT = "Effect";
+-     public static final String EFFECT_VALUE_ALLOW = "Allow";
+-     public static final String STATEMENT_ID = "Sid";
+-     public static final String PRINCIPAL = "Principal";
+-     public static final String ACTION = "Action";
+-     public static final String RESOURCE = "Resource";
+-     public static final String CONDITION = "Condition";
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/policy/internal/JsonPolicyReader.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/internal/JsonPolicyReader.java
+--- ./src/main/java/com/amazonaws/auth/policy/internal/JsonPolicyReader.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/internal/JsonPolicyReader.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,354 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth.policy.internal;
+-
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.auth.policy.Action;
+-import com.amazonaws.auth.policy.Condition;
+-import com.amazonaws.auth.policy.Policy;
+-import com.amazonaws.auth.policy.PolicyReaderOptions;
+-import com.amazonaws.auth.policy.Principal;
+-import com.amazonaws.auth.policy.Principal.WebIdentityProviders;
+-import com.amazonaws.auth.policy.Resource;
+-import com.amazonaws.auth.policy.Statement;
+-import com.amazonaws.auth.policy.Statement.Effect;
+-import com.amazonaws.util.json.Jackson;
+-import com.fasterxml.jackson.databind.JsonNode;
+-import java.util.Iterator;
+-import java.util.LinkedList;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Map.Entry;
+-
+-/**
+- * Generate an AWS policy object by parsing the given JSON string.
+- */
+-public class JsonPolicyReader {
+-
+-    private static final String PRINCIPAL_SCHEMA_USER = "AWS";
+-
+-    private static final String PRINCIPAL_SCHEMA_SERVICE = "Service";
+-
+-    private static final String PRINCIPAL_SCHEMA_FEDERATED = "Federated";
+-
+-    private final PolicyReaderOptions options;
+-
+-    public JsonPolicyReader() {
+-        this(new PolicyReaderOptions());
+-    }
+-
+-    public JsonPolicyReader(PolicyReaderOptions options) {
+-        this.options = options;
+-    }
+-
+-    /**
+-     * Converts the specified JSON string to an AWS policy object.
+-     *
+-     * For more information see, @see
+-     * http://docs.aws.amazon.com/AWSSdkDocsJava/latest
+-     * /DeveloperGuide/java-dg-access-control.html
+-     *
+-     * @param jsonString
+-     *            the specified JSON string representation of this AWS access
+-     *            control policy.
+-     *
+-     * @return An AWS policy object.
+-     *
+-     * @throws IllegalArgumentException
+-     *             If the specified JSON string is null or invalid and cannot be
+-     *             converted to an AWS policy object.
+-     */
+-    public Policy createPolicyFromJsonString(String jsonString) {
+-        if (jsonString == null) {
+-            throw new IllegalArgumentException("JSON string cannot be null");
+-        }
+-
+-        JsonNode policyNode;
+-        JsonNode idNode;
+-        JsonNode statementNodes;
+-        Policy policy = new Policy();
+-        List statements = new LinkedList();
+-
+-        try {
+-            policyNode = Jackson.jsonNodeOf(jsonString);
+-
+-            idNode = policyNode.get(JsonDocumentFields.POLICY_ID);
+-            if (isNotNull(idNode)) {
+-                policy.setId(idNode.asText());
+-            }
+-
+-            statementNodes = policyNode.get(JsonDocumentFields.STATEMENT);
+-            if (isNotNull(statementNodes)) {
+-                for (JsonNode node : statementNodes) {
+-                    statements.add(statementOf(node));
+-                }
+-            }
+-
+-        } catch (Exception e) {
+-            String message = "Unable to generate policy object fron JSON string "
+-                    + e.getMessage();
+-            throw new IllegalArgumentException(message, e);
+-        }
+-        policy.setStatements(statements);
+-        return policy;
+-    }
+-
+-    /**
+-     * Creates a Statement instance from the statement node.
+-     *
+-     * A statement consists of an Effect, id (optional), principal, action, resource,
+-     * and conditions.
+-     * 

+-     * principal is the AWS account that is making a request to access or modify one of your AWS resources.
+-     * 

+-     * action is the way in which your AWS resource is being accessed or modified, such as sending a message to an Amazon SQS queue, or storing an object in an Amazon S3 bucket.
+-     * 

+-     * resource is the AWS entity that the principal wants to access, such as an Amazon SQS queue, or an object stored in Amazon S3.
+-     * 

+-     * conditions are the optional constraints that specify when to allow or deny access for the principal to access your resource. Many expressive conditions are available, some specific to each service. For example, you can use date conditions to allow access to your resources only after or before a specific time.
+-     *
+-     * @param jStatement
+-     *            JsonNode representing the statement.
+-     * @return a reference to the statement instance created.
+-     */
+-    private Statement statementOf(JsonNode jStatement) {
+-
+-        JsonNode effectNode = jStatement.get(JsonDocumentFields.STATEMENT_EFFECT);
+-
+-        final Effect effect = isNotNull(effectNode)
+-                                   ? Effect.valueOf(effectNode.asText())
+-                                   : Effect.Deny ;
+-
+-        Statement statement = new Statement(effect);
+-
+-        JsonNode id = jStatement.get(JsonDocumentFields.STATEMENT_ID);
+-        if (isNotNull(id)) {
+-            statement.setId(id.asText());
+-        }
+-
+-        JsonNode actionNodes = jStatement.get(JsonDocumentFields.ACTION);
+-        if (isNotNull(actionNodes))
+-            statement.setActions(actionsOf(actionNodes));
+-
+-        JsonNode resourceNodes = jStatement.get(JsonDocumentFields.RESOURCE);
+-        if (isNotNull(resourceNodes))
+-            statement.setResources(resourcesOf(resourceNodes));
+-
+-        JsonNode conditionNodes = jStatement.get(JsonDocumentFields.CONDITION);
+-        if (isNotNull(conditionNodes))
+-            statement.setConditions(conditionsOf(conditionNodes));
+-
+-        JsonNode principalNodes = jStatement.get(JsonDocumentFields.PRINCIPAL);
+-        if (isNotNull(principalNodes))
+-            statement.setPrincipals(principalOf(principalNodes));
+-
+-        return statement;
+-    }
+-
+-    /**
+-     * Generates a list of actions from the Action Json Node.
+-     *
+-     * @param actionNodes
+-     *            the action Json node to be parsed.
+-     * @return the list of actions.
+-     */
+-    private List actionsOf(JsonNode actionNodes) {
+-        List actions = new LinkedList();
+-
+-        if (actionNodes.isArray()) {
+-            for (JsonNode action : actionNodes) {
+-                actions.add(new NamedAction(action.asText()));
+-            }
+-        } else {
+-            actions.add(new NamedAction(actionNodes.asText()));
+-        }
+-        return actions;
+-    }
+-
+-    /**
+-     * Generates a list of resources from the Resource Json Node.
+-     *
+-     * @param resourceNodes
+-     *            the resource Json node to be parsed.
+-     * @return the list of resources.
+-     */
+-    private List resourcesOf(JsonNode resourceNodes) {
+-        List resources = new LinkedList();
+-
+-        if (resourceNodes.isArray()) {
+-            for (JsonNode resource : resourceNodes) {
+-                resources.add(new Resource(resource.asText()));
+-            }
+-        } else {
+-            resources.add(new Resource(resourceNodes.asText()));
+-        }
+-
+-        return resources;
+-    }
+-
+-    /**
+-     * Generates a list of principals from the Principal Json Node
+-     *
+-     * @param principalNodes
+-     *            the principal Json to be parsed
+-     * @return a list of principals
+-     */
+-    private List principalOf(JsonNode principalNodes) {
+-        List principals = new LinkedList();
+-
+-        if (principalNodes.asText().equals("*")) {
+-            principals.add(Principal.All);
+-            return principals;
+-        }
+-
+-        Iterator> mapOfPrincipals = principalNodes
+-                .fields();
+-        String schema;
+-        JsonNode principalNode;
+-        Entry principal;
+-        Iterator elements;
+-        while (mapOfPrincipals.hasNext()) {
+-            principal = mapOfPrincipals.next();
+-            schema = principal.getKey();
+-            principalNode = principal.getValue();
+-
+-            if (principalNode.isArray()) {
+-                elements = principalNode.elements();
+-                while (elements.hasNext()) {
+-                    principals.add(createPrincipal(schema, elements.next()));
+-                }
+-            } else {
+-                principals.add(createPrincipal(schema, principalNode));
+-            }
+-        }
+-
+-        return principals;
+-    }
+-
+-    /**
+-     * Creates a new principal instance for the given schema and the Json node.
+-     *
+-     * @param schema
+-     *            the schema for the principal instance being created.
+-     * @param principalNode
+-     *            the node indicating the AWS account that is making the
+-     *            request.
+-     * @return a principal instance.
+-     */
+-    private Principal createPrincipal(String schema, JsonNode principalNode) {
+-        if (schema.equalsIgnoreCase(PRINCIPAL_SCHEMA_USER)) {
+-            return new Principal(PRINCIPAL_SCHEMA_USER, principalNode.asText(), options.isStripAwsPrincipalIdHyphensEnabled());
+-        } else if (schema.equalsIgnoreCase(PRINCIPAL_SCHEMA_SERVICE)) {
+-            return new Principal(schema, principalNode.asText());
+-        } else if (schema.equalsIgnoreCase(PRINCIPAL_SCHEMA_FEDERATED)) {
+-            if (WebIdentityProviders.fromString(principalNode.asText()) != null) {
+-                return new Principal(WebIdentityProviders.fromString(principalNode.asText()));
+-            } else {
+-                return new Principal(PRINCIPAL_SCHEMA_FEDERATED, principalNode.asText());
+-            }
+-        }
+-        throw new SdkClientException("Schema " + schema + " is not a valid value for the principal.");
+-    }
+-
+-    /**
+-     * Generates a list of condition from the Json node.
+-     *
+-     * @param conditionNodes
+-     *            the condition Json node to be parsed.
+-     * @return the list of conditions.
+-     */
+-    private List conditionsOf(JsonNode conditionNodes) {
+-
+-        List conditionList = new LinkedList();
+-        Iterator> mapOfConditions = conditionNodes
+-                .fields();
+-
+-        Entry condition;
+-        while (mapOfConditions.hasNext()) {
+-            condition = mapOfConditions.next();
+-            convertConditionRecord(conditionList, condition.getKey(),
+-                    condition.getValue());
+-        }
+-
+-        return conditionList;
+-    }
+-
+-    /**
+-     * Generates a condition instance for each condition type under the
+-     * Condition Json node.
+-     *
+-     * @param conditions
+-     *            the complete list of conditions
+-     * @param conditionType
+-     *            the condition type for the condition being created.
+-     * @param conditionNode
+-     *            each condition node to be parsed.
+-     */
+-    private void convertConditionRecord(List conditions,
+-            String conditionType, JsonNode conditionNode) {
+-
+-        Iterator> mapOfFields = conditionNode
+-                .fields();
+-        List values;
+-        Entry field;
+-        JsonNode fieldValue;
+-        Iterator elements;
+-
+-        while (mapOfFields.hasNext()) {
+-            values = new LinkedList();
+-            field = mapOfFields.next();
+-            fieldValue = field.getValue();
+-
+-            if (fieldValue.isArray()) {
+-                elements = fieldValue.elements();
+-                while (elements.hasNext()) {
+-                    values.add(elements.next().asText());
+-                }
+-            } else {
+-                values.add(fieldValue.asText());
+-            }
+-            conditions.add(new Condition().withType(conditionType)
+-                    .withConditionKey(field.getKey()).withValues(values));
+-        }
+-    }
+-
+-    /**
+-     * An auxiliary class to help instantiate the action object.
+-     */
+-    private static class NamedAction implements Action {
+-
+-        private String actionName;
+-
+-        public NamedAction(String actionName) {
+-            this.actionName = actionName;
+-        }
+-
+-        public String getActionName() {
+-            return actionName;
+-        }
+-
+-    }
+-
+-    /**
+-     * Checks if the given object is not null.
+-     *
+-     * @param object
+-     *            the object compared to null.
+-     * @return true if the object is not null else false
+-     */
+-    private boolean isNotNull(Object object) {
+-        return null != object;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/policy/internal/JsonPolicyWriter.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/internal/JsonPolicyWriter.java
+--- ./src/main/java/com/amazonaws/auth/policy/internal/JsonPolicyWriter.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/internal/JsonPolicyWriter.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,414 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth.policy.internal;
+-
+-import java.io.IOException;
+-import java.io.StringWriter;
+-import java.io.Writer;
+-import java.util.ArrayList;
+-import java.util.LinkedHashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Set;
+-
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.auth.policy.Action;
+-import com.amazonaws.auth.policy.Condition;
+-import com.amazonaws.auth.policy.Policy;
+-import com.amazonaws.auth.policy.Principal;
+-import com.amazonaws.auth.policy.Resource;
+-import com.amazonaws.auth.policy.Statement;
+-import com.amazonaws.util.json.Jackson;
+-import com.fasterxml.jackson.core.JsonGenerationException;
+-import com.fasterxml.jackson.core.JsonGenerator;
+-
+-/**
+- * Serializes an AWS policy object to a JSON string, suitable for sending to an
+- * AWS service.
+- */
+-public class JsonPolicyWriter {
+-
+-    /** The JSON Generator to generator a JSON string.*/
+-    private JsonGenerator generator = null;
+-
+-    /** The output writer to which the JSON String is written.*/
+-    private Writer writer;
+-
+-    /** Logger used to log exceptions that occurs while writing the Json policy.*/
+-    private static final Log log = LogFactory.getLog("com.amazonaws.auth.policy");
+-
+-    /**
+-     * Constructs a new instance of JSONPolicyWriter.
+-     */
+-    public JsonPolicyWriter() {
+-        writer = new StringWriter();
+-        try {
+-            generator = Jackson.jsonGeneratorOf(writer);
+-        } catch (IOException ioe) {
+-            throw new SdkClientException(
+-                    "Unable to instantiate JsonGenerator.", ioe);
+-        }
+-
+-    }
+-
+-    /**
+-     * Converts the specified AWS policy object to a JSON string, suitable for
+-     * passing to an AWS service.
+-     *
+-     * @param policy
+-     *            The AWS policy object to convert to a JSON string.
+-     *
+-     * @return The JSON string representation of the specified policy object.
+-     *
+-     * @throws IllegalArgumentException
+-     *             If the specified policy is null or invalid and cannot be
+-     *             serialized to a JSON string.
+-     */
+-    public String writePolicyToString(Policy policy) {
+-
+-        if(!isNotNull(policy))
+-            throw new IllegalArgumentException("Policy cannot be null");
+-
+-        try {
+-            return jsonStringOf(policy);
+-        } catch (Exception e) {
+-            String message = "Unable to serialize policy to JSON string: "
+-                    + e.getMessage();
+-            throw new IllegalArgumentException(message, e);
+-        } finally {
+-            try { writer.close(); } catch (Exception e) { }
+-        }
+-    }
+-
+-    /**
+-     * Converts the given Policy into a JSON String.
+-     *
+-     * @param policy
+-     *            the policy to be converted.
+-     * @return a JSON String of the specified policy object.
+-     */
+-    private String jsonStringOf(Policy policy) throws JsonGenerationException,
+-            IOException {
+-        generator.writeStartObject();
+-
+-        writeJsonKeyValue(JsonDocumentFields.VERSION, policy.getVersion());
+-
+-        if (isNotNull(policy.getId()))
+-            writeJsonKeyValue(JsonDocumentFields.POLICY_ID, policy.getId());
+-
+-        writeJsonArrayStart(JsonDocumentFields.STATEMENT);
+-
+-        for (Statement statement : policy.getStatements()) {
+-            generator.writeStartObject();
+-
+-            if (isNotNull(statement.getId())) {
+-                writeJsonKeyValue(JsonDocumentFields.STATEMENT_ID, statement.getId());
+-            }
+-            writeJsonKeyValue(JsonDocumentFields.STATEMENT_EFFECT, statement
+-                    .getEffect().toString());
+-
+-            List principals = statement.getPrincipals();
+-            if (isNotNull(principals) && !principals.isEmpty())
+-                writePrincipals(principals);
+-
+-            List actions = statement.getActions();
+-            if (isNotNull(actions) && !actions.isEmpty())
+-                writeActions(actions);
+-
+-            List resources = statement.getResources();
+-            if (isNotNull(resources) && !resources.isEmpty())
+-                writeResources(resources);
+-
+-            List conditions = statement.getConditions();
+-            if (isNotNull(conditions) && !conditions.isEmpty())
+-                writeConditions(conditions);
+-
+-            generator.writeEndObject();
+-        }
+-
+-        writeJsonArrayEnd();
+-
+-        generator.writeEndObject();
+-
+-        generator.flush();
+-
+-        return writer.toString();
+-
+-    }
+-
+-    /**
+-     * Writes the list of conditions to the JSONGenerator.
+-     *
+-     * @param conditions
+-     *            the conditions to be written.
+-     */
+-    private void writeConditions(List conditions)
+-            throws JsonGenerationException, IOException {
+-        Map conditionsByType = groupConditionsByTypeAndKey(conditions);
+-
+-        writeJsonObjectStart(JsonDocumentFields.CONDITION);
+-
+-        ConditionsByKey conditionsByKey;
+-        for (Map.Entry entry : conditionsByType
+-                .entrySet()) {
+-            conditionsByKey = conditionsByType.get(entry.getKey());
+-
+-            writeJsonObjectStart(entry.getKey());
+-            for (String key : conditionsByKey.keySet()) {
+-                writeJsonArray(key, conditionsByKey.getConditionsByKey(key));
+-            }
+-            writeJsonObjectEnd();
+-        }
+-        writeJsonObjectEnd();
+-    }
+-
+-    /**
+-     * Writes the list of Resources to the JSONGenerator.
+-     *
+-     * @param resources
+-     *            the list of resources to be written.
+-     */
+-    private void writeResources(List resources)
+-            throws JsonGenerationException, IOException {
+-
+-        List resourceStrings = new ArrayList();
+-
+-        for (Resource resource : resources) {
+-            resourceStrings.add(resource.getId());
+-        }
+-        writeJsonArray(JsonDocumentFields.RESOURCE, resourceStrings);
+-    }
+-
+-    /**
+-     * Writes the list of Actions to the JSONGenerator.
+-     *
+-     * @param actions
+-     *            the list of the actions to be written.
+-     */
+-    private void writeActions(List actions)
+-            throws JsonGenerationException, IOException {
+-        List actionStrings = new ArrayList();
+-
+-        for (Action action : actions) {
+-            actionStrings.add(action.getActionName());
+-        }
+-        writeJsonArray(JsonDocumentFields.ACTION, actionStrings);
+-    }
+-
+-    /**
+-     * Writes the list of Principals to the JSONGenerator.
+-     *
+-     * @param principals
+-     *            the list of principals to be written.
+-     */
+-    private void writePrincipals(List principals)
+-            throws JsonGenerationException, IOException {
+-        if (principals.size() == 1 && principals.get(0).equals(Principal.All)) {
+-            writeJsonKeyValue(JsonDocumentFields.PRINCIPAL, Principal.All.getId());
+-        } else {
+-            writeJsonObjectStart(JsonDocumentFields.PRINCIPAL);
+-
+-            Map> principalsByScheme = groupPrincipalByScheme(principals);
+-
+-            List principalValues;
+-            for (Map.Entry> entry : principalsByScheme.entrySet()) {
+-                principalValues = principalsByScheme.get(entry.getKey());
+-
+-                if (principalValues.size() == 1) {
+-                    writeJsonKeyValue(entry.getKey(), principalValues.get(0));
+-                } else {
+-                    writeJsonArray(entry.getKey(), principalValues);
+-                }
+-
+-            }
+-            writeJsonObjectEnd();
+-        }
+-    }
+-
+-    /**
+-     * Groups the list of Principals by the Scheme.
+-     *
+-     * @param principals
+-     *            the list of Principals
+-     * @return a map grouped by scheme of the principal.
+-     */
+-    private Map> groupPrincipalByScheme(
+-            List principals) {
+-        Map> principalsByScheme = new LinkedHashMap>();
+-
+-        String provider;
+-        List principalValues;
+-        for (Principal principal : principals) {
+-            provider = principal.getProvider();
+-            if (!principalsByScheme.containsKey(provider)) {
+-                principalsByScheme.put(provider, new ArrayList());
+-            }
+-            principalValues = principalsByScheme.get(provider);
+-            principalValues.add(principal.getId());
+-        }
+-
+-        return principalsByScheme;
+-    }
+-
+-    /**
+-     * Inner class to hold condition values for each key under a condition type.
+-     */
+-    static class ConditionsByKey {
+-        private Map> conditionsByKey;
+-
+-        public ConditionsByKey(){
+-            conditionsByKey = new LinkedHashMap>();
+-        }
+-
+-        public Map> getConditionsByKey() {
+-            return conditionsByKey;
+-        }
+-
+-        public void setConditionsByKey(Map> conditionsByKey) {
+-            this.conditionsByKey = conditionsByKey;
+-        }
+-
+-        public boolean containsKey(String key){
+-            return conditionsByKey.containsKey(key);
+-        }
+-
+-        public List getConditionsByKey(String key){
+-            return conditionsByKey.get(key);
+-        }
+-
+-        public Set keySet(){
+-            return conditionsByKey.keySet();
+-        }
+-
+-        public void addValuesToKey(String key, List values) {
+-
+-            List conditionValues = getConditionsByKey(key);
+-            if (conditionValues == null)
+-                conditionsByKey.put(key, new ArrayList(values));
+-            else
+-                conditionValues.addAll(values);
+-        }
+-    }
+-
+-    /**
+-     * Groups the list of Conditions by the condition type and
+-     * condition key.
+-     *
+-     * @param conditions
+-     *            the list of conditions to be grouped
+-     * @return a map of conditions grouped by type and then key.
+-     */
+-    private Map groupConditionsByTypeAndKey(
+-            List conditions) {
+-        Map conditionsByType = new LinkedHashMap();
+-
+-        String type;
+-        String key;
+-        ConditionsByKey conditionsByKey;
+-        for (Condition condition : conditions) {
+-            type = condition.getType();
+-            key = condition.getConditionKey();
+-
+-            if (!(conditionsByType.containsKey(type))) {
+-                conditionsByType.put(type, new ConditionsByKey());
+-            }
+-
+-            conditionsByKey = conditionsByType.get(type);
+-            conditionsByKey.addValuesToKey(key, condition.getValues());
+-        }
+-        return conditionsByType;
+-    }
+-
+-    /**
+-     * Writes an array along with its values to the JSONGenerator.
+-     *
+-     * @param arrayName
+-     *            name of the JSON array.
+-     * @param values
+-     *            values of the JSON array.
+-     */
+-    private void writeJsonArray(String arrayName, List values)
+-            throws JsonGenerationException, IOException {
+-        writeJsonArrayStart(arrayName);
+-        for (String value : values)
+-            generator.writeString(value);
+-        writeJsonArrayEnd();
+-    }
+-
+-    /**
+-     * Writes the Start of Object String to the JSONGenerator along with Object
+-     * Name.
+-     *
+-     * @param fieldName
+-     *            name of the JSON Object.
+-     */
+-    private void writeJsonObjectStart(String fieldName)
+-            throws JsonGenerationException, IOException {
+-        generator.writeObjectFieldStart(fieldName);
+-    }
+-
+-    /**
+-     * Writes the End of Object String to the JSONGenerator.
+-     */
+-    private void writeJsonObjectEnd() throws JsonGenerationException, IOException {
+-        generator.writeEndObject();
+-    }
+-
+-    /**
+-     * Writes the Start of Array String to the JSONGenerator along with Array
+-     * Name.
+-     *
+-     * @param fieldName
+-     *            name of the JSON array
+-     */
+-    private void writeJsonArrayStart(String fieldName)
+-            throws JsonGenerationException, IOException {
+-        generator.writeArrayFieldStart(fieldName);
+-    }
+-
+-    /**
+-     * Writes the End of Array String to the JSONGenerator.
+-     */
+-    private void writeJsonArrayEnd() throws JsonGenerationException, IOException {
+-        generator.writeEndArray();
+-    }
+-
+-    /**
+-     * Writes the given field and the value to the JsonGenerator
+-     *
+-     * @param fieldName
+-     *            the JSON field name
+-     * @param value
+-     *            value for the field
+-     */
+-    private void writeJsonKeyValue(String fieldName, String value)
+-            throws JsonGenerationException, IOException {
+-        generator.writeStringField(fieldName, value);
+-    }
+-
+-    /**
+-     * Checks if the given object is not null.
+-     *
+-     * @param object
+-     *            the object compared to null.
+-     * @return true if the object is not null else false
+-     */
+-    private boolean isNotNull(Object object) {
+-        return null != object;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/policy/package-info.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/package-info.java
+--- ./src/main/java/com/amazonaws/auth/policy/package-info.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/package-info.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,56 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-/**
+- * Classes for creating custom AWS access control policies.  Policies allow you to specify fine grained
+- * access controls on your AWS resources.  You can allow or deny access to your AWS resources based on:
+- * 
    
+- *   
  • what resource is being accessed
+- *   
  • who is accessing the resource (i.e. the principal)
+- *   
  • what action is being taken on the resource
+- *   
  • a variety of conditions including date restrictions, IP address restrictions, etc.
+- * 

+- *
+- * 

+- * Access control policies are a collection of statements.
+- * Each statement takes the form:  "A has permission to do B to C where D applies".
+- * 
    
+- *   
  • A is the principal - the AWS account that is making a request to
+- *       access or modify one of your AWS resources.
+- *   
  • B is the action - the way in which your AWS resource is being accessed or modified, such
+- *       as sending a message to an Amazon SQS queue, or storing an object in an Amazon S3 bucket.
+- *   
  • C is the resource - your AWS entity that the principal wants to access, such
+- *       as an Amazon SQS queue, or an object stored in Amazon S3.
+- *   
  • D is the set of conditions - optional constraints that specify when to allow or deny
+- *       access for the principal to access your resource.  Many expressive conditions are available,
+- *       some specific to each service.  For example you can use date conditions to allow access to
+- *       your resources only after or before a specific time.
+- * 

+- *
+- * 

+- * The following code creates a policy to allow a specific AWS account to send
+- * and receive messages using one of your Amazon SQS queues:
+- * 
+- *    Policy policy = new Policy("MyQueuePolicy");
+- *    policy.withStatements(new Statement(Effect.Allow)
+- *           .withPrincipals(new Principal("123456789012"))
+- *           .withActions(SQSActions.SendMessage, SQSActions.ReceiveMessage)
+- *           .withResources(new SQSQueueResource("987654321000", "queue2")));
+- * 

+- *
+- * 

+- * Once you've created a policy, you need to use methods on the service to upload your policy to AWS.
+- */
+-package com.amazonaws.auth.policy;
+diff -Nau8r ./src/main/java/com/amazonaws/auth/policy/Policy.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/Policy.java
+--- ./src/main/java/com/amazonaws/auth/policy/Policy.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/Policy.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,268 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth.policy;
+-
+-import com.amazonaws.auth.policy.internal.JsonPolicyReader;
+-import com.amazonaws.auth.policy.internal.JsonPolicyWriter;
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.Collection;
+-import java.util.HashSet;
+-import java.util.List;
+-import java.util.Set;
+-
+-/**
+- * An AWS access control policy is a object that acts as a container for one or
+- * more statements, which specify fine grained rules for allowing or denying
+- * various types of actions from being performed on your AWS resources.
+- * 

+- * By default, all requests to use your resource coming from anyone but you are
+- * denied. Access control polices can override that by allowing different types
+- * of access to your resources, or by explicitly denying different types of
+- * access.
+- * 

+- * Each statement in an AWS access control policy takes the form:
+- * "A has permission to do B to C where D applies".
+- * 
    
+- *   
  • A is the principal - the AWS account that is making a request to
+- *       access or modify one of your AWS resources.
+- *   
  • B is the action - the way in which your AWS resource is being accessed or modified, such
+- *       as sending a message to an Amazon SQS queue, or storing an object in an Amazon S3 bucket.
+- *   
  • C is the resource - your AWS entity that the principal wants to access, such
+- *       as an Amazon SQS queue, or an object stored in Amazon S3.
+- *   
  • D is the set of conditions - optional constraints that specify when to allow or deny
+- *       access for the principal to access your resource.  Many expressive conditions are available,
+- *       some specific to each service.  For example you can use date conditions to allow access to
+- *       your resources only after or before a specific time.
+- * 

+- * 

+- * Note that an AWS access control policy should not be confused with the
+- * similarly named "POST form policy" concept used in Amazon S3.
+- */
+-public class Policy {
+-
+-    /** The default policy version */
+-    private static final String DEFAULT_POLICY_VERSION = "2012-10-17";
+-
+-    private String id;
+-    private String version = DEFAULT_POLICY_VERSION;
+-    private List statements = new ArrayList();
+-
+-    /**
+-     * Constructs an empty AWS access control policy ready to be populated with
+-     * statements.
+-     */
+-    public Policy() {}
+-
+-    /**
+-     * Constructs a new AWS access control policy with the specified policy ID.
+-     * The policy ID is a user specified string that serves to help developers
+-     * keep track of multiple polices. Policy IDs are often used as a human
+-     * readable name for a policy.
+-     *
+-     * @param id
+-     *            The policy ID for the new policy object. Policy IDs serve to
+-     *            help developers keep track of multiple policies, and are often
+-     *            used to give the policy a meaningful, human readable name.
+-     */
+-    public Policy(String id) {
+-        this.id = id;
+-    }
+-
+-    /**
+-     * Constructs a new AWS access control policy with the specified policy ID
+-     * and collection of statements. The policy ID is a user specified string
+-     * that serves to help developers keep track of multiple polices. Policy IDs
+-     * are often used as a human readable name for a policy.
+-     * 

+-     * Any statements that don't have a statement ID yet will automatically be
+-     * assigned a unique ID within this policy.
+-     *
+-     * @param id
+-     *            The policy ID for the new policy object. Policy IDs serve to
+-     *            help developers keep track of multiple policies, and are often
+-     *            used to give the policy a meaningful, human readable name.
+-     * @param statements
+-     *            The statements to include in the new policy.
+-     */
+-    public Policy(String id, Collection statements) {
+-        this(id);
+-        setStatements(statements);
+-    }
+-
+-    /**
+-     * Returns the policy ID for this policy. Policy IDs serve to help
+-     * developers keep track of multiple policies, and are often used as human
+-     * readable name for a policy.
+-     *
+-     * @return The policy ID for this policy.
+-     */
+-    public String getId() {
+-        return id;
+-    }
+-
+-    /**
+-     * Sets the policy ID for this policy. Policy IDs serve to help developers
+-     * keep track of multiple policies, and are often used as human readable
+-     * name for a policy.
+-     *
+-     * @param id
+-     *            The policy ID for this policy.
+-     */
+-    public void setId(String id) {
+-        this.id = id;
+-    }
+-
+-    /**
+-     * Sets the policy ID for this policy and returns the updated policy so that
+-     * multiple calls can be chained together.
+-     * 

+-     * Policy IDs serve to help developers keep track of multiple policies, and
+-     * are often used as human readable name for a policy.
+-     *
+-     * @param id
+-     *            The policy ID for this policy.
+-     *
+-     * @return The updated Policy object so that additional calls can be chained
+-     *         together.
+-     */
+-    public Policy withId(String id) {
+-        setId(id);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the version of this AWS policy.
+-     *
+-     * @return The version of this AWS policy.
+-     */
+-    public String getVersion() {
+-        return version;
+-    }
+-
+-    /**
+-     * Returns the collection of statements contained by this policy. Individual
+-     * statements in a policy are what specify the rules that enable or disable
+-     * access to your AWS resources.
+-     *
+-     * @return The collection of statements contained by this policy.
+-     */
+-    public Collection getStatements() {
+-        return statements;
+-    }
+-
+-    /**
+-     * Sets the collection of statements contained by this policy. Individual
+-     * statements in a policy are what specify the rules that enable or disable
+-     * access to your AWS resources.
+-     * 

+-     * Any statements that don't have a statement ID yet will automatically be
+-     * assigned a unique ID within this policy.
+-     *
+-     * @param statements
+-     *            The collection of statements included in this policy.
+-     */
+-    public void setStatements(Collection statements) {
+-        this.statements = new ArrayList(statements);
+-        assignUniqueStatementIds();
+-    }
+-
+-    /**
+-     * Sets the collection of statements contained by this policy and returns
+-     * this policy object so that additional method calls can be chained
+-     * together.
+-     * 

+-     * Individual statements in a policy are what specify the rules that enable
+-     * or disable access to your AWS resources.
+-     * 

+-     * Any statements that don't have a statement ID yet will automatically be
+-     * assigned a unique ID within this policy.
+-     *
+-     * @param statements
+-     *            The collection of statements included in this policy.
+-     *
+-     * @return The updated policy object, so that additional method calls can be
+-     *         chained together.
+-     */
+-    public Policy withStatements(Statement... statements) {
+-        setStatements(Arrays.asList(statements));
+-        return this;
+-    }
+-
+-    /**
+-     * Returns a JSON string representation of this AWS access control policy,
+-     * suitable to be sent to an AWS service as part of a request to set an
+-     * access control policy.
+-     *
+-     * @return A JSON string representation of this AWS access control policy.
+-     */
+-    public String toJson() {
+-        return new JsonPolicyWriter().writePolicyToString(this);
+-    }
+-
+-    /**
+-     * Returns an AWS access control policy object generated from JSON string. This will automatically strip all dashes from
+-     * AWS principal IDs, because AWS account IDs must not contain dashes. If this behavior isn't desirable (eg. because you are
+-     * using IAM AWS principal IDs with dashes in the name), you may disable this behavior by specifying custom JSON policy reader
+-     * options in {@link #fromJson(String, PolicyReaderOptions)}.
+-     *
+-     * @param jsonString
+-     *            The JSON string representation of this AWS access control policy.
+-     *
+-     * @return An AWS access control policy object.
+-     *
+-     * @throws IllegalArgumentException
+-     *      If the specified JSON string is null or invalid and cannot be
+-     *      converted to an AWS policy object.
+-     */
+-    public static Policy fromJson(String jsonString) {
+-        return fromJson(jsonString, new PolicyReaderOptions());
+-    }
+-
+-    /**
+-     * Returns an AWS access control policy object generated from JSON string. Allows configuring options for the JSON policy
+-     * reader (for example, to disable the stripping of dashes in the principal ID).
+-     *
+-     * @param jsonString
+-     *            The JSON string representation of this AWS access control policy.
+-     * @param options
+-     *            Configuration for the JSON policy reader that affects the way in which it converts the JSON configuration.
+-     *
+-     * @return An AWS access control policy object.
+-     *
+-     * @throws IllegalArgumentException
+-     *      If the specified JSON string is null or invalid and cannot be
+-     *      converted to an AWS policy object.
+-     */
+-    public static Policy fromJson(String jsonString, PolicyReaderOptions options) {
+-        return new JsonPolicyReader(options).createPolicyFromJsonString(jsonString);
+-    }
+-
+-    private void assignUniqueStatementIds() {
+-        Set usedStatementIds = new HashSet();
+-        for (Statement statement : statements) {
+-            if (statement.getId() != null) usedStatementIds.add(statement.getId());
+-        }
+-
+-        int counter = 0;
+-        for (Statement statement : statements) {
+-            if (statement.getId() != null) continue;
+-
+-            while (usedStatementIds.contains(Integer.toString(++counter)));
+-            statement.setId(Integer.toString(counter));
+-        }
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/policy/PolicyReaderOptions.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/PolicyReaderOptions.java
+--- ./src/main/java/com/amazonaws/auth/policy/PolicyReaderOptions.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/PolicyReaderOptions.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,53 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.auth.policy;
+-
+-/**
+- * Options that affect the way in which {@link Policy#fromJson(String, PolicyReaderOptions)} will generate a Policy.
+- */
+-public class PolicyReaderOptions {
+-    private boolean stripAwsPrincipalIdHyphensEnabled = true;
+-
+-    /**
+-     * Whether AWS account IDs should have hyphens removed in their name.
+-     */
+-    public boolean isStripAwsPrincipalIdHyphensEnabled() {
+-        return stripAwsPrincipalIdHyphensEnabled;
+-    }
+-
+-    /**
+-     * Configure whether hyphens should be stripped from the AWS principal IDs that are read from the JSON-formatted
+-     * policy document. This is useful because AWS account IDs must be specified without hyphens, but the user may not be
+-     * aware that hyphens should not be used when configuring their policy.
+-     *
+-     * This behavior may be undesirable when using IAM AWS principal IDs, which may contain hyphens. In that case, this
+-     * option may be explicitly disabled. If this is set to false, you must remove hyphens from your AWS principal IDs
+-     * manually.
+-     *
+-     * By default, this is enabled (true).
+-     */
+-    public void setStripAwsPrincipalIdHyphensEnabled(boolean stripAwsPrincipalIdHyphensEnabled) {
+-        this.stripAwsPrincipalIdHyphensEnabled = stripAwsPrincipalIdHyphensEnabled;
+-    }
+-
+-    /**
+-     * Fluent-style setter for {@link #setStripAwsPrincipalIdHyphensEnabled(boolean)} that returns "this" for chaining.
+-     */
+-    public PolicyReaderOptions withStripAwsPrincipalIdHyphensEnabled(boolean stripAwsPrincipalIdHyphensEnabled) {
+-        setStripAwsPrincipalIdHyphensEnabled(stripAwsPrincipalIdHyphensEnabled);
+-        return this;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/policy/Principal.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/Principal.java
+--- ./src/main/java/com/amazonaws/auth/policy/Principal.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/Principal.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,268 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth.policy;
+-
+-/**
+- * A principal is an AWS account or AWS web serivce, which is being allowed or denied access to a
+- * resource through an access control policy. The principal is a property of the
+- * {@link Statement} object, not directly the {@link Policy} object.
+- * 

+- * The principal is A in the statement
+- * "A has permission to do B to C where D applies."
+- * 

+- * In an access control policy statement, you can set the principal to all
+- * authenticated AWS users through the {@link Principal#AllUsers} member. This
+- * is useful when you don't want to restrict access based on the identity of the
+- * requester, but instead on other identifying characteristics such as the
+- * requester's IP address.
+- */
+-public class Principal {
+-
+-    /**
+-     * Principal instance that includes all users, including anonymous users.
+-     * 

+-     * This is useful when you don't want to restrict access based on the
+-     * identity of the requester, but instead on other identifying
+-     * characteristics such as the requester's IP address.
+-     */
+-    public static final Principal AllUsers = new Principal("AWS", "*");
+-
+-    /**
+-     * Principal instance that includes all AWS web services.
+-     */
+-    public static final Principal AllServices = new Principal("Service", "*");
+-
+-    /**
+-     * Principal instance that includes all the web identity providers.
+-     */
+-    public static final Principal AllWebProviders = new Principal("Federated", "*");
+-
+-    /**
+-     * Principal instance that includes all the AWS accounts, AWS web services and web identity providers.
+-     */
+-    public static final Principal All = new Principal("*", "*");
+-
+-    private final String id;
+-    private final String provider;
+-
+-    /**
+-     * Constructs a new principal with the specified AWS web service which
+-     * is being allowed or denied access to a resource through an access control
+-     * policy.
+-     *
+-     * @param service
+-     *            An AWS service.
+-     */
+-    public Principal(Services service) {
+-        if (service == null) {
+-            throw new IllegalArgumentException("Null AWS service name specified");
+-        }
+-       id = service.getServiceId();
+-       provider = "Service";
+-    }
+-
+-
+-    /**
+-     * Constructs a new principal with the specified AWS account ID. This method
+-     * automatically strips hyphen characters found in the account Id.
+-     *
+-     * @param accountId
+-     *            An AWS account ID.
+-     */
+-    public Principal(String accountId) {
+-        this("AWS", accountId);
+-
+-        if (accountId == null) {
+-            throw new IllegalArgumentException("Null AWS account ID specified");
+-        }
+-    }
+-
+-    /**
+-     * Constructs a new principal with the specified id and provider. This
+-     * method automatically strips hyphen characters found in the account ID if
+-     * the provider is "AWS".
+-     */
+-    public Principal(String provider, String id) {
+-        this(provider, id, provider.equals("AWS"));
+-    }
+-
+-    /**
+-     * Constructs a new principal with the specified id and provider. This
+-     * method optionally strips hyphen characters found in the account Id.
+-     */
+-    public Principal(String provider, String id, boolean stripHyphen) {
+-        this.provider = provider;
+-        this.id = stripHyphen ?
+-                id.replace("-", "") : id;
+-    }
+-
+-    /**
+-     * Constructs a new principal with the specified web identity provider.
+-     *
+-     * @param webIdentityProvider
+-     *            An web identity provider.
+-     */
+-    public Principal(WebIdentityProviders webIdentityProvider) {
+-        if (webIdentityProvider == null) {
+-            throw new IllegalArgumentException("Null web identity provider specified");
+-        }
+-        this.id = webIdentityProvider.getWebIdentityProvider();
+-        provider = "Federated";
+-    }
+-
+-    /**
+-     * Returns the provider for this principal, which indicates in what group of
+-     * users this principal resides.
+-     *
+-     * @return The provider for this principal.
+-     */
+-    public String getProvider() {
+-       return provider;
+-    }
+-
+-    /**
+-     * Returns the unique ID for this principal.
+-     *
+-     * @return The unique ID for this principal.
+-     */
+-    public String getId() {
+-            return id;
+-    }
+-
+-    /**
+-     * The services who have the right to do the assume the role
+-     * action. The AssumeRole action returns a set of temporary security
+-     * credentials that you can use to access resources that are defined in the
+-     * role's policy. The returned credentials consist of an Access Key ID, a
+-     * Secret Access Key, and a security token.
+-     */
+-    static public enum Services {
+-        
+-        AmazonApiGateway("apigateway.amazonaws.com"),
+-        AWSDataPipeline("datapipeline.amazonaws.com"),
+-        AmazonElasticTranscoder("elastictranscoder.amazonaws.com"),
+-        AmazonEC2("ec2.amazonaws.com"),
+-        AWSOpsWorks("opsworks.amazonaws.com"),
+-        AWSCloudHSM("cloudhsm.amazonaws.com"),
+-        AllServices("*");
+-        private String serviceId;
+-
+-        /**
+-         * The service which has the right to assume the role.
+-         */
+-        private Services(String serviceId) {
+-            this.serviceId = serviceId;
+-        }
+-
+-        public String getServiceId() {
+-            return serviceId;
+-        }
+-
+-        /**
+-         * Construct the Services object from a string representing the service id.
+-         */
+-        public static Services fromString(String serviceId) {
+-            if (serviceId != null) {
+-                for (Services s : Services.values()) {
+-                    if (s.getServiceId().equalsIgnoreCase(serviceId)) {
+-                        return s;
+-                    }
+-                }
+-            }
+-
+-            return null;
+-        }
+-
+-
+-    }
+-
+-    /**
+-     * Web identity providers, such as Login with Amazon, Facebook, or Google.
+-     */
+-    static public enum WebIdentityProviders {
+-
+-        Facebook("graph.facebook.com"),
+-        Google("accounts.google.com"),
+-        Amazon("www.amazon.com"),
+-        AllProviders("*");
+-
+-        private String webIdentityProvider;
+-
+-        /**
+-         * The web identity provider which has the right to assume the role.
+-         */
+-        private WebIdentityProviders(String webIdentityProvider) {
+-            this.webIdentityProvider = webIdentityProvider;
+-        }
+-
+-        public String getWebIdentityProvider() {
+-            return webIdentityProvider;
+-        }
+-
+-        /**
+-         * Construct the Services object from a string representing web identity provider.
+-         */
+-        public static WebIdentityProviders fromString(String webIdentityProvider) {
+-            if (webIdentityProvider != null) {
+-                for (WebIdentityProviders provider : WebIdentityProviders.values()) {
+-                    if (provider.getWebIdentityProvider().equalsIgnoreCase(webIdentityProvider)) {
+-                        return provider;
+-                    }
+-                }
+-            }
+-
+-            return null;
+-        }
+-
+-
+-    }
+-
+-    @Override
+-    public int hashCode() {
+-        final int prime = 31;
+-        int hashCode = 1;
+-
+-        hashCode = prime * hashCode + provider.hashCode();
+-        hashCode = prime * hashCode + id.hashCode();
+-        return hashCode;
+-    }
+-
+-    @Override
+-    public boolean equals(Object principal) {
+-        if (this == principal) {
+-            return true;
+-        }
+-
+-        if (principal == null) {
+-            return false;
+-        }
+-
+-        if (principal instanceof Principal == false) {
+-            return false;
+-        }
+-
+-        Principal other = (Principal) principal;
+-
+-        if (this.getProvider().equals(other.getProvider())
+-                && this.getId().equals(other.getId())) {
+-            return true;
+-        }
+-
+-        return false;
+-    }
+-
+-
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/policy/Resource.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/Resource.java
+--- ./src/main/java/com/amazonaws/auth/policy/Resource.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/Resource.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,74 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth.policy;
+-
+-/**
+- * Represents a resource involved in an AWS access control policy statement.
+- * Resources are the service specific AWS entities owned by your account. Amazon
+- * SQS queues, Amazon S3 buckets and objects, and Amazon SNS topics are all
+- * examples of AWS resources.
+- * 

+- * The standard way of specifying an AWS resource is with an Amazon Resource
+- * Name (ARN).
+- * 

+- * The resource is C in the statement
+- * "A has permission to do B to C where D applies."
+- */
+-public class Resource {
+-    private final String resource;
+-
+-    /**
+-     * Constructs a new AWS access control policy resource. Resources are
+-     * typically specified as Amazon Resource Names (ARNs).
+-     * 

+-     * You specify the resource using the following Amazon Resource Name (ARN)
+-     * format:
+-     * arn:aws:<vendor>:<region>:<namespace>:<relative-id>
+-     * 

+-     * 
    
+-     * 
  • vendor identifies the AWS product (e.g., sns)
    • 
+-     * 
  • region is the AWS Region the resource resides in (e.g., us-east-1),
+-     * if any
+-     * 
  • namespace is the AWS account ID with no hyphens (e.g., 123456789012)
+-     * 
  • relative-id is the service specific portion that identifies the
+-     * specific resource
+-     * 

+-     * 

+-     * For example, an Amazon SQS queue might be addressed with the following
+-     * ARN: arn:aws:sqs:us-east-1:987654321000:MyQueue
+-     * 

+-     * Some resources may not use every field in an ARN. For example, resources
+-     * in Amazon S3 are global, so they omit the region field:
+-     * arn:aws:s3:::bucket/*
+-     *
+-     * @param resource
+-     *            The Amazon Resource Name (ARN) uniquely identifying the
+-     *            desired AWS resource.
+-     */
+-    public Resource(String resource) {
+-        this.resource = resource;
+-    }
+-
+-    /**
+-     * Returns the resource ID, typically an Amazon Resource Name (ARN),
+-     * identifying this resource.
+-     *
+-     * @return The resource ID, typically an Amazon Resource Name (ARN),
+-     *         identifying this resource.
+-     */
+-    public String getId() {
+-        return resource;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/policy/resources/package-info.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/resources/package-info.java
+--- ./src/main/java/com/amazonaws/auth/policy/resources/package-info.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/resources/package-info.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,22 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-/**
+- * Collection of resources for AWS access control policies.  Resources describe
+- * what AWS entities are being accessed or modified when an AWS access control policy
+- * is evaluated for an incoming request.  Amazon SQS queues, Amazon SNS topics, and
+- * Amazon S3 buckets and objects are all examples of AWS resources.
+- */
+-package com.amazonaws.auth.policy.resources;
+diff -Nau8r ./src/main/java/com/amazonaws/auth/policy/Statement.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/Statement.java
+--- ./src/main/java/com/amazonaws/auth/policy/Statement.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/policy/Statement.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,412 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth.policy;
+-
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.Collection;
+-import java.util.List;
+-
+-/**
+- * A statement is the formal description of a single permission, and is always
+- * contained within a policy object.
+- * 

+- * A statement describes a rule for allowing or denying access to a specific AWS
+- * resource based on how the resource is being accessed, and who is attempting
+- * to access the resource. Statements can also optionally contain a list of
+- * conditions that specify when a statement is to be honored.
+- * 

+- * For example, consider a statement that:
+- * 
    
+- * 
  • allows access (the effect)
+- * 
  • for a list of specific AWS account IDs (the principals)
+- * 
  • when accessing an SQS queue (the resource)
+- * 
  • using the SendMessage operation (the action)
+- * 
  • and the request occurs before a specific date (a condition)
+- * 

+- *
+- * 

+- * Statements takes the form:  "A has permission to do B to C where D applies".
+- * 
    
+- *   
  • A is the principal - the AWS account that is making a request to
+- *       access or modify one of your AWS resources.
+- *   
  • B is the action - the way in which your AWS resource is being accessed or modified, such
+- *       as sending a message to an Amazon SQS queue, or storing an object in an Amazon S3 bucket.
+- *   
  • C is the resource - your AWS entity that the principal wants to access, such
+- *       as an Amazon SQS queue, or an object stored in Amazon S3.
+- *   
  • D is the set of conditions - optional constraints that specify when to allow or deny
+- *       access for the principal to access your resource.  Many expressive conditions are available,
+- *       some specific to each service.  For example you can use date conditions to allow access to
+- *       your resources only after or before a specific time.
+- * 

+- *
+- * 

+- * There are many resources and conditions available for use in statements, and
+- * you can combine them to form fine grained custom access control polices.
+- */
+-public class Statement {
+-
+-    /**
+-     * The effect is the result that you want a policy statement to return at
+-     * evaluation time. A policy statement can either allow access or explicitly
+-     * deny access.
+-     */
+-    public static enum Effect {
+-        Allow(), Deny();
+-    }
+-
+-    private String id;
+-    private Effect effect;
+-    private List principals = new ArrayList();
+-    private List actions = new ArrayList();
+-    private List resources;
+-    private List conditions = new ArrayList();
+-
+-    /**
+-     * Constructs a new access control policy statement with the specified
+-     * effect.
+-     * 

+-     * Before a statement is valid and can be sent to AWS, callers must set the
+-     * principals, resources, and actions (as well as any optional conditions)
+-     * involved in the statement.
+-     *
+-     * @param effect
+-     *            The effect this statement has (allowing access or denying
+-     *            access) when all conditions, resources, principals, and
+-     *            actions are matched.
+-     */
+-    public Statement(Effect effect) {
+-        this.effect = effect;
+-        this.id = null;
+-    }
+-
+-    /**
+-     * Returns the ID for this statement. Statement IDs serve to help keep track
+-     * of multiple statements, and are often used to give the statement a
+-     * meaningful, human readable name.
+-     * 

+-     * Statement IDs must be unique within a policy, but are not required to be
+-     * globally unique.
+-     * 

+-     * If you do not explicitly assign an ID to a statement, a unique ID will be
+-     * automatically assigned when the statement is added to a policy.
+-     * 

+-     * Developers should be careful to not use the same statement ID for
+-     * multiple statements in the same policy. Reusing the same statement ID in
+-     * different policies is not a problem.
+-     *
+-     * @return The statement ID.
+-     */
+-    public String getId() {
+-        return id;
+-    }
+-
+-    /**
+-     * Sets the ID for this statement. Statement IDs serve to help keep track of
+-     * multiple statements, and are often used to give the statement a
+-     * meaningful, human readable name.
+-     * 

+-     * Statement IDs must be unique within a policy, but are not required to be
+-     * globally unique.
+-     * 

+-     * If you do not explicitly assign an ID to a statement, a unique ID will be
+-     * automatically assigned when the statement is added to a policy.
+-     * 

+-     * Developers should be careful to not use the same statement ID for
+-     * multiple statements in the same policy. Reusing the same statement ID in
+-     * different policies is not a problem.
+-     *
+-     * @param id
+-     *            The new statement ID for this statement.
+-     */
+-    public void setId(String id) {
+-        this.id = id;
+-    }
+-
+-    /**
+-     * Sets the ID for this statement and returns the updated statement so
+-     * multiple calls can be chained together.
+-     * 

+-     * Statement IDs serve to help keep track of multiple statements, and are
+-     * often used to give the statement a meaningful, human readable name.
+-     * 

+-     * If you do not explicitly assign an ID to a statement, a unique ID will be
+-     * automatically assigned when the statement is added to a policy.
+-     * 

+-     * Developers should be careful to not use the same statement ID for
+-     * multiple statements in the same policy. Reusing the same statement ID in
+-     * different policies is not a problem.
+-     *
+-     * @param id
+-     *            The new statement ID for this statement.
+-     */
+-    public Statement withId(String id) {
+-        setId(id);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the result effect of this policy statement when it is evaluated.
+-     * A policy statement can either allow access or explicitly
+-     *
+-     * @return The result effect of this policy statement.
+-     */
+-    public Effect getEffect() {
+-        return effect;
+-    }
+-
+-    /**
+-     * Sets the result effect of this policy statement when it is evaluated. A
+-     * policy statement can either allow access or explicitly
+-     *
+-     * @param effect
+-     *            The result effect of this policy statement.
+-     */
+-    public void setEffect(Effect effect) {
+-        this.effect = effect;
+-    }
+-
+-    /**
+-     * Returns the list of actions to which this policy statement applies.
+-     * Actions limit a policy statement to specific service operations that are
+-     * being allowed or denied by the policy statement. For example, you might
+-     * want to allow any AWS user to post messages to your SQS queue using the
+-     * SendMessage action, but you don't want to allow those users other actions
+-     * such as ReceiveMessage or DeleteQueue.
+-     *
+-     * @return The list of actions to which this policy statement applies.
+-     */
+-    public List getActions() {
+-        return actions;
+-    }
+-
+-    /**
+-     * Sets the list of actions to which this policy statement applies. Actions
+-     * limit a policy statement to specific service operations that are being
+-     * allowed or denied by the policy statement. For example, you might want to
+-     * allow any AWS user to post messages to your SQS queue using the
+-     * SendMessage action, but you don't want to allow those users other actions
+-     * such as ReceiveMessage or DeleteQueue.
+-     *
+-     * @param actions
+-     *            The list of actions to which this policy statement applies.
+-     */
+-    public void setActions(Collection actions) {
+-        this.actions = new ArrayList(actions);
+-    }
+-
+-    /**
+-     * Sets the list of actions to which this policy statement applies and
+-     * returns this updated Statement object so that additional method calls can
+-     * be chained together.
+-     * 

+-     * Actions limit a policy statement to specific service operations that are
+-     * being allowed or denied by the policy statement. For example, you might
+-     * want to allow any AWS user to post messages to your SQS queue using the
+-     * SendMessage action, but you don't want to allow those users other actions
+-     * such as ReceiveMessage or DeleteQueue.
+-     *
+-     * @param actions
+-     *            The list of actions to which this statement applies.
+-     *
+-     * @return The updated Statement object so that additional method calls can
+-     *         be chained together.
+-     */
+-    public Statement withActions(Action... actions) {
+-        setActions(Arrays.asList(actions));
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the resources associated with this policy statement. Resources
+-     * are what a policy statement is allowing or denying access to, such as an
+-     * Amazon SQS queue or an Amazon SNS topic.
+-     * 

+-     * Note that some services allow only one resource to be specified per
+-     * policy statement.
+-     *
+-     * @return The resources associated with this policy statement.
+-     */
+-    public List getResources() {
+-        return resources;
+-    }
+-
+-    /**
+-     * Sets the resources associated with this policy statement. Resources are
+-     * what a policy statement is allowing or denying access to, such as an
+-     * Amazon SQS queue or an Amazon SNS topic.
+-     * 

+-     * Note that some services allow only one resource to be specified per
+-     * policy statement.
+-     *
+-     * @param resources
+-     *            The resources associated with this policy statement.
+-     */
+-    public void setResources(Collection resources) {
+-        this.resources = new ArrayList(resources);
+-    }
+-
+-    /**
+-     * Sets the resources associated with this policy statement and returns this
+-     * updated Statement object so that additional method calls can be chained
+-     * together.
+-     * 

+-     * Resources are what a policy statement is allowing or denying access to,
+-     * such as an Amazon SQS queue or an Amazon SNS topic.
+-     * 

+-     * Note that some services allow only one resource to be specified per
+-     * policy statement.
+-     *
+-     * @param resources
+-     *            The resources associated with this policy statement.
+-     *
+-     * @return The updated Statement object so that additional method calls can
+-     *         be chained together.
+-     */
+-    public Statement withResources(Resource... resources) {
+-        setResources(Arrays.asList(resources));
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the conditions associated with this policy statement. Conditions
+-     * allow policy statements to be conditionally evaluated based on the many
+-     * available condition types.
+-     * 

+-     * For example, a statement that allows access to an Amazon SQS queue could
+-     * use a condition to only apply the effect of that statement for requests
+-     * that are made before a certain date, or that originate from a range of IP
+-     * addresses.
+-     * 

+-     * When multiple conditions are included in a single statement, all
+-     * conditions must evaluate to true in order for the statement to take
+-     * effect.
+-     *
+-     * @return The conditions associated with this policy statement.
+-     */
+-    public List getConditions() {
+-        return conditions;
+-    }
+-
+-    /**
+-     * Sets the conditions associated with this policy statement. Conditions
+-     * allow policy statements to be conditionally evaluated based on the many
+-     * available condition types.
+-     * 

+-     * For example, a statement that allows access to an Amazon SQS queue could
+-     * use a condition to only apply the effect of that statement for requests
+-     * that are made before a certain date, or that originate from a range of IP
+-     * addresses.
+-     * 

+-     * Multiple conditions can be included in a single statement, and all
+-     * conditions must evaluate to true in order for the statement to take
+-     * effect.
+-     *
+-     * @param conditions
+-     *            The conditions associated with this policy statement.
+-     */
+-    public void setConditions(List conditions) {
+-        this.conditions = conditions;
+-    }
+-
+-    /**
+-     * Sets the conditions associated with this policy statement, and returns
+-     * this updated Statement object so that additional method calls can be
+-     * chained together.
+-     * 

+-     * Conditions allow policy statements to be conditionally evaluated based on
+-     * the many available condition types.
+-     * 

+-     * For example, a statement that allows access to an Amazon SQS queue could
+-     * use a condition to only apply the effect of that statement for requests
+-     * that are made before a certain date, or that originate from a range of IP
+-     * addresses.
+-     * 

+-     * Multiple conditions can be included in a single statement, and all
+-     * conditions must evaluate to true in order for the statement to take
+-     * effect.
+-     *
+-     * @param conditions
+-     *            The conditions associated with this policy statement.
+-     *
+-     * @return The updated Statement object so that additional method calls can
+-     *         be chained together.
+-     */
+-    public Statement withConditions(Condition... conditions) {
+-        setConditions(Arrays.asList(conditions));
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the principals associated with this policy statement, indicating
+-     * which AWS accounts are affected by this policy statement.
+-     *
+-     * @return The list of principals associated with this policy statement.
+-     */
+-    public List getPrincipals() {
+-        return principals;
+-    }
+-
+-    /**
+-     * Sets the principals associated with this policy statement, indicating
+-     * which AWS accounts are affected by this policy statement.
+-     * 

+-     * If you don't want to restrict your policy to specific users, you can use
+-     * {@link Principal#AllUsers} to apply the policy to any user trying to
+-     * access your resource.
+-     *
+-     * @param principals
+-     *            The list of principals associated with this policy statement.
+-     */
+-    public void setPrincipals(Collection principals) {
+-        this.principals = new ArrayList(principals);
+-    }
+-
+-    /**
+-     * Sets the principals associated with this policy statement, indicating
+-     * which AWS accounts are affected by this policy statement.
+-     * 

+-     * If you don't want to restrict your policy to specific users, you can use
+-     * {@link Principal#AllUsers} to apply the policy to any user trying to
+-     * access your resource.
+-     *
+-     * @param principals
+-     *            The list of principals associated with this policy statement.
+-     */
+-    public void setPrincipals(Principal... principals) {
+-        setPrincipals(new ArrayList(Arrays.asList(principals)));
+-    }
+-
+-    /**
+-     * Sets the principals associated with this policy statement, and returns
+-     * this updated Statement object. Principals control which AWS accounts are
+-     * affected by this policy statement.
+-     * 

+-     * If you don't want to restrict your policy to specific users, you can use
+-     * {@link Principal#AllUsers} to apply the policy to any user trying to
+-     * access your resource.
+-     *
+-     * @param principals
+-     *            The list of principals associated with this policy statement.
+-     *
+-     * @return The updated Statement object so that additional method calls can
+-     *         be chained together.
+-     */
+-    public Statement withPrincipals(Principal... principals) {
+-        setPrincipals(principals);
+-        return this;
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/presign/PresignerFacade.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/presign/PresignerFacade.java
+--- ./src/main/java/com/amazonaws/auth/presign/PresignerFacade.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/presign/PresignerFacade.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,99 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth.presign;
+-
+-import com.amazonaws.AmazonWebServiceRequest;
+-import com.amazonaws.Request;
+-import com.amazonaws.annotation.Immutable;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.auth.AWSCredentialsProvider;
+-import com.amazonaws.auth.Presigner;
+-import com.amazonaws.internal.auth.SignerProvider;
+-import com.amazonaws.internal.auth.SignerProviderContext;
+-import com.amazonaws.util.CredentialUtils;
+-import com.amazonaws.util.RuntimeHttpUtils;
+-
+-import java.net.URL;
+-import java.util.Date;
+-import java.util.List;
+-import java.util.Map;
+-
+-/**
+- * Really thin facade over {@link Presigner} to deal with some common concerns like credential resolution, adding custom headers
+- * and query params to be included in signing, and conversion to a usable URL.
+- */
+-@Immutable
+-@SdkProtectedApi
+-public final class PresignerFacade {
+-
+-    private final AWSCredentialsProvider credentialsProvider;
+-    private final SignerProvider signerProvider;
+-
+-    public PresignerFacade(PresignerParams presignerParams) {
+-        this.credentialsProvider = presignerParams.credentialsProvider();
+-        this.signerProvider = presignerParams.signerProvider();
+-    }
+-
+-    public URL presign(Request request, Date expirationDate) {
+-        final Presigner presigner = (Presigner) signerProvider.getSigner(SignerProviderContext.builder()
+-                                                                                 .withIsRedirect(false)
+-                                                                                 .withRequest(request)
+-                                                                                 .withUri(request.getEndpoint())
+-                                                                                 .build());
+-        if (request.getOriginalRequest() != null) {
+-            addCustomQueryParams(request);
+-            addCustomHeaders(request);
+-        }
+-        final AWSCredentialsProvider credentialsProvider = resolveCredentials(request);
+-        presigner.presignRequest(request, credentialsProvider.getCredentials(), expirationDate);
+-        return RuntimeHttpUtils.convertRequestToUrl(request, true, false);
+-    }
+-
+-    private void addCustomQueryParams(Request request) {
+-        final Map> queryParameters = request.getOriginalRequest().getCustomQueryParameters();
+-        if (queryParameters == null || queryParameters.isEmpty()) {
+-            return;
+-        }
+-        for (Map.Entry> param : queryParameters.entrySet()) {
+-            request.addParameters(param.getKey(), param.getValue());
+-        }
+-    }
+-
+-    private void addCustomHeaders(Request request) {
+-        final Map headers = request.getOriginalRequest().getCustomRequestHeaders();
+-        if (headers == null || headers.isEmpty()) {
+-            return;
+-        }
+-        for (Map.Entry header : headers.entrySet()) {
+-            request.addHeader(header.getKey(), header.getValue());
+-        }
+-    }
+-
+-    private AWSCredentialsProvider resolveCredentials(Request request) {
+-        return CredentialUtils.getCredentialsProvider(request.getOriginalRequest(), this.credentialsProvider);
+-    }
+-
+-    /**
+-     * Empty request object useful for setting request level credentials without having the user facing presiging request extend
+-     * from {@link AmazonWebServiceRequest}.
+-     */
+-    public static class PresigningRequest extends AmazonWebServiceRequest {
+-
+-        public PresigningRequest withRequestCredentialsProvider(AWSCredentialsProvider credentialsProvider) {
+-            setRequestCredentialsProvider(credentialsProvider);
+-            return this;
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/presign/PresignerParams.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/presign/PresignerParams.java
+--- ./src/main/java/com/amazonaws/auth/presign/PresignerParams.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/presign/PresignerParams.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,110 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth.presign;
+-
+-import com.amazonaws.annotation.Immutable;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.annotation.SdkTestInternalApi;
+-import com.amazonaws.auth.AWSCredentialsProvider;
+-import com.amazonaws.auth.SdkClock;
+-import com.amazonaws.internal.auth.SignerProvider;
+-
+-import java.net.URI;
+-
+-/**
+- * Params object passed to the presigner extension class for a service client and also for {@link PresignerFacade}.
+- */
+-@Immutable
+-@SdkProtectedApi
+-public class PresignerParams {
+-
+-    private final URI endpoint;
+-    private final AWSCredentialsProvider credentialsProvider;
+-    private final SignerProvider signerProvider;
+-    private final SdkClock clock;
+-
+-    public PresignerParams(URI endpoint,
+-                           AWSCredentialsProvider credentialsProvider,
+-                           SignerProvider signerProvider,
+-                           SdkClock clock) {
+-        this.endpoint = endpoint;
+-        this.credentialsProvider = credentialsProvider;
+-        this.signerProvider = signerProvider;
+-        this.clock = clock;
+-    }
+-
+-    public static Builder builder() {
+-        return new Builder();
+-    }
+-
+-    public URI endpoint() {
+-        return endpoint;
+-    }
+-
+-    public AWSCredentialsProvider credentialsProvider() {
+-        return credentialsProvider;
+-    }
+-
+-    public SignerProvider signerProvider() {
+-        return signerProvider;
+-    }
+-
+-    /**
+-     * @return Clock providing the current time in milliseconds.
+-     */
+-    public SdkClock clock() {
+-        return this.clock;
+-    }
+-
+-    public static class Builder {
+-
+-        private URI endpoint;
+-        private AWSCredentialsProvider credentialsProvider;
+-        private SignerProvider signerProvider;
+-        private SdkClock clock;
+-
+-        private Builder() {
+-        }
+-
+-        public Builder endpoint(URI endpoint) {
+-            this.endpoint = endpoint;
+-            return this;
+-        }
+-
+-        public Builder credentialsProvider(AWSCredentialsProvider credentialsProvider) {
+-            this.credentialsProvider = credentialsProvider;
+-            return this;
+-        }
+-
+-        public Builder signerProvider(SignerProvider signerProvider) {
+-            this.signerProvider = signerProvider;
+-            return this;
+-        }
+-
+-        @SdkTestInternalApi
+-        public Builder clock(SdkClock clock) {
+-            this.clock = clock;
+-            return this;
+-        }
+-
+-        public PresignerParams build() {
+-            return new PresignerParams(endpoint, credentialsProvider, signerProvider, resolveClock());
+-        }
+-
+-        private SdkClock resolveClock() {
+-            return clock == null ? SdkClock.STANDARD : clock;
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/Presigner.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/Presigner.java
+--- ./src/main/java/com/amazonaws/auth/Presigner.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/Presigner.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,38 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth;
+-
+-import java.util.Date;
+-
+-import com.amazonaws.SignableRequest;
+-
+-/**
+- * A request signer that has special-case logic to presign requests, generating
+- * a URL which embeds the signature suitable for hyperlinking.
+- */
+-public interface Presigner {
+-    /**
+-     * Signs the request by adding the signature to the URL rather than as a
+-     * header. This method is expected to modify the passed-in request to
+-     * add the signature.
+-     *
+-     * @param request      The request to sign.
+-     * @param credentials  The credentials to sign it with.
+-     * @param expiration   The time when this presigned URL will expire.
+-     */
+-    public void presignRequest(SignableRequest request,
+-                               AWSCredentials credentials,
+-                               Date expiration);
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/QueryStringSigner.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/QueryStringSigner.java
+--- ./src/main/java/com/amazonaws/auth/QueryStringSigner.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/QueryStringSigner.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,204 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth;
+-
+-import java.net.URI;
+-import java.text.SimpleDateFormat;
+-import java.util.Date;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.SortedMap;
+-import java.util.TimeZone;
+-import java.util.TreeMap;
+-
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.SignableRequest;
+-
+-/**
+- * Signer implementation responsible for signing an AWS query string request
+- * according to the various signature versions and hashing algorithms.
+- */
+-public class QueryStringSigner extends AbstractAWSSigner implements Signer {
+-    /** Date override for testing only */
+-    private Date overriddenDate;
+-
+-    /**
+-     * This signer will add "Signature" parameter to the request. Default
+-     * signature version is "2" and default signing algorithm is "HmacSHA256".
+-     *
+-     * AWSAccessKeyId SignatureVersion SignatureMethod Timestamp Signature
+-     *
+-     * @param request
+-     *            request to be signed.
+-     * @param credentials
+-     *            The credentials used to use to sign the request.
+-     */
+-    public void sign(SignableRequest request, AWSCredentials credentials)
+-            throws SdkClientException {
+-        sign(request, SignatureVersion.V2, SigningAlgorithm.HmacSHA256, credentials);
+-    }
+-
+-    /**
+-     * This signer will add following authentication parameters to the request:
+-     *
+-     * AWSAccessKeyId SignatureVersion SignatureMethod Timestamp Signature
+-     *
+-     * @param request
+-     *            request to be signed.
+-     *
+-     * @param version
+-     *            signature version. "2" is recommended.
+-     *
+-     * @param algorithm
+-     *            signature algorithm. "HmacSHA256" is recommended.
+-     */
+-    public void sign(SignableRequest request, SignatureVersion version,
+-            SigningAlgorithm algorithm, AWSCredentials credentials)
+-            throws SdkClientException {
+-        // annonymous credentials, don't sign
+-        if ( credentials instanceof AnonymousAWSCredentials ) {
+-            return;
+-        }
+-
+-        AWSCredentials sanitizedCredentials = sanitizeCredentials(credentials);
+-        request.addParameter("AWSAccessKeyId", sanitizedCredentials.getAWSAccessKeyId());
+-        request.addParameter("SignatureVersion", version.toString());
+-
+-        int timeOffset = request.getTimeOffset();
+-        request.addParameter("Timestamp", getFormattedTimestamp(timeOffset));
+-
+-        if ( sanitizedCredentials instanceof AWSSessionCredentials ) {
+-            addSessionCredentials(request, (AWSSessionCredentials) sanitizedCredentials);
+-        }
+-
+-        String stringToSign = null;
+-        if ( version.equals( SignatureVersion.V1 ) ) {
+-            stringToSign = calculateStringToSignV1(request.getParameters());
+-        } else if ( version.equals( SignatureVersion.V2 ) ) {
+-            request.addParameter("SignatureMethod", algorithm.toString());
+-            stringToSign = calculateStringToSignV2(request);
+-        } else {
+-            throw new SdkClientException("Invalid Signature Version specified");
+-        }
+-
+-        String signatureValue = signAndBase64Encode(stringToSign,
+-                sanitizedCredentials.getAWSSecretKey(), algorithm);
+-        request.addParameter("Signature", signatureValue);
+-    }
+-
+-    /**
+-     * Calculates string to sign for signature version 1.
+-     *
+-     * @param parameters
+-     *            request parameters
+-     *
+-     * @return String to sign
+-     */
+-    private String calculateStringToSignV1(Map> parameters) {
+-        StringBuilder data = new StringBuilder();
+-        SortedMap> sorted =
+-            new TreeMap>(String.CASE_INSENSITIVE_ORDER);
+-        sorted.putAll(parameters);
+-
+-        for (Map.Entry> entry : sorted.entrySet()) {
+-            for (String value : entry.getValue()) {
+-                data.append(entry.getKey())
+-                    .append(value);
+-            }
+-        }
+-
+-        return data.toString();
+-    }
+-
+-    /**
+-     * Calculate string to sign for signature version 2.
+-     *
+-     * @param request
+-     *            The request being signed.
+-     *
+-     * @return String to sign
+-     *
+-     * @throws SdkClientException
+-     *             If the string to sign cannot be calculated.
+-     */
+-    private String calculateStringToSignV2(SignableRequest request) throws SdkClientException {
+-        URI endpoint = request.getEndpoint();
+-
+-        StringBuilder data = new StringBuilder();
+-        data.append("POST")
+-            .append("\n")
+-            .append(getCanonicalizedEndpoint(endpoint))
+-            .append("\n")
+-            .append(getCanonicalizedResourcePath(request))
+-            .append("\n")
+-            .append(getCanonicalizedQueryString(request.getParameters()));
+-        return data.toString();
+-    }
+-
+-    private String getCanonicalizedResourcePath(SignableRequest request) {
+-        String resourcePath = "";
+-
+-        if (request.getEndpoint().getPath() != null) {
+-            resourcePath += request.getEndpoint().getPath();
+-        }
+-
+-        if (request.getResourcePath() != null) {
+-            if (resourcePath.length() > 0 &&
+-                !resourcePath.endsWith("/") &&
+-                !request.getResourcePath().startsWith("/")) {
+-                resourcePath += "/";
+-            }
+-
+-            resourcePath += request.getResourcePath();
+-        } else if (!resourcePath.endsWith("/")) {
+-            resourcePath += "/";
+-        }
+-
+-        if (!resourcePath.startsWith("/")) {
+-            resourcePath = "/" + resourcePath;
+-        }
+-
+-        if (resourcePath.startsWith("//")) {
+-            resourcePath = resourcePath.substring(1);
+-        }
+-
+-        return resourcePath;
+-    }
+-
+-    /**
+-     * Formats date as ISO 8601 timestamp
+-     */
+-    private String getFormattedTimestamp(int offset) {
+-        SimpleDateFormat df = new SimpleDateFormat(
+-                "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+-        df.setTimeZone(TimeZone.getTimeZone("UTC"));
+-
+-        if (overriddenDate != null) {
+-            return df.format(overriddenDate);
+-        } else {
+-            return df.format(getSignatureDate(offset));
+-        }
+-    }
+-
+-    /** For testing purposes only, to control the date used in signing. */
+-    void overrideDate(Date date) {
+-        this.overriddenDate = date;
+-    }
+-
+-    @Override
+-    protected void addSessionCredentials(SignableRequest request, AWSSessionCredentials credentials) {
+-        request.addParameter("SecurityToken", credentials.getSessionToken());
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/RegionAwareSigner.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/RegionAwareSigner.java
+--- ./src/main/java/com/amazonaws/auth/RegionAwareSigner.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/RegionAwareSigner.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,28 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth;
+-
+-/**
+- * A signer that needs to know which region it is talking to.
+- */
+-public interface RegionAwareSigner extends Signer {
+-    /**
+-     * Configure this signer with the name of the region it will be used
+-     * to sign requests for.
+-     *
+-     * @param value   The name of the region.
+-     */
+-    void setRegionName(String value);
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/RequestSigner.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/RequestSigner.java
+--- ./src/main/java/com/amazonaws/auth/RequestSigner.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/RequestSigner.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,37 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *   http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- *
+- */
+-
+-package com.amazonaws.auth;
+-
+-
+-import com.amazonaws.SignableRequest;
+-
+-/**
+- * A strategy for applying cryptographic signatures to a request, proving
+- * that the request was made by someone in posession of the given set of
+- * credentials without transmitting the secret key over the wire.
+- */
+-
+-public interface RequestSigner {
+-
+-    /**
+-     * Sign the given request - modifies the
+-     * passed-in request to apply the signature.
+-     *
+-     * @param request      The request to sign.
+-     */
+-    void sign(SignableRequest request);
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/SdkClock.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/SdkClock.java
+--- ./src/main/java/com/amazonaws/auth/SdkClock.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/SdkClock.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,89 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth;
+-
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.annotation.SdkTestInternalApi;
+-import java.util.Date;
+-
+-/**
+- * Clock interface to prevent static coupling to {@link System#currentTimeMillis()}.
+- */
+-@SdkProtectedApi
+-public interface SdkClock {
+-
+-    /**
+-     * Standard implementation that calls out to {@link System#currentTimeMillis()}. Used in production code.
+-     */
+-    SdkClock STANDARD = new SdkClock() {
+-        @Override
+-        public long currentTimeMillis() {
+-            return System.currentTimeMillis();
+-        }
+-    };
+-
+-    long currentTimeMillis();
+-
+-    /**
+-     * Mock implementation used in tests.
+-     */
+-    final class MockClock implements SdkClock {
+-        private final long mockedTime;
+-
+-        public MockClock(Date mockedTime) {
+-            this(mockedTime.getTime());
+-        }
+-
+-        public MockClock(long mockedTime) {
+-            this.mockedTime = mockedTime;
+-        }
+-
+-        @Override
+-        public long currentTimeMillis() {
+-            return mockedTime;
+-        }
+-    }
+-
+-    /**
+-     * Container for Singleton instance of the {@link SdkClock}.
+-     */
+-    final class Instance {
+-
+-        private static SdkClock clock = STANDARD;
+-
+-        public static SdkClock get() {
+-            return clock;
+-        }
+-
+-        /**
+-         * Should only be used by tests to mock the clock.
+-         *
+-         * @param newClock New clock to use.
+-         */
+-        @SdkTestInternalApi
+-        public static void set(SdkClock newClock) {
+-            clock = newClock;
+-        }
+-
+-        /**
+-         * Reset the clock to {@link #STANDARD}. Should only be used by SDK tests.
+-         */
+-        @SdkTestInternalApi
+-        public static void reset() {
+-            clock = STANDARD;
+-        }
+-
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/ServiceAwareSigner.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/ServiceAwareSigner.java
+--- ./src/main/java/com/amazonaws/auth/ServiceAwareSigner.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/ServiceAwareSigner.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,28 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth;
+-
+-/**
+- * A signer that needs to know which service it is talking to.
+- */
+-public interface ServiceAwareSigner extends Signer {
+-    /**
+-     * Configure this signer with the name of the service it will be used
+-     * to sign requests for.
+-     *
+-     * @param value   The name of the service.
+-     */
+-    void setServiceName(String value);
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/SignatureVersion.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/SignatureVersion.java
+--- ./src/main/java/com/amazonaws/auth/SignatureVersion.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/SignatureVersion.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,32 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- * 
+- *  http://aws.amazon.com/apache2.0
+- * 
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth;
+-
+-public enum SignatureVersion {
+-
+-    V1("1"), V2("2");
+-
+-    private String value;
+-
+-    private SignatureVersion(String value) {
+-        this.value = value;
+-    }
+-
+-    @Override
+-    public String toString() {
+-        return this.value;
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/SignerAsRequestSigner.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/SignerAsRequestSigner.java
+--- ./src/main/java/com/amazonaws/auth/SignerAsRequestSigner.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/SignerAsRequestSigner.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,48 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *   http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- *
+- */
+-
+-package com.amazonaws.auth;
+-
+-import com.amazonaws.SignableRequest;
+-
+-/**
+- * An adapter class that allows a {@link Signer} to implement the
+- * {@link RequestSigner} interface
+- */
+-public final class SignerAsRequestSigner implements RequestSigner {
+-    private final Signer signer;
+-    private final AWSCredentialsProvider credentialsProvider;
+-
+-    /**
+-     * Creates a {@link SignerAsRequestSigner}
+-     * @param signer
+-     *          the underlying {@link Signer} to use to actually sign the request
+-     * @param credentialsProvider
+-     *          the credentialsProvider to use to pass {@link AWSCredentials} to the underlying {@link Signer}
+-     */
+-    public SignerAsRequestSigner(Signer signer, AWSCredentialsProvider credentialsProvider) {
+-        this.signer = signer;
+-        this.credentialsProvider = credentialsProvider;
+-    }
+-
+-    /**
+-     * @see RequestSigner#sign(SignableRequest)
+-     */
+-    @Override
+-    public void sign(SignableRequest request) {
+-        signer.sign(request, credentialsProvider.getCredentials());
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/SignerFactory.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/SignerFactory.java
+--- ./src/main/java/com/amazonaws/auth/SignerFactory.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/SignerFactory.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,181 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth;
+-
+-import java.util.Map;
+-import java.util.concurrent.ConcurrentHashMap;
+-
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.internal.config.InternalConfig;
+-import com.amazonaws.internal.config.SignerConfig;
+-
+-/** Signer factory. */
+-public final class SignerFactory {
+-
+-    public static final String QUERY_STRING_SIGNER = "QueryStringSignerType";
+-    public static final String VERSION_THREE_SIGNER = "AWS3SignerType";
+-    public static final String VERSION_FOUR_SIGNER = "AWS4SignerType";
+-    public static final String VERSION_FOUR_UNSIGNED_PAYLOAD_SIGNER = "AWS4UnsignedPayloadSignerType";
+-    public static final String NO_OP_SIGNER = "NoOpSignerType";
+-
+-    private static final Map> SIGNERS
+-        = new ConcurrentHashMap>();
+-
+-    static {
+-        // Register the standard signer types.
+-        SIGNERS.put(QUERY_STRING_SIGNER, QueryStringSigner.class);
+-        SIGNERS.put(VERSION_THREE_SIGNER, AWS3Signer.class);
+-        SIGNERS.put(VERSION_FOUR_SIGNER, AWS4Signer.class);
+-        SIGNERS.put(VERSION_FOUR_UNSIGNED_PAYLOAD_SIGNER, AWS4UnsignedPayloadSigner.class);
+-        SIGNERS.put(NO_OP_SIGNER, NoOpSigner.class);
+-    }
+-
+-    /**
+-     * Private so you're not tempted to instantiate me.
+-     */
+-    private SignerFactory() {
+-    }
+-
+-    /**
+-     * Register an implementation class for the given signer type.
+-     *
+-     * @param signerType  The name of the signer type to register.
+-     * @param signerClass The class implementing the given signature protocol.
+-     */
+-    public static void registerSigner(
+-            final String signerType,
+-            final Class signerClass) {
+-
+-        if (signerType == null) {
+-            throw new IllegalArgumentException("signerType cannot be null");
+-        }
+-        if (signerClass == null) {
+-            throw new IllegalArgumentException("signerClass cannot be null");
+-        }
+-
+-        SIGNERS.put(signerType, signerClass);
+-    }
+-
+-    /**
+-     * Returns a non-null signer for the specified service and region according
+-     * to the internal configuration which provides a basic default algorithm
+-     * used for signer determination.
+-     *
+-     * @param serviceName
+-     *            The name of the service to talk to.
+-     * @param regionName
+-     *            The name of the region to talk to; not necessarily the region
+-     *            used for signing.
+-     */
+-    public static Signer getSigner(String serviceName, String regionName) {
+-        return lookupAndCreateSigner(serviceName, regionName);
+-    }
+-
+-    /**
+-     * Returns an instance of the given signer type and configures it with the
+-     * given service name (if applicable).
+-     *
+-     * @param signerType
+-     *            The type of signer to create.
+-     * @param serviceName
+-     *            The name of the service to configure on the signer.
+-     * @return a non-null signer.
+-     */
+-    public static Signer getSignerByTypeAndService(String signerType,
+-            final String serviceName) {
+-        return createSigner(signerType, serviceName);
+-    }
+-
+-    private static String lookUpSignerTypeByServiceAndRegion(String serviceName, String regionName) {
+-        InternalConfig config = InternalConfig.Factory.getInternalConfig();
+-        SignerConfig signerConfig =
+-                config.getSignerConfig(serviceName, regionName);
+-        return signerConfig.getSignerType();
+-    }
+-
+-    /**
+-     * Internal implementation for looking up and creating a signer by service
+-     * name and region.
+-     */
+-    private static Signer lookupAndCreateSigner(String serviceName, String regionName) {
+-        String signerType = lookUpSignerTypeByServiceAndRegion(serviceName, regionName);
+-        return createSigner(signerType, serviceName);
+-    }
+-
+-    /**
+-     * Internal implementation to create a signer by type and service name,
+-     * and configuring it with the service name if applicable.
+-     */
+-    private static Signer createSigner(String signerType,
+-            final String serviceName) {
+-        Class signerClass = SIGNERS.get(signerType);
+-        if (signerClass == null)
+-            throw new IllegalArgumentException("unknown signer type: " + signerType);
+-        Signer signer = createSigner(signerType);
+-
+-        if (signer instanceof ServiceAwareSigner) {
+-            ((ServiceAwareSigner) signer).setServiceName(serviceName);
+-        }
+-        return signer;
+-    }
+-
+-    /**
+-     * Create an instance of the given signer type and initialize it with the
+-     * given parameters.
+-     *
+-     * @param signerType The signer type.
+-     * @param params The parameters to intialize the signer with.
+-     *
+-     * @return The new signer instance.
+-     */
+-    @SdkProtectedApi
+-    public static Signer createSigner(String signerType, SignerParams params) {
+-        Signer signer = createSigner(signerType);
+-
+-        if (signer instanceof ServiceAwareSigner) {
+-            ((ServiceAwareSigner) signer).setServiceName(params.getServiceName());
+-        }
+-
+-        if (signer instanceof RegionAwareSigner) {
+-            ((RegionAwareSigner) signer).setRegionName(params.getRegionName());
+-        }
+-
+-        return signer;
+-    }
+-
+-    /**
+-     * Create an instance of the given signer.
+-     *
+-     * @param signerType The signer type.
+-     *
+-     * @return The new signer instance.
+-     */
+-    private static Signer createSigner(String signerType) {
+-        Class signerClass = SIGNERS.get(signerType);
+-        Signer signer;
+-        try {
+-            signer = signerClass.newInstance();
+-        } catch (InstantiationException ex) {
+-            throw new IllegalStateException(
+-                    "Cannot create an instance of " + signerClass.getName(),
+-                    ex);
+-        } catch (IllegalAccessException ex) {
+-            throw new IllegalStateException(
+-                    "Cannot create an instance of " + signerClass.getName(),
+-                    ex);
+-        }
+-        return signer;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/Signer.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/Signer.java
+--- ./src/main/java/com/amazonaws/auth/Signer.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/Signer.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,33 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth;
+-
+-import com.amazonaws.SignableRequest;
+-
+-/**
+- * A strategy for applying cryptographic signatures to a request, proving
+- * that the request was made by someone in posession of the given set of
+- * credentials without transmitting the secret key over the wire.
+- */
+-public interface Signer {
+-    /**
+-     * Sign the given request with the given set of credentials. Modifies the
+-     * passed-in request to apply the signature.
+-     *
+-     * @param request      The request to sign.
+-     * @param credentials  The credentials to sign the request with.
+-     */
+-    public void sign(SignableRequest request, AWSCredentials credentials);
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/SignerParams.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/SignerParams.java
+--- ./src/main/java/com/amazonaws/auth/SignerParams.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/SignerParams.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,37 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth;
+-
+-/**
+- * Shared parameter structure to contain information required for signing by
+- * various signer implementations.
+- */
+-public class SignerParams {
+-    private String serviceName;
+-    private String regionName;
+-
+-    public SignerParams(String serviceName, String regionName) {
+-        this.serviceName = serviceName;
+-        this.regionName = regionName;
+-    }
+-
+-    public String getServiceName() {
+-        return serviceName;
+-    }
+-
+-    public String getRegionName() {
+-        return regionName;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/SignerTypeAware.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/SignerTypeAware.java
+--- ./src/main/java/com/amazonaws/auth/SignerTypeAware.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/SignerTypeAware.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,22 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth;
+-
+-/**
+- * Used to mark implementations of {@link com.amazonaws.AmazonWebServiceRequest} that specify a custom signer type.
+- */
+-public interface SignerTypeAware {
+-    String getSignerType();
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/SigningAlgorithm.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/SigningAlgorithm.java
+--- ./src/main/java/com/amazonaws/auth/SigningAlgorithm.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/SigningAlgorithm.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,51 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- * 
+- *  http://aws.amazon.com/apache2.0
+- * 
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth;
+-
+-import com.amazonaws.SdkClientException;
+-
+-import javax.crypto.Mac;
+-import java.security.NoSuchAlgorithmException;
+-
+-public enum SigningAlgorithm {
+-
+-    HmacSHA1,
+-    HmacSHA256;
+-
+-    private final ThreadLocal macReference;
+-
+-    private SigningAlgorithm() {
+-        final String algorithmName = this.toString();
+-        macReference = new ThreadLocal() {
+-            @Override
+-            protected Mac initialValue() {
+-                try {
+-                    return Mac.getInstance(algorithmName);
+-                } catch (NoSuchAlgorithmException e) {
+-                    throw new SdkClientException("Unable to fetch Mac instance for Algorithm "
+-                            + algorithmName + e.getMessage(),e);
+-
+-                }
+-            }
+-        };
+-    }
+-
+-    /**
+-     * Returns the thread local reference for the crypto algorithm
+-     */
+-    public Mac getMac() {
+-        return macReference.get();
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/auth/StaticSignerProvider.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/StaticSignerProvider.java
+--- ./src/main/java/com/amazonaws/auth/StaticSignerProvider.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/auth/StaticSignerProvider.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,38 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.auth;
+-
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.internal.auth.SignerProvider;
+-import com.amazonaws.internal.auth.SignerProviderContext;
+-
+-/**
+- * Implementation of {@link SignerProvider} that always returns the same signer regardless of
+- * context.
+- */
+-@SdkProtectedApi
+-public class StaticSignerProvider extends SignerProvider {
+-
+-    private final Signer signer;
+-
+-    public StaticSignerProvider(Signer signer) {
+-        this.signer = signer;
+-    }
+-
+-    @Override
+-    public Signer getSigner(SignerProviderContext context) {
+-        return signer;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/client/AwsAsyncClientParams.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/client/AwsAsyncClientParams.java
+--- ./src/main/java/com/amazonaws/client/AwsAsyncClientParams.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/client/AwsAsyncClientParams.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,30 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.client;
+-
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-import java.util.concurrent.ExecutorService;
+-
+-/**
+- * Provides access to all params needed in a asynchronous AWS service client constructor. Abstract
+- * to allow additions to the params while maintaining backwards compatibility.
+- */
+-@SdkProtectedApi
+-public abstract class AwsAsyncClientParams extends AwsSyncClientParams {
+-
+-    public abstract ExecutorService getExecutor();
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/client/AwsSyncClientParams.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/client/AwsSyncClientParams.java
+--- ./src/main/java/com/amazonaws/client/AwsSyncClientParams.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/client/AwsSyncClientParams.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,60 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.client;
+-
+-import com.amazonaws.ClientConfiguration;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.auth.AWSCredentialsProvider;
+-import com.amazonaws.handlers.RequestHandler2;
+-import com.amazonaws.internal.auth.SignerProvider;
+-import com.amazonaws.metrics.RequestMetricCollector;
+-import com.amazonaws.retry.RetryPolicyAdapter;
+-import com.amazonaws.retry.v2.RetryPolicy;
+-
+-import java.net.URI;
+-import java.util.List;
+-
+-/**
+- * Provides access to all params needed in a synchronous AWS service client constructor. Abstract
+- * to allow additions to the params while maintaining backwards compatibility.
+- */
+-@SdkProtectedApi
+-public abstract class AwsSyncClientParams {
+-
+-    public abstract AWSCredentialsProvider getCredentialsProvider();
+-
+-    public abstract ClientConfiguration getClientConfiguration();
+-
+-    public abstract RequestMetricCollector getRequestMetricCollector();
+-
+-    public abstract List getRequestHandlers();
+-
+-    public SignerProvider getSignerProvider() {
+-        // Not currently used by AWS clients. The builder uses setRegion to configure endpoint
+-        // and signer and does not support custom endpoints or signers.
+-        return null;
+-    }
+-
+-    public URI getEndpoint() {
+-        // Not currently used by AWS clients. The builder uses setRegion to configure endpoint
+-        // and signer and does not support custom endpoints or signers.
+-        return null;
+-    }
+-
+-    public RetryPolicy getRetryPolicy() {
+-        final ClientConfiguration config = getClientConfiguration();
+-        return new RetryPolicyAdapter(config.getRetryPolicy(), config);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/client/builder/AwsAsyncClientBuilder.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/client/builder/AwsAsyncClientBuilder.java
+--- ./src/main/java/com/amazonaws/client/builder/AwsAsyncClientBuilder.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/client/builder/AwsAsyncClientBuilder.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,118 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.client.builder;
+-
+-import com.amazonaws.ClientConfigurationFactory;
+-import com.amazonaws.annotation.NotThreadSafe;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.annotation.SdkTestInternalApi;
+-import com.amazonaws.client.AwsAsyncClientParams;
+-import com.amazonaws.regions.AwsRegionProvider;
+-
+-import java.util.concurrent.ExecutorService;
+-import java.util.concurrent.Executors;
+-
+-/**
+- * Base class for all service specific async client builders.
+- *
+- * @param  Concrete builder type, used for better fluent methods.
+- */
+-@NotThreadSafe
+-@SdkProtectedApi
+-public abstract class AwsAsyncClientBuilder extends
+-                                                                                                 AwsClientBuilder {
+-    private ExecutorFactory executorFactory;
+-
+-    protected AwsAsyncClientBuilder(ClientConfigurationFactory clientConfigFactory) {
+-        super(clientConfigFactory);
+-    }
+-
+-    @SdkTestInternalApi
+-    protected AwsAsyncClientBuilder(ClientConfigurationFactory clientConfigFactory,
+-                                    AwsRegionProvider regionProvider) {
+-        super(clientConfigFactory, regionProvider);
+-    }
+-
+-
+-    /**
+-     * @return The {@link ExecutorFactory} currently configured by the client.
+-     */
+-    public final ExecutorFactory getExecutorFactory() {
+-        return executorFactory;
+-    }
+-
+-    /**
+-     * Sets a custom executor service factory to use for the async clients. The factory will be
+-     * called for each async client created through the builder.
+-     *
+-     * @param executorFactory Factory supplying new instances of {@link ExecutorService}
+-     */
+-    public final void setExecutorFactory(ExecutorFactory executorFactory) {
+-        this.executorFactory = executorFactory;
+-    }
+-
+-    /**
+-     * Sets a custom executor service factory to use for the async clients. The factory will be
+-     * called for each async client created through the builder.
+-     *
+-     * @param executorFactory Factory supplying new instances of {@link ExecutorService}
+-     * @return This object for method chaining.
+-     */
+-    public final Subclass withExecutorFactory(ExecutorFactory executorFactory) {
+-        setExecutorFactory(executorFactory);
+-        return getSubclass();
+-    }
+-
+-    @Override
+-    public final TypeToBuild build() {
+-        return configureMutableProperties(build(getAsyncClientParams()));
+-    }
+-
+-    protected abstract TypeToBuild build(AwsAsyncClientParams asyncClientParams);
+-
+-    /**
+-     * @return An instance of AwsAsyncClientParams that has all params to be used in the async
+-     * client constructor.
+-     */
+-    protected final AwsAsyncClientParams getAsyncClientParams() {
+-        return new AsyncBuilderParams(executorFactory);
+-    }
+-
+-    /**
+-     * Presents a view of the builder to be used in the async client constructor.
+-     */
+-    protected class AsyncBuilderParams extends SyncBuilderParams {
+-
+-        private final ExecutorService _executorService;
+-
+-        protected AsyncBuilderParams(ExecutorFactory executorFactory) {
+-            this._executorService =
+-                    (executorFactory == null) ? defaultExecutor() : executorFactory.newExecutor();
+-        }
+-
+-        @Override
+-        public ExecutorService getExecutor() {
+-            return this._executorService;
+-        }
+-
+-        /**
+-         * @return Default async Executor to use if none is explicitly provided by user.
+-         */
+-        private ExecutorService defaultExecutor() {
+-            return Executors.newFixedThreadPool(getClientConfiguration().getMaxConnections());
+-        }
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/client/builder/AwsClientBuilder.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/client/builder/AwsClientBuilder.java
+--- ./src/main/java/com/amazonaws/client/builder/AwsClientBuilder.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/client/builder/AwsClientBuilder.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,469 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.client.builder;
+-
+-import com.amazonaws.AmazonWebServiceClient;
+-import com.amazonaws.ClientConfiguration;
+-import com.amazonaws.ClientConfigurationFactory;
+-import com.amazonaws.PredefinedClientConfigurations;
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.annotation.NotThreadSafe;
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.annotation.SdkTestInternalApi;
+-import com.amazonaws.auth.AWSCredentialsProvider;
+-import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
+-import com.amazonaws.client.AwsAsyncClientParams;
+-import com.amazonaws.client.AwsSyncClientParams;
+-import com.amazonaws.handlers.RequestHandler2;
+-import com.amazonaws.metrics.RequestMetricCollector;
+-import com.amazonaws.regions.AwsRegionProvider;
+-import com.amazonaws.regions.DefaultAwsRegionProviderChain;
+-import com.amazonaws.regions.Region;
+-import com.amazonaws.regions.RegionUtils;
+-import com.amazonaws.regions.Regions;
+-
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.Collections;
+-import java.util.List;
+-import java.util.concurrent.ExecutorService;
+-
+-/**
+- * Base class for all service specific client builders.
+- *
+- * @param  Concrete builder type, used for better fluent methods.
+- * @param   Type that this builder builds.
+- */
+-@NotThreadSafe
+-@SdkProtectedApi
+-public abstract class AwsClientBuilder {
+-
+-    /**
+-     * Default Region Provider chain. Used only when the builder is not explicitly configured with a
+-     * region.
+-     */
+-    private static final AwsRegionProvider DEFAULT_REGION_PROVIDER = new DefaultAwsRegionProviderChain();
+-
+-    /**
+-     * Different services may have custom client configuration factories to vend defaults tailored
+-     * for that service. If no explicit client configuration is provided to the builder the default
+-     * factory for the service is used.
+-     */
+-    private final ClientConfigurationFactory clientConfigFactory;
+-
+-    /**
+-     * {@link AwsRegionProvider} to use when no explicit region or endpointConfiguration is configured.
+-     * This is currently not exposed for customization by customers.
+-     */
+-    private final AwsRegionProvider regionProvider;
+-
+-    private AWSCredentialsProvider credentials;
+-    private ClientConfiguration clientConfig;
+-    private RequestMetricCollector metricsCollector;
+-    private Region region;
+-    private List requestHandlers;
+-    private EndpointConfiguration endpointConfiguration;
+-
+-    protected AwsClientBuilder(ClientConfigurationFactory clientConfigFactory) {
+-        this(clientConfigFactory, DEFAULT_REGION_PROVIDER);
+-    }
+-
+-    @SdkTestInternalApi
+-    protected AwsClientBuilder(ClientConfigurationFactory clientConfigFactory,
+-                               AwsRegionProvider regionProvider) {
+-        this.clientConfigFactory = clientConfigFactory;
+-        this.regionProvider = regionProvider;
+-    }
+-
+-    /**
+-     * Gets the AWSCredentialsProvider currently configured in the builder.
+-     */
+-    public final AWSCredentialsProvider getCredentials() {
+-        return this.credentials;
+-    }
+-
+-    /**
+-     * Sets the AWSCredentialsProvider used by the client. If not specified the default is {@link
+-     * DefaultAWSCredentialsProviderChain}.
+-     *
+-     * @param credentialsProvider New AWSCredentialsProvider to use.
+-     */
+-    public final void setCredentials(AWSCredentialsProvider credentialsProvider) {
+-        this.credentials = credentialsProvider;
+-    }
+-
+-    /**
+-     * Sets the AWSCredentialsProvider used by the client. If not specified the default is {@link
+-     * DefaultAWSCredentialsProviderChain}.
+-     *
+-     * @param credentialsProvider New AWSCredentialsProvider to use.
+-     * @return This object for method chaining.
+-     */
+-    public final Subclass withCredentials(AWSCredentialsProvider credentialsProvider) {
+-        setCredentials(credentialsProvider);
+-        return getSubclass();
+-    }
+-
+-    /**
+-     * If the builder isn't explicitly configured with credentials we use the {@link
+-     * DefaultAWSCredentialsProviderChain}.
+-     */
+-    private AWSCredentialsProvider resolveCredentials() {
+-        return (credentials == null) ? DefaultAWSCredentialsProviderChain.getInstance() : credentials;
+-    }
+-
+-    /**
+-     * Gets the ClientConfiguration currently configured in the builder
+-     */
+-    public final ClientConfiguration getClientConfiguration() {
+-        return this.clientConfig;
+-    }
+-
+-    /**
+-     * Sets the ClientConfiguration to be used by the client. If not specified the default is
+-     * typically {@link PredefinedClientConfigurations#defaultConfig} but may differ per service.
+-     *
+-     * @param config Custom configuration to use
+-     */
+-    public final void setClientConfiguration(ClientConfiguration config) {
+-        this.clientConfig = config;
+-    }
+-
+-    /**
+-     * Sets the ClientConfiguration to be used by the client. If not specified the default is
+-     * typically {@link PredefinedClientConfigurations#defaultConfig} but may differ per service.
+-     *
+-     * @param config Custom configuration to use
+-     * @return This object for method chaining.
+-     */
+-    public final Subclass withClientConfiguration(ClientConfiguration config) {
+-        setClientConfiguration(config);
+-        return getSubclass();
+-    }
+-
+-    /**
+-     * If not explicit client configuration is provided we consult the {@link
+-     * ClientConfigurationFactory} of the service. If an explicit configuration is provided we use
+-     * ClientConfiguration's copy constructor to avoid mutation.
+-     */
+-    private ClientConfiguration resolveClientConfiguration() {
+-        return (clientConfig == null) ? clientConfigFactory.getConfig() :
+-                new ClientConfiguration(clientConfig);
+-    }
+-
+-    /**
+-     * Gets the {@link RequestMetricCollector} in use by the builder.
+-     */
+-    public final RequestMetricCollector getMetricsCollector() {
+-        return this.metricsCollector;
+-    }
+-
+-    /**
+-     * Sets a custom RequestMetricCollector to use for the client.
+-     *
+-     * @param metrics Custom RequestMetricCollector to use.
+-     */
+-    public final void setMetricsCollector(RequestMetricCollector metrics) {
+-        this.metricsCollector = metrics;
+-    }
+-
+-    /**
+-     * Sets a custom RequestMetricCollector to use for the client.
+-     *
+-     * @param metrics Custom RequestMetricCollector to use.
+-     * @return This object for method chaining.
+-     */
+-    public final Subclass withMetricsCollector(RequestMetricCollector metrics) {
+-        setMetricsCollector(metrics);
+-        return getSubclass();
+-    }
+-
+-    /**
+-     * Gets the region in use by the builder.
+-     */
+-    public final String getRegion() {
+-        return region == null ? null : region.getName();
+-    }
+-
+-    /**
+-     * Sets the region to be used by the client. This will be used to determine both the
+-     * service endpoint (eg: https://sns.us-west-1.amazonaws.com) and signing region (eg: us-west-1)
+-     * for requests. If neither region or endpoint configuration {@link #setEndpointConfiguration(EndpointConfiguration)}
+-     * are explicitly provided in the builder the {@link #DEFAULT_REGION_PROVIDER} is consulted.
+-     *
+-     * @param region Region to use
+-     */
+-    public final void setRegion(String region) {
+-        withRegion(region);
+-    }
+-
+-    /**
+-     * Sets the region to be used by the client. This will be used to determine both the
+-     * service endpoint (eg: https://sns.us-west-1.amazonaws.com) and signing region (eg: us-west-1)
+-     * for requests. If neither region or endpoint configuration {@link #setEndpointConfiguration(EndpointConfiguration)}
+-     * are explicitly provided in the builder the {@link #DEFAULT_REGION_PROVIDER} is consulted.
+-     *
+-     * 
 For regions not explicitly in the {@link Regions} enum use the {@link
+-     * #withRegion(String)} overload.

+-     *
+-     * @param region Region to use
+-     * @return This object for method chaining.
+-     */
+-    public final Subclass withRegion(Regions region) {
+-        return withRegion(region.getName());
+-    }
+-
+-    /**
+-     * Sets the region to be used by the client. This will be used to determine both the
+-     * service endpoint (eg: https://sns.us-west-1.amazonaws.com) and signing region (eg: us-west-1)
+-     * for requests. If neither region or endpoint configuration {@link #setEndpointConfiguration(EndpointConfiguration)}
+-     * are explicitly provided in the builder the {@link #DEFAULT_REGION_PROVIDER} is consulted.
+-     *
+-     * @param region Region to use
+-     * @return This object for method chaining.
+-     */
+-    public final Subclass withRegion(String region) {
+-        return withRegion(RegionUtils.getRegion(region));
+-    }
+-
+-    /**
+-     * Sets the region to be used by the client. This will be used to determine both the
+-     * service endpoint (eg: https://sns.us-west-1.amazonaws.com) and signing region (eg: us-west-1)
+-     * for requests. If neither region or endpoint configuration {@link #setEndpointConfiguration(EndpointConfiguration)}
+-     * are explicitly provided in the builder the {@link #DEFAULT_REGION_PROVIDER} is consulted.
+-     *
+-     * @param region Region to use, this will be used to determine both service endpoint
+-     *               and the signing region
+-     * @return This object for method chaining.
+-     */
+-    private Subclass withRegion(Region region) {
+-        this.region = region;
+-        return getSubclass();
+-    }
+-
+-    /**
+-     * Gets the service endpointConfiguration in use by the builder
+-     */
+-    public final EndpointConfiguration getEndpoint() {
+-        return endpointConfiguration;
+-    }
+-
+-    /**
+-     * Sets the endpoint configuration (service endpoint & signing region) to be used for requests. If neither region {@link #setRegion(String)}
+-     * or endpoint configuration are explicitly provided in the builder the {@link #DEFAULT_REGION_PROVIDER} is consulted.
+-     *
+-     * 
Only use this if using a non-standard service endpoint - the recommended approach for configuring a client is to use {@link #setRegion(String)}
+-     *
+-     * @param endpointConfiguration The endpointConfiguration to use
+-     */
+-    public final void setEndpointConfiguration(EndpointConfiguration endpointConfiguration) {
+-        withEndpointConfiguration(endpointConfiguration);
+-    }
+-
+-    /**
+-     * Sets the endpoint configuration (service endpoint & signing region) to be used for requests. If neither region {@link #withRegion(String)}
+-     * or endpoint configuration are explicitly provided in the builder the {@link #DEFAULT_REGION_PROVIDER} is consulted.
+-     *
+-     * 
Only use this if using a non-standard service endpoint - the recommended approach for configuring a client is to use {@link #withRegion(String)}
+-     *
+-     * @param endpointConfiguration The endpointConfiguration to use
+-     * @return This object for method chaining.
+-     */
+-    public final Subclass withEndpointConfiguration(EndpointConfiguration endpointConfiguration) {
+-        this.endpointConfiguration = endpointConfiguration;
+-        return getSubclass();
+-    }
+-
+-    /**
+-     * Gets the list of request handlers in use by the builder.
+-     */
+-    public final List getRequestHandlers() {
+-        return this.requestHandlers == null ? null :
+-                Collections.unmodifiableList(this.requestHandlers);
+-    }
+-
+-    /**
+-     * Sets the request handlers to use in the client.
+-     *
+-     * @param handlers Request handlers to use for client.
+-     */
+-    public final void setRequestHandlers(RequestHandler2... handlers) {
+-        this.requestHandlers = Arrays.asList(handlers);
+-    }
+-
+-    /**
+-     * Sets the request handlers to use in the client.
+-     *
+-     * @param handlers Request handlers to use for client.
+-     * @return This object for method chaining.
+-     */
+-    public final Subclass withRequestHandlers(RequestHandler2... handlers) {
+-        setRequestHandlers(handlers);
+-        return getSubclass();
+-    }
+-
+-    /**
+-     * Request handlers are copied to a new list to avoid mutation, if no request handlers are
+-     * provided to the builder we supply an empty list.
+-     */
+-    private List resolveRequestHandlers() {
+-        return (requestHandlers == null) ? new ArrayList() :
+-                new ArrayList(requestHandlers);
+-    }
+-
+-    /**
+-     * Region and endpoint logic is tightly coupled to the client class right now so it's easier to
+-     * set them after client creation and let the normal logic kick in. Ideally this should resolve
+-     * the endpoint and signer information here and just pass that information as is to the client.
+-     *
+-     * @param clientInterface Client to configure
+-     */
+-    @SdkInternalApi
+-    final TypeToBuild configureMutableProperties(TypeToBuild clientInterface) {
+-        AmazonWebServiceClient client = (AmazonWebServiceClient) clientInterface;
+-        setRegion(client);
+-        client.makeImmutable();
+-        return clientInterface;
+-    }
+-
+-    /**
+-     * Builds a client with the configure properties.
+-     *
+-     * @return Client instance to make API calls with.
+-     */
+-    public abstract TypeToBuild build();
+-
+-    /**
+-     * @return An instance of AwsSyncClientParams that has all params to be used in the sync client
+-     * constructor.
+-     */
+-    protected final AwsSyncClientParams getSyncClientParams() {
+-        return new SyncBuilderParams();
+-    }
+-
+-    private void setRegion(AmazonWebServiceClient client) {
+-        if (region != null && endpointConfiguration != null) {
+-            throw new IllegalStateException("Only one of Region or EndpointConfiguration may be set.");
+-        }
+-        if (endpointConfiguration != null) {
+-            client.setEndpoint(endpointConfiguration.getServiceEndpoint());
+-            client.setSignerRegionOverride(endpointConfiguration.getSigningRegion());
+-        } else if (region != null) {
+-            client.setRegion(region);
+-        } else {
+-            final String region = determineRegionFromRegionProvider();
+-            if (region != null) {
+-                client.setRegion(RegionUtils.getRegion(region));
+-            } else {
+-                throw new SdkClientException(
+-                        "Unable to find a region via the region provider chain. " +
+-                        "Must provide an explicit region in the builder or setup environment to supply a region.");
+-            }
+-        }
+-    }
+-
+-    /**
+-     * Attempt to determine the region from the configured region provider. This will return null in the event that the
+-     * region provider could not determine the region automatically.
+-     */
+-    private String determineRegionFromRegionProvider() {
+-        try {
+-            return regionProvider.getRegion();
+-        }
+-        catch (SdkClientException e) {
+-            // The AwsRegionProviderChain that is used by default throws an exception instead of returning null when
+-            // the region is not defined. For that reason, we have to support both throwing an exception and returning
+-            // null as the region not being defined.
+-            return null;
+-        }
+-    }
+-
+-    @SuppressWarnings("unchecked")
+-    protected final Subclass getSubclass() {
+-        return (Subclass) this;
+-    }
+-
+-    /**
+-     * Presents a view of the builder to be used in a client constructor.
+-     */
+-    protected class SyncBuilderParams extends AwsAsyncClientParams {
+-
+-
+-        private final ClientConfiguration _clientConfig;
+-        private final AWSCredentialsProvider _credentials;
+-        private final RequestMetricCollector _metricsCollector;
+-        private final List _requestHandlers;
+-
+-        protected SyncBuilderParams() {
+-            this._clientConfig = resolveClientConfiguration();
+-            this._credentials = resolveCredentials();
+-            this._metricsCollector = metricsCollector;
+-            this._requestHandlers = resolveRequestHandlers();
+-        }
+-
+-        @Override
+-        public AWSCredentialsProvider getCredentialsProvider() {
+-            return this._credentials;
+-        }
+-
+-        @Override
+-        public ClientConfiguration getClientConfiguration() {
+-            return this._clientConfig;
+-        }
+-
+-        @Override
+-        public RequestMetricCollector getRequestMetricCollector() {
+-            return this._metricsCollector;
+-        }
+-
+-        @Override
+-        public List getRequestHandlers() {
+-            return this._requestHandlers;
+-        }
+-
+-        @Override
+-        public ExecutorService getExecutor() {
+-            throw new UnsupportedOperationException("ExecutorService is not used for sync client.");
+-        }
+-
+-    }
+-
+-    /**
+-     * A container for configuration required to submit requests to a service (service endpoint and signing region)
+-     */
+-    public static final class EndpointConfiguration {
+-        private final String serviceEndpoint;
+-        private final String signingRegion;
+-
+-        /**
+-         * @param serviceEndpoint the service endpoint either with or without the protocol (e.g. https://sns.us-west-1.amazonaws.com or sns.us-west-1.amazonaws.com)
+-         * @param signingRegion the region to use for SigV4 signing of requests (e.g. us-west-1)
+-         */
+-        public EndpointConfiguration(String serviceEndpoint, String signingRegion) {
+-            this.serviceEndpoint = serviceEndpoint;
+-            this.signingRegion = signingRegion;
+-        }
+-
+-        public String getServiceEndpoint() {
+-            return serviceEndpoint;
+-        }
+-
+-        public String getSigningRegion() {
+-            return signingRegion;
+-        }
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/client/builder/AwsSyncClientBuilder.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/client/builder/AwsSyncClientBuilder.java
+--- ./src/main/java/com/amazonaws/client/builder/AwsSyncClientBuilder.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/client/builder/AwsSyncClientBuilder.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,57 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.client.builder;
+-
+-import com.amazonaws.ClientConfigurationFactory;
+-import com.amazonaws.annotation.NotThreadSafe;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.annotation.SdkTestInternalApi;
+-import com.amazonaws.client.AwsSyncClientParams;
+-import com.amazonaws.regions.AwsRegionProvider;
+-
+-/**
+- * Base class for all service specific sync client builders.
+- *
+- * @param     Concrete builder type, used for better fluent methods.
+- * @param  Client interface this builder can build.
+- */
+-@NotThreadSafe
+-@SdkProtectedApi
+-public abstract class AwsSyncClientBuilder extends
+-                                                                                               AwsClientBuilder {
+-    protected AwsSyncClientBuilder(ClientConfigurationFactory clientConfigFactory) {
+-        super(clientConfigFactory);
+-    }
+-
+-    @SdkTestInternalApi
+-    protected AwsSyncClientBuilder(ClientConfigurationFactory clientConfigFactory,
+-                                   AwsRegionProvider regionProvider) {
+-        super(clientConfigFactory, regionProvider);
+-    }
+-
+-    @Override
+-    public final TypeToBuild build() {
+-        return configureMutableProperties(build(getSyncClientParams()));
+-    }
+-
+-    /**
+-     * Overriden by subclasses to call the client constructor.
+-     *
+-     * @param clientParams Client Params to create client with
+-     * @return Built client.
+-     */
+-    protected abstract TypeToBuild build(AwsSyncClientParams clientParams);
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/client/builder/ExecutorFactory.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/client/builder/ExecutorFactory.java
+--- ./src/main/java/com/amazonaws/client/builder/ExecutorFactory.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/client/builder/ExecutorFactory.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,28 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.client.builder;
+-
+-import java.util.concurrent.ExecutorService;
+-
+-/**
+- * Factory to create instances of {@link ExecutorService}.
+- */
+-public interface ExecutorFactory {
+-
+-    /**
+-     * @return New {@link ExecutorService}
+-     */
+-    ExecutorService newExecutor();
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/client/ClientExecutionParams.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/client/ClientExecutionParams.java
+--- ./src/main/java/com/amazonaws/client/ClientExecutionParams.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/client/ClientExecutionParams.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,89 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.client;
+-
+-import com.amazonaws.AmazonServiceException;
+-import com.amazonaws.Request;
+-import com.amazonaws.RequestConfig;
+-import com.amazonaws.SdkBaseException;
+-import com.amazonaws.annotation.NotThreadSafe;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.http.HttpResponseHandler;
+-import com.amazonaws.transform.Marshaller;
+-
+-/**
+- * Encapsulates parameters needed for a particular API call. Captures input and output pojo types.
+- *
+- * @param   Input POJO type.
+- * @param  Output POJO type.
+- */
+-@SdkProtectedApi
+-@NotThreadSafe
+-public class ClientExecutionParams {
+-
+-    private Input input;
+-    private Marshaller, Input> marshaller;
+-    private HttpResponseHandler responseHandler;
+-    private HttpResponseHandler errorResponseHandler;
+-    private RequestConfig requestConfig;
+-
+-    public Marshaller, Input> getMarshaller() {
+-        return marshaller;
+-    }
+-
+-    public ClientExecutionParams withMarshaller(
+-            Marshaller, Input> marshaller) {
+-        this.marshaller = marshaller;
+-        return this;
+-    }
+-
+-    public Input getInput() {
+-        return input;
+-    }
+-
+-    public ClientExecutionParams withInput(Input input) {
+-        this.input = input;
+-        return this;
+-    }
+-
+-    public HttpResponseHandler getResponseHandler() {
+-        return responseHandler;
+-    }
+-
+-    public ClientExecutionParams withResponseHandler(
+-            HttpResponseHandler responseHandler) {
+-        this.responseHandler = responseHandler;
+-        return this;
+-    }
+-
+-    public HttpResponseHandler getErrorResponseHandler() {
+-        return errorResponseHandler;
+-    }
+-
+-    public ClientExecutionParams withErrorResponseHandler(
+-            HttpResponseHandler errorResponseHandler) {
+-        this.errorResponseHandler = errorResponseHandler;
+-        return this;
+-    }
+-
+-    public RequestConfig getRequestConfig() {
+-        return requestConfig;
+-    }
+-
+-    public ClientExecutionParams withRequestConfig(RequestConfig requestConfig) {
+-        this.requestConfig = requestConfig;
+-        return this;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/client/ClientHandlerImpl.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/client/ClientHandlerImpl.java
+--- ./src/main/java/com/amazonaws/client/ClientHandlerImpl.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/client/ClientHandlerImpl.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,238 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.client;
+-
+-import com.amazonaws.AmazonWebServiceRequest;
+-import com.amazonaws.Request;
+-import com.amazonaws.RequestConfig;
+-import com.amazonaws.Response;
+-import com.amazonaws.SdkBaseException;
+-import com.amazonaws.annotation.Immutable;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.annotation.ThreadSafe;
+-import com.amazonaws.auth.AWSCredentialsProvider;
+-import com.amazonaws.handlers.RequestHandler2;
+-import com.amazonaws.http.AmazonHttpClient;
+-import com.amazonaws.http.ExecutionContext;
+-import com.amazonaws.http.HttpResponseHandler;
+-import com.amazonaws.internal.auth.SignerProvider;
+-import com.amazonaws.metrics.AwsSdkMetrics;
+-import com.amazonaws.metrics.RequestMetricCollector;
+-import com.amazonaws.util.AWSRequestMetrics;
+-import com.amazonaws.util.CredentialUtils;
+-
+-import java.net.URI;
+-import java.util.List;
+-
+-/**
+- * Default implementation of {@link ClientHandler}.
+- */
+-@Immutable
+-@ThreadSafe
+-@SdkProtectedApi
+-public class ClientHandlerImpl extends ClientHandler {
+-
+-    private final AWSCredentialsProvider awsCredentialsProvider;
+-    private final SignerProvider signerProvider;
+-    private final URI endpoint;
+-    private final List requestHandler2s;
+-    private final RequestMetricCollector clientLevelMetricCollector;
+-    private final AmazonHttpClient client;
+-
+-    public ClientHandlerImpl(ClientHandlerParams handlerParams) {
+-        this.signerProvider = handlerParams.getClientParams().getSignerProvider();
+-        this.endpoint = handlerParams.getClientParams().getEndpoint();
+-        this.awsCredentialsProvider = handlerParams.getClientParams().getCredentialsProvider();
+-        this.requestHandler2s = handlerParams.getClientParams().getRequestHandlers();
+-        this.clientLevelMetricCollector = handlerParams.getClientParams().getRequestMetricCollector();
+-        this.client = buildHttpClient(handlerParams);
+-    }
+-
+-    private AmazonHttpClient buildHttpClient(ClientHandlerParams handlerParams) {
+-        final AwsSyncClientParams clientParams = handlerParams.getClientParams();
+-        return AmazonHttpClient.builder()
+-                .clientConfiguration(clientParams.getClientConfiguration())
+-                .retryPolicy(clientParams.getRetryPolicy())
+-                .requestMetricCollector(clientParams.getRequestMetricCollector())
+-                .useBrowserCompatibleHostNameVerifier(handlerParams.isDisableStrictHostnameVerification())
+-                .build();
+-    }
+-
+-    @Override
+-    public  Output execute(
+-            ClientExecutionParams executionParams) {
+-        final Input input = executionParams.getInput();
+-        ExecutionContext executionContext = createExecutionContext(
+-                executionParams.getRequestConfig());
+-        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+-        awsRequestMetrics.startEvent(AWSRequestMetrics.Field.ClientExecuteTime);
+-        Request request = null;
+-        Response response = null;
+-
+-        try {
+-            awsRequestMetrics.startEvent(AWSRequestMetrics.Field.RequestMarshallTime);
+-            try {
+-                request = executionParams.getMarshaller().marshall(input);
+-                request.setAWSRequestMetrics(awsRequestMetrics);
+-            } finally {
+-                awsRequestMetrics.endEvent(AWSRequestMetrics.Field.RequestMarshallTime);
+-            }
+-
+-            response = invoke(request,
+-                              executionParams.getRequestConfig(),
+-                              executionContext,
+-                              executionParams.getResponseHandler(),
+-                              executionParams.getErrorResponseHandler());
+-
+-            return response.getAwsResponse();
+-
+-        } finally {
+-
+-            endClientExecution(awsRequestMetrics,
+-                               executionParams.getRequestConfig(),
+-                               request,
+-                               response);
+-        }
+-    }
+-
+-    @Override
+-    public void shutdown() {
+-        client.shutdown();
+-    }
+-
+-    private ExecutionContext createExecutionContext(RequestConfig requestConfig) {
+-        boolean isMetricsEnabled = isRequestMetricsEnabled(requestConfig);
+-        return ExecutionContext.builder()
+-                .withRequestHandler2s(requestHandler2s)
+-                .withUseRequestMetrics(isMetricsEnabled)
+-                .withSignerProvider(signerProvider)
+-                .build();
+-    }
+-
+-    /**
+-     * Returns true if request metric collection is applicable to the given request; false
+-     * otherwise.
+-     */
+-    private boolean isRequestMetricsEnabled(RequestConfig requestConfig) {
+-        return hasRequestMetricsCollector(requestConfig) || isRMCEnabledAtClientOrSdkLevel();
+-    }
+-
+-    private boolean hasRequestMetricsCollector(RequestConfig requestConfig) {
+-        return requestConfig.getRequestMetricsCollector() != null &&
+-               requestConfig.getRequestMetricsCollector().isEnabled();
+-    }
+-
+-    /**
+-     * Returns true if request metric collection is enabled at the service client or AWS SDK level
+-     * request; false otherwise.
+-     */
+-    private boolean isRMCEnabledAtClientOrSdkLevel() {
+-        RequestMetricCollector collector = requestMetricCollector();
+-        return collector != null && collector.isEnabled();
+-    }
+-
+-    /**
+-     * Returns the client specific request metric collector if there is one; or the one at the AWS
+-     * SDK level otherwise.
+-     */
+-    private RequestMetricCollector requestMetricCollector() {
+-        return clientLevelMetricCollector != null ? clientLevelMetricCollector :
+-                AwsSdkMetrics.getRequestMetricCollector();
+-    }
+-
+-
+-    /**
+-     * Runs the {@code beforeMarshalling} method of any {@code RequestHandler2}s associated with
+-     * this client.
+-     *
+-     * @param request the request passed in from the user
+-     * @return The (possibly different) request to marshall
+-     */
+-    @SuppressWarnings("unchecked")
+-    protected final  T beforeMarshalling(T request) {
+-        T local = request;
+-        for (RequestHandler2 handler : requestHandler2s) {
+-            local = (T) handler.beforeMarshalling(local);
+-        }
+-        return local;
+-    }
+-
+-    /**
+-     * Normal invoke with authentication. Credentials are required and may be overriden at the
+-     * request level.
+-     **/
+-    private  Response invoke(Request request,
+-                                                    RequestConfig requestConfig,
+-                                                    ExecutionContext executionContext,
+-                                                    HttpResponseHandler responseHandler,
+-                                                    HttpResponseHandler errorResponseHandler) {
+-
+-        executionContext.setCredentialsProvider(CredentialUtils.getCredentialsProvider(
+-                requestConfig, awsCredentialsProvider));
+-
+-        return doInvoke(request, requestConfig, executionContext, responseHandler,
+-                        errorResponseHandler);
+-    }
+-
+-    /**
+-     * Invoke the request using the http client. Assumes credentials (or lack thereof) have been
+-     * configured in the ExecutionContext beforehand.
+-     **/
+-    private  Response doInvoke(Request request,
+-                                                      RequestConfig requestConfig,
+-                                                      ExecutionContext executionContext,
+-                                                      HttpResponseHandler responseHandler,
+-                                                      HttpResponseHandler errorResponseHandler) {
+-        request.setEndpoint(endpoint);
+-        return client.requestExecutionBuilder()
+-                .request(request)
+-                .requestConfig(requestConfig)
+-                .executionContext(executionContext)
+-                .errorResponseHandler(errorResponseHandler)
+-                .execute(responseHandler);
+-    }
+-
+-    /**
+-     * Convenient method to end the client execution without logging the awsRequestMetrics.
+-     */
+-    private void endClientExecution(AWSRequestMetrics awsRequestMetrics,
+-                                          RequestConfig requestConfig,
+-                                          Request request,
+-                                          Response response) {
+-        if (request != null) {
+-            awsRequestMetrics.endEvent(AWSRequestMetrics.Field.ClientExecuteTime);
+-            awsRequestMetrics.getTimingInfo().endTiming();
+-            RequestMetricCollector metricCollector = findRequestMetricCollector(requestConfig);
+-            metricCollector.collectMetrics(request, response);
+-            awsRequestMetrics.log();
+-        }
+-    }
+-
+-    /**
+-     * Returns the most specific request metric collector, starting from the request level, then
+-     * client level, then finally the AWS SDK level.
+-     */
+-    private RequestMetricCollector findRequestMetricCollector(RequestConfig requestConfig) {
+-        RequestMetricCollector reqLevelMetricsCollector = requestConfig
+-                .getRequestMetricsCollector();
+-        if (reqLevelMetricsCollector != null) {
+-            return reqLevelMetricsCollector;
+-        } else if (clientLevelMetricCollector != null) {
+-            return clientLevelMetricCollector;
+-        } else {
+-            return AwsSdkMetrics.getRequestMetricCollector();
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/client/ClientHandler.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/client/ClientHandler.java
+--- ./src/main/java/com/amazonaws/client/ClientHandler.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/client/ClientHandler.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,42 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.client;
+-
+-import com.amazonaws.AmazonWebServiceRequest;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-/**
+- * Client interface to invoke an API.
+- */
+-@SdkProtectedApi
+-public abstract class ClientHandler {
+-
+-    /**
+-     * Execute's a web service request. Handles marshalling and unmarshalling of data and making the
+-     * underlying HTTP call(s).
+-     *
+-     * @param executionParams Parameters specific to this invocation of an API.
+-     * @param          Input POJO type
+-     * @param         Output POJO type
+-     * @return Unmarshalled output POJO type.
+-     */
+-    public abstract  Output execute(
+-            ClientExecutionParams executionParams);
+-
+-    /**
+-     * Shutdown and release any underlying resources.
+-     */
+-    public abstract void shutdown();
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/client/ClientHandlerParams.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/client/ClientHandlerParams.java
+--- ./src/main/java/com/amazonaws/client/ClientHandlerParams.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/client/ClientHandlerParams.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,54 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.client;
+-
+-import com.amazonaws.annotation.NotThreadSafe;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-/**
+- * Client level parameters for the {@link ClientHandler} implementation.
+- */
+-@SdkProtectedApi
+-@NotThreadSafe
+-public class ClientHandlerParams {
+-
+-    private AwsSyncClientParams clientParams;
+-
+-    /**
+-     * By default we use strict hostname verification for SSL. S3 disables this due to wildcard
+-     * certificates.
+-     */
+-    private boolean disableStrictHostnameVerification = false;
+-
+-    public AwsSyncClientParams getClientParams() {
+-        return clientParams;
+-    }
+-
+-    public ClientHandlerParams withClientParams(AwsSyncClientParams clientParams) {
+-        this.clientParams = clientParams;
+-        return this;
+-    }
+-
+-    public boolean isDisableStrictHostnameVerification() {
+-        return disableStrictHostnameVerification;
+-    }
+-
+-
+-    public ClientHandlerParams withDisableStrictHostnameVerification(
+-            boolean disableStrictHostnameVerification) {
+-        this.disableStrictHostnameVerification = disableStrictHostnameVerification;
+-        return this;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/ClientConfigurationFactory.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/ClientConfigurationFactory.java
+--- ./src/main/java/com/amazonaws/ClientConfigurationFactory.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/ClientConfigurationFactory.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,61 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws;
+-
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-/**
+- * Factory producing predefined {@link ClientConfiguration} instances.
+- * Individual service clients may extend this factory to override
+- * these with service specific configuration values.
+- */
+-@SdkProtectedApi
+-public class ClientConfigurationFactory {
+-
+-    /**
+-     * Builds a {@link ClientConfiguration} instance with the default configuration
+-     * for the current client.  If the {@link SDKGlobalConfiguration#ENABLE_IN_REGION_OPTIMIZED_MODE}
+-     * system property has been set, in-region optimized configuration will be used.
+-     *
+-     * @return constructed {@link ClientConfiguration} instance
+-     */
+-    public final ClientConfiguration getConfig() {
+-        return SDKGlobalConfiguration.isInRegionOptimizedModeEnabled()
+-                ? getInRegionOptimizedConfig() : getDefaultConfig();
+-    }
+-
+-    /**
+-     * Builds a {@link ClientConfiguration} instance with default configuration
+-     * values suitable for most use cases.
+-     *
+-     * @return constructed {@link ClientConfiguration} with standard configuration.
+-     */
+-    protected ClientConfiguration getDefaultConfig() {
+-        return new ClientConfiguration();
+-    }
+-
+-    /**
+-     * Builds a {@link ClientConfiguration} instance with configuration values
+-     * tailored towards clients operating in the same AWS region as the service
+-     * endpoint they call.  Timeouts in in-region optimized configurations are
+-     * generally set much lower than the client standard configuration.
+-     *
+-     * @return constructed {@link ClientConfiguration} with in-region optimized configuration
+-     */
+-    protected ClientConfiguration getInRegionOptimizedConfig() {
+-        return new ClientConfiguration().withConnectionTimeout(1000);
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/ClientConfiguration.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/ClientConfiguration.java
+--- ./src/main/java/com/amazonaws/ClientConfiguration.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/ClientConfiguration.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,2114 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws;
+-
+-import com.amazonaws.annotation.NotThreadSafe;
+-import com.amazonaws.http.IdleConnectionReaper;
+-import com.amazonaws.retry.PredefinedRetryPolicies;
+-import com.amazonaws.retry.RetryPolicy;
+-import com.amazonaws.util.ValidationUtils;
+-import com.amazonaws.util.VersionInfoUtils;
+-import java.net.InetAddress;
+-import java.security.SecureRandom;
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-
+-/**
+- * Client configuration options such as proxy settings, user agent string, max retry attempts, etc.
+- *
+- * @see PredefinedClientConfigurations
+- */
+-@NotThreadSafe
+-public class ClientConfiguration {
+-
+-    /** The default timeout for creating new connections. */
+-    public static final int DEFAULT_CONNECTION_TIMEOUT = 10 * 1000;
+-
+-    /** The default timeout for reading from a connected socket. */
+-    public static final int DEFAULT_SOCKET_TIMEOUT = 50 * 1000;
+-
+-    /**
+-     * The default timeout for a request. This is disabled by default.
+-     */
+-    public static final int DEFAULT_REQUEST_TIMEOUT = 0;
+-
+-    /**
+-     * The default timeout for a request. This is disabled by default.
+-     */
+-    public static final int DEFAULT_CLIENT_EXECUTION_TIMEOUT = 0;
+-
+-    /** The default max connection pool size. */
+-    public static final int DEFAULT_MAX_CONNECTIONS = 50;
+-
+-    /**
+-     * The default on whether to utilize the USE_EXPECT_CONTINUE handshake for operations. Currently
+-     * only honored for PUT operations.
+-     */
+-    public static final boolean DEFAULT_USE_EXPECT_CONTINUE = true;
+-
+-    /** The default HTTP user agent header for AWS Java SDK clients. */
+-    public static final String DEFAULT_USER_AGENT = VersionInfoUtils.getUserAgent();
+-
+-    /**
+-     * Default request retry policy, including the maximum retry count of 3, the default retry
+-     * condition and the default back-off strategy.
+-     *
+-     * @see PredefinedRetryPolicies#DEFAULT
+-     * @see PredefinedRetryPolicies#DYNAMODB_DEFAULT
+-     */
+-    public static final RetryPolicy DEFAULT_RETRY_POLICY = PredefinedRetryPolicies.DEFAULT;
+-
+-    /**
+-     * The default on whether to use the {@link IdleConnectionReaper} to manage stale connections
+-     *
+-     * @see IdleConnectionReaper
+-     */
+-    public static final boolean DEFAULT_USE_REAPER = true;
+-
+-    /**
+-     * The default on whether to use gzip compression.
+-     */
+-    public static final boolean DEFAULT_USE_GZIP = false;
+-
+-    /**
+-     * The default expiration time (in milliseconds) for a connection in the connection pool.
+-     */
+-    public static final long DEFAULT_CONNECTION_TTL = -1;
+-
+-    /**
+-     * The default maximum idle time (in milliseconds) for a connection in the connection pool.
+-     */
+-    public static final long DEFAULT_CONNECTION_MAX_IDLE_MILLIS = 60 * 1000;
+-
+-    /**
+-     * The default time a connection can be idle in the connection pool before it must be validated that it's still open.
+-     */
+-    public static final int DEFAULT_VALIDATE_AFTER_INACTIVITY_MILLIS = 5 * 1000;
+-
+-    /**
+-     * The default on whether to use TCP KeepAlive.
+-     */
+-    public static final boolean DEFAULT_TCP_KEEP_ALIVE = false;
+-
+-    /**
+-     * The default on whether to throttle retries.
+-     */
+-    public static final boolean DEFAULT_THROTTLE_RETRIES = true;
+-
+-    /**
+-     * The default on whether to cache response metadata.
+-     */
+-    public static final boolean DEFAULT_CACHE_RESPONSE_METADATA = true;
+-
+-    /**
+-     * The default response metadata cache size.
+-     */
+-    public static final int DEFAULT_RESPONSE_METADATA_CACHE_SIZE = 50;
+-
+-    public static final int DEFAULT_MAX_CONSECUTIVE_RETRIES_BEFORE_THROTTLING = 100;
+-
+-
+-    /** A prefix to the HTTP user agent header passed with all HTTP requests.  */
+-    private String userAgentPrefix = DEFAULT_USER_AGENT;
+-
+-    /** A suffix to the HTTP user agent header. */
+-    private String userAgentSuffix;
+-
+-    /**
+-     * The maximum number of times that a retryable failed request (ex: a 5xx response from a
+-     * service) will be retried. Or -1 if the user has not explicitly set this value, in which case
+-     * the configured RetryPolicy will be used to control the retry count.
+-     */
+-    private int maxErrorRetry = -1;
+-
+-    /** The retry policy upon failed requests. **/
+-    private RetryPolicy retryPolicy = DEFAULT_RETRY_POLICY;
+-
+-    /** Optionally specifies the local address to bind to */
+-    private InetAddress localAddress;
+-
+-    /**
+-     * The protocol to use when connecting to Amazon Web Services.
+-     * 

+-     * The default configuration is to use HTTPS for all requests for increased security.
+-     */
+-    private Protocol protocol = Protocol.HTTPS;
+-
+-    /** Optionally specifies the proxy host to connect through. */
+-    private String proxyHost = null;
+-
+-    /** Optionally specifies the port on the proxy host to connect through. */
+-    private int proxyPort = -1;
+-
+-    /** Optionally specifies the user name to use when connecting through a proxy. */
+-    private String proxyUsername = null;
+-
+-    /** Optionally specifies the password to use when connecting through a proxy. */
+-    private String proxyPassword = null;
+-
+-    /** Optional Windows domain name for configuring NTLM proxy support. */
+-    private String proxyDomain = null;
+-
+-    /** Optional Windows workstation name for configuring NTLM proxy support. */
+-    private String proxyWorkstation = null;
+-
+-    /** Optional specifies the hosts that should be accessed without going through the proxy. */
+-    private String nonProxyHosts = null;
+-
+-    /** Specifies the proxy authentication methods that should be used, in priority order. */
+-    private List proxyAuthenticationMethods = null;
+-
+-    /**
+-     * Whether to pre-emptively authenticate against a proxy server using basic authentication
+-     */
+-    private boolean preemptiveBasicProxyAuth;
+-
+-    /** The maximum number of open HTTP connections. */
+-    private int maxConnections = DEFAULT_MAX_CONNECTIONS;
+-
+-    /**
+-     * The amount of time to wait (in milliseconds) for data to be transfered over an established,
+-     * open connection before the connection is timed out. A value of 0 means infinity, and is not
+-     * recommended.
+-     */
+-    private int socketTimeout = DEFAULT_SOCKET_TIMEOUT;
+-
+-    /**
+-     * The amount of time to wait (in milliseconds) when initially establishing a connection before
+-     * giving up and timing out. A value of 0 means infinity, and is not recommended.
+-     */
+-    private int connectionTimeout = DEFAULT_CONNECTION_TIMEOUT;
+-
+-    /**
+-     * The amount of time to wait (in milliseconds) for a request to complete before giving up and
+-     * timing out. A value of 0 means infinity. Consider setting this if a harder guarantee is
+-     * required on the maximum amount of time a request will take for non-streaming operations, and
+-     * are willing to spin up a background thread to enforce it.
+-     */
+-    private int requestTimeout = DEFAULT_REQUEST_TIMEOUT;
+-
+-    private int clientExecutionTimeout = DEFAULT_CLIENT_EXECUTION_TIMEOUT;
+-
+-    private boolean throttleRetries = DEFAULT_THROTTLE_RETRIES;
+-
+-    /**
+-     * Optional size hint (in bytes) for the low level TCP send buffer. This is an advanced option
+-     * for advanced users who want to tune low level TCP parameters to try and squeeze out more
+-     * performance.
+-     */
+-    private int socketSendBufferSizeHint = 0;
+-
+-    /**
+-     * Optional size hint (in bytes) for the low level TCP receive buffer. This is an advanced
+-     * option for advanced users who want to tune low level TCP parameters to try and squeeze out
+-     * more performance.
+-     */
+-    private int socketReceiveBufferSizeHint = 0;
+-
+-    /**
+-     * Optional whether to use the {@link IdleConnectionReaper} to manage stale connections. A
+-     * reason for not running the {@link IdleConnectionReaper} can be if running in an environment
+-     * where the modifyThread and modifyThreadGroup permissions are not allowed.
+-     */
+-    private boolean useReaper = DEFAULT_USE_REAPER;
+-
+-    /**
+-     * Optional whether to use gzip compression when making HTTP requests.
+-     */
+-    private boolean useGzip = DEFAULT_USE_GZIP;
+-
+-    /**
+-     * Optional override to control which signature algorithm should be used to sign requests to the
+-     * service. If not explicitly set, the client will determine the algorithm to use by inspecting
+-     * a configuration file baked in to the SDK.
+-     */
+-    private String signerOverride;
+-
+-    /**
+-     * Optional expiration time for a connection in the connection pool. When a connection is
+-     * retrieved from the connection pool, this parameter is checked to see if the connection can be
+-     * reused.
+-     */
+-    private long connectionTTL = DEFAULT_CONNECTION_TTL;
+-
+-    /**
+-     * The maximum idle time for a connection in the connection pool.
+-     */
+-    private long connectionMaxIdleMillis = DEFAULT_CONNECTION_MAX_IDLE_MILLIS;
+-
+-    private int validateAfterInactivityMillis = DEFAULT_VALIDATE_AFTER_INACTIVITY_MILLIS;
+-
+-    /**
+-     * Optional override to enable support for TCP KeepAlive (not to be confused with HTTP
+-     * KeepAlive). TCP KeepAlive can be used to detect misbehaving routers or down servers through
+-     * the use of special, empty-data keep alive packets.
+-     * 

+-     * Actual TCP KeepAlive values (timeout, number of packets, etc) are configured via the
+-     * operating system (sysctl on Linux, and Registry values on Windows).
+-     */
+-    private boolean tcpKeepAlive = DEFAULT_TCP_KEEP_ALIVE;
+-
+-    /**
+-     * Whether or not to cache response metadata.
+-     * 

+-     * Response metadata is typically used for troubleshooting issues with AWS support staff when
+-     * services aren't acting as expected.
+-     * 

+-     * 

+-     * While this feature is useful for debugging it adds overhead and disabling it may
+-     * be desired in high throughput applications.
+-     * 

+-     */
+-    private boolean cacheResponseMetadata = DEFAULT_CACHE_RESPONSE_METADATA;
+-
+-    /**
+-     * Size of the response metadata cache, if it is enabled.
+-     * 

+-     * Response metadata is typically used for troubleshooting issues with AWS support staff when
+-     * services aren't acting as expected.
+-     */
+-    private int responseMetadataCacheSize = DEFAULT_RESPONSE_METADATA_CACHE_SIZE;
+-
+-    /**
+-     * The DNS Resolver to resolve IP addresses of Amazon Web Services.
+-     */
+-    private DnsResolver dnsResolver = new SystemDefaultDnsResolver();
+-
+-    /**
+-     * An instance of {@link SecureRandom} configured by the user; or the JDK default will be used
+-     * if it is set to null or not explicitly configured.
+-     */
+-    private SecureRandom secureRandom;
+-
+-    /**
+-     * Headers to be added to all requests
+-     */
+-    private Map headers = new HashMap();
+-
+-    /**
+-     * Optional override to enable/disable support for HTTP/1.1 handshake utilizing EXPECT:
+-     * 100-Continue. The default value is true.
+-     * 

+-     * The detail of HTTP Expect Continue is defined at
+-     *  Use of the 100
+-     * (Continue) Status. Setting this as false will reduce latency when you want to send small
+-     * size of payload. It is highly recommended to use the default value if you want to transfer a
+-     * large amount of data to the server, such as uploading a big file to S3 bucket.
+-     */
+-    private boolean useExpectContinue = DEFAULT_USE_EXPECT_CONTINUE;
+-
+-    /**
+-     * The maximum number of throttled retries if the initial request
+-     * fails.
+-     */
+-    private int maxConsecutiveRetriesBeforeThrottling = DEFAULT_MAX_CONSECUTIVE_RETRIES_BEFORE_THROTTLING;
+-
+-    /**
+-     * Can be used to specify custom specific Apache HTTP client configurations.
+-     */
+-    private final ApacheHttpClientConfig apacheHttpClientConfig;
+-
+-    public ClientConfiguration() {
+-        apacheHttpClientConfig = new ApacheHttpClientConfig();
+-    }
+-
+-    public ClientConfiguration(ClientConfiguration other) {
+-        this.connectionTimeout = other.getConnectionTimeout();
+-        this.maxConnections = other.getMaxConnections();
+-        this.maxErrorRetry = other.getMaxErrorRetry();
+-        this.retryPolicy = other.getRetryPolicy();
+-        this.throttleRetries = other.useThrottledRetries();
+-        this.localAddress = other.getLocalAddress();
+-        this.protocol = other.getProtocol();
+-        this.proxyDomain = other.getProxyDomain();
+-        this.proxyHost = other.getProxyHost();
+-        this.proxyPassword = other.getProxyPassword();
+-        this.proxyPort = other.getProxyPort();
+-        this.proxyUsername = other.getProxyUsername();
+-        this.proxyWorkstation = other.getProxyWorkstation();
+-        this.nonProxyHosts = other.getNonProxyHosts();
+-        this.proxyAuthenticationMethods = other.getProxyAuthenticationMethods();
+-        this.preemptiveBasicProxyAuth = other.isPreemptiveBasicProxyAuth();
+-        this.socketTimeout = other.getSocketTimeout();
+-        this.requestTimeout = other.getRequestTimeout();
+-        this.clientExecutionTimeout = other.getClientExecutionTimeout();
+-        this.userAgentPrefix = other.getUserAgentPrefix();
+-        this.userAgentSuffix = other.getUserAgentSuffix();
+-        this.useReaper = other.useReaper();
+-        this.useGzip = other.useGzip();
+-        this.socketSendBufferSizeHint = other.getSocketBufferSizeHints()[0];
+-        this.socketReceiveBufferSizeHint = other.getSocketBufferSizeHints()[1];
+-        this.signerOverride = other.getSignerOverride();
+-        this.responseMetadataCacheSize = other.getResponseMetadataCacheSize();
+-        this.dnsResolver = other.getDnsResolver();
+-        this.useExpectContinue = other.isUseExpectContinue();
+-        this.apacheHttpClientConfig = new ApacheHttpClientConfig(other.getApacheHttpClientConfig());
+-        this.cacheResponseMetadata = other.getCacheResponseMetadata();
+-        this.connectionTTL = other.getConnectionTTL();
+-        this.connectionMaxIdleMillis = other.getConnectionMaxIdleMillis();
+-        this.validateAfterInactivityMillis = other.getValidateAfterInactivityMillis();
+-        this.tcpKeepAlive = other.useTcpKeepAlive();
+-        this.secureRandom = other.getSecureRandom();
+-        this.headers.clear();
+-        this.headers.putAll(other.getHeaders());
+-        this.maxConsecutiveRetriesBeforeThrottling = other.getMaxConsecutiveRetriesBeforeThrottling();
+-    }
+-
+-    /**
+-     * Returns the protocol (HTTP or HTTPS) to use when connecting to Amazon Web Services.
+-     * 

+-     * The default configuration is to use HTTPS for all requests for increased security.
+-     * 

+-     * Individual clients can also override this setting by explicitly including the protocol as
+-     * part of the endpoint URL when calling {@link AmazonWebServiceClient#setEndpoint(String)}.
+-     *
+-     * @return The protocol to use when connecting to Amazon Web Services.
+-     */
+-    public Protocol getProtocol() {
+-        return protocol;
+-    }
+-
+-    /**
+-     * Sets the protocol (i.e. HTTP or HTTPS) to use when connecting to Amazon Web Services.
+-     * 

+-     * The default configuration is to use HTTPS for all requests for increased security.
+-     * 

+-     * Individual clients can also override this setting by explicitly including the protocol as
+-     * part of the endpoint URL when calling {@link AmazonWebServiceClient#setEndpoint(String)}.
+-     *
+-     * @param protocol
+-     *            The protocol to use when connecting to Amazon Web Services.
+-     */
+-    public void setProtocol(Protocol protocol) {
+-        this.protocol = protocol;
+-    }
+-
+-    /**
+-     * Sets the protocol (i.e. HTTP or HTTPS) to use when connecting to Amazon Web Services, and
+-     * returns the updated ClientConfiguration object so that additional calls may be chained
+-     * together.
+-     * 

+-     * The default configuration is to use HTTPS for all requests for increased security.
+-     * 

+-     * Individual clients can also override this setting by explicitly including the protocol as
+-     * part of the endpoint URL when calling {@link AmazonWebServiceClient#setEndpoint(String)}.
+-     *
+-     * @param protocol
+-     *            The protocol to use when connecting to Amazon Web Services.
+-     * @return The updated ClientConfiguration object with the new max HTTP connections setting.
+-     */
+-    public ClientConfiguration withProtocol(Protocol protocol) {
+-        setProtocol(protocol);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the maximum number of allowed open HTTP connections.
+-     *
+-     * @return The maximum number of allowed open HTTP connections.
+-     */
+-    public int getMaxConnections() {
+-        return maxConnections;
+-    }
+-
+-    /**
+-     * Sets the maximum number of allowed open HTTP connections.
+-     *
+-     * @param maxConnections
+-     *            The maximum number of allowed open HTTP connections.
+-     */
+-    public void setMaxConnections(int maxConnections) {
+-        this.maxConnections = maxConnections;
+-    }
+-
+-    /**
+-     * Sets the maximum number of allowed open HTTP connections and returns the updated
+-     * ClientConfiguration object.
+-     *
+-     * @param maxConnections
+-     *            The maximum number of allowed open HTTP connections.
+-     * @return The updated ClientConfiguration object with the new max HTTP connections setting.
+-     */
+-    public ClientConfiguration withMaxConnections(int maxConnections) {
+-        setMaxConnections(maxConnections);
+-        return this;
+-    }
+-
+-    /**
+-     * @deprecated Replaced by {@link #getUserAgentPrefix()} and {@link #getUserAgentSuffix()}
+-     * @return The user agent string to use when sending requests.
+-     */
+-    @Deprecated
+-    public String getUserAgent() {
+-        return getUserAgentPrefix();
+-    }
+-
+-    /**
+-     * @deprecated Replaced by {@link #setUserAgentPrefix(String)} and {@link #setUserAgentSuffix(String)}
+-     * @param userAgent
+-     *            The user agent string to use when sending requests.
+-     */
+-    @Deprecated
+-    public void setUserAgent(String userAgent) {
+-        setUserAgentPrefix(userAgent);
+-    }
+-
+-    /**
+-     * @deprecated Replaced by {@link #withUserAgentPrefix(String)} and {@link #withUserAgentSuffix(String)}
+-     * @param userAgent
+-     *            The user agent string to use when sending requests.
+-     * @return The updated ClientConfiguration object.
+-     */
+-    @Deprecated
+-    public ClientConfiguration withUserAgent(String userAgent) {
+-        return withUserAgentPrefix(userAgent);
+-    }
+-
+-    /**
+-     * Returns the HTTP user agent header prefix to send with all requests.
+-     *
+-     * @return The user agent string prefix to use when sending requests.
+-     */
+-    public String getUserAgentPrefix() {
+-        return userAgentPrefix;
+-    }
+-
+-    /**
+-     * Sets the HTTP user agent prefix to send with all requests.
+-     *
+-     * @param prefix
+-     *            The string to prefix to user agent to use when sending requests.
+-     */
+-    public void setUserAgentPrefix(String prefix) {
+-        this.userAgentPrefix = prefix;
+-    }
+-
+-    /**
+-     * Sets the HTTP user agent prefix header used in requests and returns the updated ClientConfiguration
+-     * object.
+-     *
+-     * @param prefix
+-     *            The string to prefix to user agent to use when sending requests.
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withUserAgentPrefix(String prefix) {
+-        setUserAgentPrefix(prefix);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the HTTP user agent header suffix to add to the end of the user agent header on all requests.
+-     *
+-     * @return The user agent string suffix to use when sending requests.
+-     */
+-    public String getUserAgentSuffix() {
+-        return userAgentSuffix;
+-    }
+-
+-    /**
+-     * Sets the HTTP user agent suffix to send with all requests.
+-     *
+-     * @param suffix
+-     *            The string to suffix to user agent to use when sending requests.
+-     */
+-    public void setUserAgentSuffix(String suffix) {
+-        this.userAgentSuffix = suffix;
+-    }
+-
+-    /**
+-     * Sets the HTTP user agent suffix header used in requests and returns the updated ClientConfiguration
+-     * object.
+-     *
+-     * @param suffix
+-     *            The string to suffix to user agent to use when sending requests.
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withUserAgentSuffix(String suffix) {
+-        setUserAgentSuffix(suffix);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the optional local address the client will bind to.
+-     *
+-     * @return The local address the client will bind to.
+-     */
+-    public InetAddress getLocalAddress() {
+-        return localAddress;
+-    }
+-
+-    /**
+-     * Sets the optional local address the client will bind to.
+-     *
+-     * @param localAddress
+-     *            The local address the client will bind to.
+-     */
+-    public void setLocalAddress(InetAddress localAddress) {
+-        this.localAddress = localAddress;
+-    }
+-
+-    /**
+-     * Sets the optional local address the client will bind to and returns the updated
+-     * ClientConfiguration object.
+-     *
+-     * @param localAddress
+-     *            The local address the client will bind to.
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withLocalAddress(InetAddress localAddress) {
+-        setLocalAddress(localAddress);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the value for the given system property.
+-     */
+-    private String getSystemProperty(String property) {
+-        return System.getProperty(property);
+-    }
+-
+-    /**
+-     * Returns the Java system property for proxy host depending on
+-     * {@link #getProtocol()}: i.e. if protocol is https, returns
+-     * the value of the system property https.proxyHost, otherwise
+-     * returns value of http.proxyHost.
+-     */
+-    private String getProxyHostProperty() {
+-        return getProtocol() == Protocol.HTTPS
+-                ? getSystemProperty("https.proxyHost")
+-                : getSystemProperty("http.proxyHost");
+-    }
+-
+-    /**
+-     * Returns the optional proxy host the client will connect
+-     * through.  Returns either the proxyHost set on this object, or
+-     * if not provided, checks the value of the Java system property
+-     * for proxy host according to {@link #getProtocol()}: i.e. if
+-     * protocol is https, returns the value of the system property
+-     * https.proxyHost, otherwise returns value of http.proxyHost.
+-     *
+-     * @return The proxy host the client will connect through.
+-     */
+-    public String getProxyHost() {
+-        return (proxyHost != null) ? proxyHost : getProxyHostProperty();
+-    }
+-
+-    /**
+-     * Sets the optional proxy host the client will connect through.
+-     *
+-     * @param proxyHost
+-     *            The proxy host the client will connect through.
+-     */
+-    public void setProxyHost(String proxyHost) {
+-        this.proxyHost = proxyHost;
+-    }
+-
+-    /**
+-     * Sets the optional proxy host the client will connect through and returns the updated
+-     * ClientConfiguration object.
+-     *
+-     * @param proxyHost
+-     *            The proxy host the client will connect through.
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withProxyHost(String proxyHost) {
+-        setProxyHost(proxyHost);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the Java system property for proxy port depending on
+-     * {@link #getProtocol()}: i.e. if protocol is https, returns
+-     * the value of the system property https.proxyPort, otherwise
+-     * returns value of http.proxyPort.  Defaults to {@link this.proxyPort}
+-     * if the system property is not set with a valid port number.
+-     */
+-    private int getProxyPortProperty() {
+-        final String proxyPortString = (getProtocol() == Protocol.HTTPS)
+-                    ? getSystemProperty("https.proxyPort")
+-                    : getSystemProperty("http.proxyPort");
+-        try {
+-            return Integer.parseInt(proxyPortString);
+-        } catch (NumberFormatException e) {
+-            return proxyPort;
+-        }
+-    }
+-
+-    /**
+-     * Returns the optional proxy port the client will connect
+-     * through.  Returns either the proxyPort set on this object, or
+-     * if not provided, checks the value of the Java system property
+-     * for proxy port according to {@link #getProtocol()}: i.e. if
+-     * protocol is https, returns the value of the system property
+-     * https.proxyPort, otherwise returns value of http.proxyPort.
+-     *
+-     * @return The proxy port the client will connect through.
+-     */
+-    public int getProxyPort() {
+-        return (proxyPort >= 0) ? proxyPort : getProxyPortProperty();
+-    }
+-
+-    /**
+-     * Sets the optional proxy port the client will connect through.
+-     *
+-     * @param proxyPort
+-     *            The proxy port the client will connect through.
+-     */
+-    public void setProxyPort(int proxyPort) {
+-        this.proxyPort = proxyPort;
+-    }
+-
+-    /**
+-     * Sets the optional proxy port the client will connect through and returns the updated
+-     * ClientConfiguration object.
+-     *
+-     * @param proxyPort
+-     *            The proxy port the client will connect through.
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withProxyPort(int proxyPort) {
+-        setProxyPort(proxyPort);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the Java system property for proxy user name depending on
+-     * {@link #getProtocol()}: i.e. if protocol is https, returns
+-     * the value of the system property https.proxyUser, otherwise
+-     * returns value of http.proxyUser.
+-     */
+-    private String getProxyUsernameProperty() {
+-        return (getProtocol() == Protocol.HTTPS)
+-                ? getSystemProperty("https.proxyUser")
+-                : getSystemProperty("http.proxyUser");
+-    }
+-
+-    /**
+-     * Returns the optional proxy user name to use if connecting
+-     * through a proxy.  Returns either the proxyUsername set on this
+-     * object, or if not provided, checks the value of the Java system
+-     * property for proxy user name according to {@link #getProtocol()}:
+-     * i.e. if protocol is https, returns the value of the system
+-     * property https.proxyUser, otherwise returns value of
+-     * http.proxyUser.
+-     *
+-     * @return The optional proxy user name the configured client will use if connecting through a
+-     *         proxy.
+-     */
+-    public String getProxyUsername() {
+-        return (proxyUsername != null) ? proxyUsername : getProxyUsernameProperty();
+-    }
+-
+-    /**
+-     * Sets the optional proxy user name to use if connecting through a proxy.
+-     *
+-     * @param proxyUsername
+-     *            The proxy user name to use if connecting through a proxy.
+-     */
+-    public void setProxyUsername(String proxyUsername) {
+-        this.proxyUsername = proxyUsername;
+-    }
+-
+-    /**
+-     * Sets the optional proxy user name and returns the updated ClientConfiguration object.
+-     *
+-     * @param proxyUsername
+-     *            The proxy user name to use if connecting through a proxy.
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withProxyUsername(String proxyUsername) {
+-        setProxyUsername(proxyUsername);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the Java system property for proxy password depending on
+-     * {@link #getProtocol()}: i.e. if protocol is https, returns
+-     * the value of the system property https.proxyPassword, otherwise
+-     * returns value of http.proxyPassword.
+-     */
+-    private String getProxyPasswordProperty() {
+-        return (getProtocol() == Protocol.HTTPS)
+-                ? getSystemProperty("https.proxyPassword")
+-                : getSystemProperty("http.proxyPassword");
+-    }
+-
+-    /**
+-     * Returns the optional proxy password to use if connecting
+-     * through a proxy.  Returns either the proxyPassword set on this
+-     * object, or if not provided, checks the value of the Java system
+-     * property for proxy password according to {@link #getProtocol()}:
+-     * i.e. if protocol is https, returns the value of the system
+-     * property https.proxyPassword, otherwise returns value of
+-     * http.proxyPassword.
+-     *
+-     * @return The password to use when connecting through a proxy.
+-     */
+-    public String getProxyPassword() {
+-        return (proxyPassword != null) ? proxyPassword : getProxyPasswordProperty();
+-    }
+-
+-    /**
+-     * Sets the optional proxy password to use when connecting through a proxy.
+-     *
+-     * @param proxyPassword
+-     *            The password to use when connecting through a proxy.
+-     */
+-    public void setProxyPassword(String proxyPassword) {
+-        this.proxyPassword = proxyPassword;
+-    }
+-
+-    /**
+-     * Sets the optional proxy password to use when connecting through a proxy, and returns the
+-     * updated ClientConfiguration object.
+-     *
+-     * @param proxyPassword
+-     *            The password to use when connecting through a proxy.
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withProxyPassword(String proxyPassword) {
+-        setProxyPassword(proxyPassword);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the optional Windows domain name for configuring an NTLM proxy. If you aren't using a
+-     * Windows NTLM proxy, you do not need to set this field.
+-     *
+-     * @return The optional Windows domain name for configuring an NTLM proxy.
+-     */
+-    public String getProxyDomain() {
+-        return proxyDomain;
+-    }
+-
+-    /**
+-     * Sets the optional Windows domain name for configuration an NTLM proxy. If you aren't using a
+-     * Windows NTLM proxy, you do not need to set this field.
+-     *
+-     * @param proxyDomain
+-     *            The optional Windows domain name for configuring an NTLM proxy.
+-     */
+-    public void setProxyDomain(String proxyDomain) {
+-        this.proxyDomain = proxyDomain;
+-    }
+-
+-    /**
+-     * Sets the optional Windows domain name for configuration an NTLM proxy and returns a reference
+-     * to this updated ClientConfiguration object so that additional method calls can be chained
+-     * together. If you aren't using a Windows NTLM proxy, you do not need to set this field.
+-     *
+-     * @param proxyDomain
+-     *            The optional Windows domain name for configuring an NTLM proxy.
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withProxyDomain(String proxyDomain) {
+-        setProxyDomain(proxyDomain);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the optional Windows workstation name for configuring NTLM proxy support. If you
+-     * aren't using a Windows NTLM proxy, you do not need to set this field.
+-     *
+-     * @return The optional Windows workstation name for configuring NTLM proxy support.
+-     */
+-    public String getProxyWorkstation() {
+-        return proxyWorkstation;
+-    }
+-
+-    /**
+-     * Sets the optional Windows workstation name for configuring NTLM proxy support. If you aren't
+-     * using a Windows NTLM proxy, you do not need to set this field.
+-     *
+-     * @param proxyWorkstation
+-     *            The optional Windows workstation name for configuring NTLM proxy support.
+-     */
+-    public void setProxyWorkstation(String proxyWorkstation) {
+-        this.proxyWorkstation = proxyWorkstation;
+-    }
+-
+-    /**
+-     * Sets the optional Windows workstation name for configuring NTLM proxy support, and returns
+-     * the updated ClientConfiguration object so that additional method calls can be chained
+-     * together. If you aren't using a Windows NTLM proxy, you do not need to set this field.
+-     *
+-     * @param proxyWorkstation
+-     *            The optional Windows workstation name for configuring NTLM proxy support.
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withProxyWorkstation(String proxyWorkstation) {
+-        setProxyWorkstation(proxyWorkstation);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the Java system property for nonProxyHosts. We still honor this property even
+-     * {@link #getProtocol()} is https, see http://docs.oracle.com/javase/7/docs/api/java/net/doc-files/net-properties.html.
+-     */
+-    private String getNonProxyHostsProperty() {
+-        return getSystemProperty("http.nonProxyHosts");
+-    }
+-
+-    /**
+-     * Returns the optional hosts the client will access without going
+-     * through the proxy. Returns either the nonProxyHosts set on this
+-     * object, or if not provided, checks the value of the Java system property
+-     * for nonProxyHosts according to {@link #getProtocol()}: i.e. if
+-     * protocol is https, returns null, otherwise returns value of http.nonProxyHosts.
+-     *
+-     * @return The hosts the client will connect through bypassing the proxy.
+-     */
+-    public String getNonProxyHosts() {
+-        return nonProxyHosts != null ? nonProxyHosts : getNonProxyHostsProperty();
+-    }
+-
+-    /**
+-     * Set the optional hosts the client will access without going
+-     * through the proxy.
+-     *
+-     * @param nonProxyHosts
+-     *            The hosts the client will access without going through the proxy.
+-     */
+-    public void setNonProxyHosts(String nonProxyHosts) {
+-        this.nonProxyHosts = nonProxyHosts;
+-    }
+-
+-    /**
+-     * Set the optional hosts the client will access without going
+-     * through the proxy.
+-     *
+-     * @param nonProxyHosts
+-     *            The hosts the client will access without going through the proxy.
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withNonProxyHosts(String nonProxyHosts) {
+-        setNonProxyHosts(nonProxyHosts);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the list of authentication methods that should be used when authenticating against an HTTP proxy, in the order they
+-     * should be attempted.
+-     *
+-     * @return An unmodifiable view of the proxy authentication methods that should be attempted, in order.
+-     */
+-    public List getProxyAuthenticationMethods() {
+-        return this.proxyAuthenticationMethods;
+-    }
+-
+-    /**
+-     * Configure the list of authentication methods that should be used when authenticating against an HTTP proxy, in the order
+-     * they should be attempted. Any methods not included in this list will not be attempted. If one authentication method fails,
+-     * the next method will be attempted, until a working method is found (or all methods have been attempted).
+-     *
+-     * 
Setting this value to null indicates using the default behavior, which is to try all authentication methods in an
+-     * unspecified order.

+-     *
+-     * @param proxyAuthenticationMethods The proxy authentication methods to be attempted, in the order they should be attempted.
+-     */
+-    public void setProxyAuthenticationMethods(List proxyAuthenticationMethods) {
+-        if(proxyAuthenticationMethods == null) {
+-            this.proxyAuthenticationMethods = null;
+-        } else {
+-            ValidationUtils.assertNotEmpty(proxyAuthenticationMethods, "proxyAuthenticationMethods");
+-            this.proxyAuthenticationMethods =
+-                    Collections.unmodifiableList(new ArrayList(proxyAuthenticationMethods));
+-        }
+-    }
+-
+-    /**
+-     * Configure the list of authentication methods that should be used when authenticating against an HTTP proxy, in the order
+-     * they should be attempted. Any methods not included in this list will not be attempted. If one authentication method fails,
+-     * the next method will be attempted, until a working method is found (or all methods have been attempted).
+-     *
+-     * 
Setting this value to null indicates using the default behavior, which is to try all authentication methods in an
+-     * unspecified order.

+-     *
+-     * @param proxyAuthenticationMethods The proxy authentication methods to be attempted, in the order they should be attempted.
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withProxyAuthenticationMethods(List proxyAuthenticationMethods) {
+-        setProxyAuthenticationMethods(proxyAuthenticationMethods);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the retry policy upon failed requests.
+-     *
+-     * @return The retry policy upon failed requests.
+-     */
+-    public RetryPolicy getRetryPolicy() {
+-        return retryPolicy;
+-    }
+-
+-    /**
+-     * Sets the retry policy upon failed requests. User could specify whether the RetryPolicy should
+-     * honor maxErrorRetry set by {@link #setMaxErrorRetry(int)}.
+-     *
+-     * @param retryPolicy
+-     *            The retry policy upon failed requests.
+-     */
+-    public void setRetryPolicy(RetryPolicy retryPolicy) {
+-        this.retryPolicy = retryPolicy;
+-    }
+-
+-    /**
+-     * Sets the retry policy upon failed requests, and returns the updated ClientConfiguration
+-     * object. User could specify whether the RetryPolicy should honor maxErrorRetry set by
+-     * {@link #setMaxErrorRetry(int)}
+-     *
+-     * @param retryPolicy
+-     *            The retry policy upon failed requests.
+-     */
+-    public ClientConfiguration withRetryPolicy(RetryPolicy retryPolicy) {
+-        setRetryPolicy(retryPolicy);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the maximum number of retry attempts for failed retryable requests (ex: 5xx error
+-     * responses from a service). This method returns -1 before a maxErrorRetry value is explicitly
+-     * set by {@link #setMaxErrorRetry(int)}, in which case the configured RetryPolicy will be used
+-     * to control the retry count.
+-     *
+-     * @return The maximum number of retry attempts for failed retryable requests, or -1 if
+-     *         maxErrorRetry has not been set by {@link #setMaxErrorRetry(int)}.
+-     */
+-    public int getMaxErrorRetry() {
+-        return maxErrorRetry;
+-    }
+-
+-    /**
+-     * Sets the maximum number of retry attempts for failed retryable requests (ex: 5xx error
+-     * responses from services).
+-     *
+-     * @param maxErrorRetry
+-     *            The maximum number of retry attempts for failed retryable requests. This value
+-     *            should not be negative.
+-     */
+-    public void setMaxErrorRetry(int maxErrorRetry) {
+-        if (maxErrorRetry < 0) {
+-            throw new IllegalArgumentException("maxErrorRetry shoud be non-negative");
+-        }
+-        this.maxErrorRetry = maxErrorRetry;
+-    }
+-
+-    /**
+-     * Sets the maximum number of retry attempts for failed retryable requests (ex: 5xx error
+-     * responses from services), and returns the updated ClientConfiguration object.
+-     *
+-     * @param maxErrorRetry
+-     *            The maximum number of retry attempts for failed retryable requests. This value
+-     *            should not be negative.
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withMaxErrorRetry(int maxErrorRetry) {
+-        setMaxErrorRetry(maxErrorRetry);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the amount of time to wait (in milliseconds) for data to be transfered over an
+-     * established, open connection before the connection times out and is closed. A value of 0
+-     * means infinity, and isn't recommended.
+-     *
+-     * @return The amount of time to wait (in milliseconds) for data to be transfered over an
+-     *         established, open connection before the connection times out and is closed.
+-     */
+-    public int getSocketTimeout() {
+-        return socketTimeout;
+-    }
+-
+-    /**
+-     * Sets the amount of time to wait (in milliseconds) for data to be transfered over an
+-     * established, open connection before the connection times out and is closed. A value of 0
+-     * means infinity, and isn't recommended.
+-     *
+-     * @param socketTimeout
+-     *            The amount of time to wait (in milliseconds) for data to be transfered over an
+-     *            established, open connection before the connection times out and is closed.
+-     */
+-    public void setSocketTimeout(int socketTimeout) {
+-        this.socketTimeout = socketTimeout;
+-    }
+-
+-    /**
+-     * Sets the amount of time to wait (in milliseconds) for data to be transfered over an
+-     * established, open connection before the connection times out and is closed, and returns the
+-     * updated ClientConfiguration object so that additional method calls may be chained together.
+-     *
+-     * @param socketTimeout
+-     *            The amount of time to wait (in milliseconds) for data to be transfered over an
+-     *            established, open connection before the connection times out and is closed.
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withSocketTimeout(int socketTimeout) {
+-        setSocketTimeout(socketTimeout);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the amount of time to wait (in milliseconds) when initially establishing a connection
+-     * before giving up and timing out. A value of 0 means infinity, and is not recommended.
+-     *
+-     * @return The amount of time to wait (in milliseconds) when initially establishing a connection
+-     *         before giving up and timing out.
+-     */
+-    public int getConnectionTimeout() {
+-        return connectionTimeout;
+-    }
+-
+-    /**
+-     * Sets the amount of time to wait (in milliseconds) when initially establishing a connection
+-     * before giving up and timing out. A value of 0 means infinity, and is not recommended.
+-     *
+-     * @param connectionTimeout
+-     *            The amount of time to wait (in milliseconds) when initially establishing a
+-     *            connection before giving up and timing out.
+-     */
+-    public void setConnectionTimeout(int connectionTimeout) {
+-        this.connectionTimeout = connectionTimeout;
+-    }
+-
+-    /**
+-     * Sets the amount of time to wait (in milliseconds) when initially establishing a connection
+-     * before giving up and timing out, and returns the updated ClientConfiguration object so that
+-     * additional method calls may be chained together.
+-     *
+-     * @param connectionTimeout
+-     *            the amount of time to wait (in milliseconds) when initially establishing a
+-     *            connection before giving up and timing out.
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withConnectionTimeout(int connectionTimeout) {
+-        setConnectionTimeout(connectionTimeout);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the amount of time to wait (in milliseconds) for the request to complete before
+-     * giving up and timing out. A non-positive value disables this feature.
+-     * 

+-     * This feature requires buffering the entire response (for non-streaming APIs) into memory to
+-     * enforce a hard timeout when reading the response. For APIs that return large responses this
+-     * could be expensive.
+-     * 

+-     * 

+-     * The request timeout feature doesn't have strict guarantees on how quickly a request is
+-     * aborted when the timeout is breached. The typical case aborts the request within a few
+-     * milliseconds but there may occasionally be requests that don't get aborted until several
+-     * seconds after the timer has been breached. Because of this, the request timeout feature
+-     * should not be used when absolute precision is needed.
+-     * 

+-     * Note: This feature is not compatible with Java 1.6.
+-     * 

+-     *
+-     * @return The amount of time to wait (in milliseconds) for the request to complete before
+-     *         giving up and timing out.
+-     * @see {@link ClientConfiguration#setClientExecutionTimeout(int)} to enforce a timeout across
+-     *      all retries
+-     */
+-    public int getRequestTimeout() {
+-        return requestTimeout;
+-    }
+-
+-    /**
+-     * Sets the amount of time to wait (in milliseconds) for the request to complete before giving
+-     * up and timing out. A non-positive value disables this feature.
+-     * 

+-     * This feature requires buffering the entire response (for non-streaming APIs) into memory to
+-     * enforce a hard timeout when reading the response. For APIs that return large responses this
+-     * could be expensive.
+-     * 

+-     * 

+-     * The request timeout feature doesn't have strict guarantees on how quickly a request is
+-     * aborted when the timeout is breached. The typical case aborts the request within a few
+-     * milliseconds but there may occasionally be requests that don't get aborted until several
+-     * seconds after the timer has been breached. Because of this, the request timeout feature
+-     * should not be used when absolute precision is needed.
+-     * 

+-     * 

+-     * Note: This feature is not compatible with Java 1.6.
+-     * 

+-     *
+-     * @param requestTimeout
+-     *            The amount of time to wait (in milliseconds) for the request to complete before
+-     *            giving up and timing out.
+-     * @see {@link ClientConfiguration#setClientExecutionTimeout(int)} to enforce a timeout across
+-     *      all retries
+-     */
+-    public void setRequestTimeout(int requestTimeout) {
+-        this.requestTimeout = requestTimeout;
+-    }
+-
+-    /**
+-     * Sets the amount of time to wait (in milliseconds) for the request to complete before giving
+-     * up and timing out. A non-positive value disables this feature. Returns the updated
+-     * ClientConfiguration object so that additional method calls may be chained together.
+-     * 

+-     * This feature requires buffering the entire response (for non-streaming APIs) into memory to
+-     * enforce a hard timeout when reading the response. For APIs that return large responses this
+-     * could be expensive.
+-     * 

+-     * 

+-     * The request timeout feature doesn't have strict guarantees on how quickly a request is
+-     * aborted when the timeout is breached. The typical case aborts the request within a few
+-     * milliseconds but there may occasionally be requests that don't get aborted until several
+-     * seconds after the timer has been breached. Because of this, the request timeout feature
+-     * should not be used when absolute precision is needed.
+-     * 

+-     * 

+-     * Note: This feature is not compatible with Java 1.6.
+-     * 

+-     *
+-     * @param requestTimeout
+-     *            The amount of time to wait (in milliseconds) for the request to complete before
+-     *            giving up and timing out.
+-     * @return The updated ClientConfiguration object.
+-     * @see {@link ClientConfiguration#setClientExecutionTimeout(int)} to enforce a timeout across
+-     *      all retries
+-     */
+-    public ClientConfiguration withRequestTimeout(int requestTimeout) {
+-        setRequestTimeout(requestTimeout);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the amount of time (in milliseconds) to allow the client to complete the execution of
+-     * an API call. This timeout covers the entire client execution except for marshalling. This
+-     * includes request handler execution, all HTTP request including retries, unmarshalling, etc.
+-     * 

+-     * This feature requires buffering the entire response (for non-streaming APIs) into memory to
+-     * enforce a hard timeout when reading the response. For APIs that return large responses this
+-     * could be expensive.
+-     * 

+-     * 

+-     * The client execution timeout feature doesn't have strict guarantees on how quickly a request
+-     * is aborted when the timeout is breached. The typical case aborts the request within a few
+-     * milliseconds but there may occasionally be requests that don't get aborted until several
+-     * seconds after the timer has been breached. Because of this, the client execution timeout
+-     * feature should not be used when absolute precision is needed.
+-     * 

+-     * 

+-     * This may be used together with {@link ClientConfiguration#setRequestTimeout(int)} to enforce
+-     * both a timeout on each individual HTTP request (i.e. each retry) and the total time spent on
+-     * all requests across retries (i.e. the 'client execution' time). A non-positive value disables
+-     * this feature.
+-     * 

+-     * 

+-     * Note: This feature is not compatible with Java 1.6.
+-     * 

+-     *
+-     * @return The amount of time (in milliseconds) to allow the client to complete the execution of
+-     *         an API call.
+-     * @see {@link ClientConfiguration#setRequestTimeout(int)} to enforce a timeout per HTTP request
+-     */
+-    public int getClientExecutionTimeout() {
+-        return this.clientExecutionTimeout;
+-    }
+-
+-    /**
+-     * Sets the amount of time (in milliseconds) to allow the client to complete the execution of
+-     * an API call. This timeout covers the entire client execution except for marshalling. This
+-     * includes request handler execution, all HTTP request including retries, unmarshalling, etc.
+-     * 

+-     * This feature requires buffering the entire response (for non-streaming APIs) into memory to
+-     * enforce a hard timeout when reading the response. For APIs that return large responses this
+-     * could be expensive.
+-     * 

+-     * 

+-     * The client execution timeout feature doesn't have strict guarantees on how quickly a request
+-     * is aborted when the timeout is breached. The typical case aborts the request within a few
+-     * milliseconds but there may occasionally be requests that don't get aborted until several
+-     * seconds after the timer has been breached. Because of this, the client execution timeout
+-     * feature should not be used when absolute precision is needed.
+-     * 

+-     * 

+-     * This may be used together with {@link ClientConfiguration#setRequestTimeout(int)} to enforce
+-     * both a timeout on each individual HTTP request (i.e. each retry) and the total time spent on
+-     * all requests across retries (i.e. the 'client execution' time). A non-positive value disables
+-     * this feature.
+-     * 

+-     * 

+-     * Note: This feature is not compatible with Java 1.6.
+-     * 

+-     *
+-     * @param clientExecutionTimeout
+-     *            The amount of time (in milliseconds) to allow the client to complete the execution
+-     *            of an API call. A value of '0' disables this feature.
+-     * @see {@link ClientConfiguration#setRequestTimeout(int)} to enforce a timeout per HTTP request
+-     */
+-    public void setClientExecutionTimeout(int clientExecutionTimeout) {
+-        this.clientExecutionTimeout = clientExecutionTimeout;
+-    }
+-
+-    /**
+-     * Sets the amount of time (in milliseconds) to allow the client to complete the execution of
+-     * an API call. This timeout covers the entire client execution except for marshalling. This
+-     * includes request handler execution, all HTTP request including retries, unmarshalling, etc.
+-     * 

+-     * This feature requires buffering the entire response (for non-streaming APIs) into memory to
+-     * enforce a hard timeout when reading the response. For APIs that return large responses this
+-     * could be expensive.
+-     * 

+-     * 

+-     * The client execution timeout feature doesn't have strict guarantees on how quickly a request
+-     * is aborted when the timeout is breached. The typical case aborts the request within a few
+-     * milliseconds but there may occasionally be requests that don't get aborted until several
+-     * seconds after the timer has been breached. Because of this, the client execution timeout
+-     * feature should not be used when absolute precision is needed.
+-     * 

+-     * 

+-     * This may be used together with {@link ClientConfiguration#setRequestTimeout(int)} to enforce
+-     * both a timeout on each individual HTTP request (i.e. each retry) and the total time spent on
+-     * all requests across retries (i.e. the 'client execution' time). A non-positive value disables
+-     * this feature.
+-     * 

+-     * 

+-     * Note: This feature is not compatible with Java 1.6.
+-     * 

+-     *
+-     * @param clientExecutionTimeout
+-     *            The amount of time (in milliseconds) to allow the client to complete the execution
+-     *            of an API call. A value of '0' disables this feature.
+-     * @return The updated ClientConfiguration object for method chaining
+-     * @see {@link ClientConfiguration#setRequestTimeout(int)} to enforce a timeout per HTTP request
+-     */
+-    public ClientConfiguration withClientExecutionTimeout(int clientExecutionTimeout) {
+-        setClientExecutionTimeout(clientExecutionTimeout);
+-        return this;
+-    }
+-
+-    /**
+-     * Checks if the {@link IdleConnectionReaper} is to be started
+-     *
+-     * @return if the {@link IdleConnectionReaper} is to be started
+-     */
+-    public boolean useReaper() {
+-        return useReaper;
+-    }
+-
+-    /**
+-     * Sets whether the {@link IdleConnectionReaper} is to be started as a daemon thread
+-     *
+-     * @param use
+-     *            whether the {@link IdleConnectionReaper} is to be started as a daemon thread
+-     * @see IdleConnectionReaper
+-     */
+-    public void setUseReaper(boolean use) {
+-        this.useReaper = use;
+-    }
+-
+-    /**
+-     * Sets whether the {@link IdleConnectionReaper} is to be started as a daemon thread
+-     *
+-     * @param use
+-     *            the {@link IdleConnectionReaper} is to be started as a daemon thread
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withReaper(boolean use) {
+-        setUseReaper(use);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns whether retry throttling will be used.
+-     * 

+-     * Retry throttling is a feature which intelligently throttles retry attempts when a
+-     * large percentage of requests are failing and retries are unsuccessful, particularly
+-     * in scenarios of degraded service health.  In these situations the client will drain its
+-     * internal retry capacity and slowly roll off from retry attempts until requests begin
+-     * to succeed again.  At that point the retry capacity pool will begin to refill and
+-     * retries will once again be permitted.
+-     * 

+-     * 

+-     * In situations where retries have been throttled this feature will effectively result in
+-     * fail-fast behavior from the client.  Because retries are circumvented exceptions will
+-     * be immediately returned to the caller if the initial request is unsuccessful.  This
+-     * will result in a greater number of exceptions being returned up front but prevents
+-     * requests being tied up attempting subsequent retries which are also likely to fail.
+-     * 

+-     *
+-     * @return true if retry throttling will be used
+-     */
+-    public boolean useThrottledRetries() {
+-        return throttleRetries || getSystemProperty(
+-                SDKGlobalConfiguration.RETRY_THROTTLING_SYSTEM_PROPERTY) != null;
+-    }
+-
+-    /**
+-     * Sets whether throttled retries should be used
+-     * 

+-     * Retry throttling is a feature which intelligently throttles retry attempts when a
+-     * large percentage of requests are failing and retries are unsuccessful, particularly
+-     * in scenarios of degraded service health.  In these situations the client will drain its
+-     * internal retry capacity and slowly roll off from retry attempts until requests begin
+-     * to succeed again.  At that point the retry capacity pool will begin to refill and
+-     * retries will once again be permitted.
+-     * 

+-     * 

+-     * In situations where retries have been throttled this feature will effectively result in
+-     * fail-fast behavior from the client.  Because retries are circumvented exceptions will
+-     * be immediately returned to the caller if the initial request is unsuccessful.  This
+-     * will result in a greater number of exceptions being returned up front but prevents
+-     * requests being tied up attempting subsequent retries which are also likely to fail.
+-     * 

+-     *
+-     * @param use
+-     *            true if throttled retries should be used
+-     */
+-    public void setUseThrottleRetries(boolean use) { this.throttleRetries = use; }
+-
+-    /**
+-     * Sets whether throttled retries should be used
+-     * 

+-     * Retry throttling is a feature which intelligently throttles retry attempts when a
+-     * large percentage of requests are failing and retries are unsuccessful, particularly
+-     * in scenarios of degraded service health.  In these situations the client will drain its
+-     * internal retry capacity and slowly roll off from retry attempts until requests begin
+-     * to succeed again.  At that point the retry capacity pool will begin to refill and
+-     * retries will once again be permitted.
+-     * 

+-     * 

+-     * In situations where retries have been throttled this feature will effectively result in
+-     * fail-fast behavior from the client.  Because retries are circumvented exceptions will
+-     * be immediately returned to the caller if the initial request is unsuccessful.  This
+-     * will result in a greater number of exceptions being returned up front but prevents
+-     * requests being tied up attempting subsequent retries which are also likely to fail.
+-     * 

+-
+-     * @param use
+-     *            true if throttled retries should be used
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withThrottledRetries(boolean use) {
+-        setUseThrottleRetries(use);
+-        return this;
+-    }
+-
+-    /**
+-     * Set the maximum number of consecutive failed retries that the client will permit before
+-     * throttling all subsequent retries of failed requests.
+-     * 

+-     * Note: This does not guarantee that each failed request will be retried up to this many times.
+-     * Depending on the configured {@link RetryPolicy} and the number of past failed and successful
+-     * requests, the actual number of retries attempted may be less.
+-     * 

+-     * This has a default value of {@link #DEFAULT_MAX_CONSECUTIVE_RETRIES_BEFORE_THROTTLING}.
+-     *
+-     * @param maxConsecutiveRetriesBeforeThrottling The maximum number of consecutive retries.
+-     */
+-    public void setMaxConsecutiveRetriesBeforeThrottling(int maxConsecutiveRetriesBeforeThrottling) {
+-        this.maxConsecutiveRetriesBeforeThrottling = ValidationUtils.assertIsPositive(maxConsecutiveRetriesBeforeThrottling,
+-                "maxConsecutiveRetriesBeforeThrottling");
+-    }
+-    /**
+-     * Set the maximum number of consecutive failed retries that the client will permit before
+-     * throttling all subsequent retries of failed requests.
+-     * 

+-     * Note: This does not guarantee that each failed request will be retried up to this many times.
+-     * Depending on the configured {@link RetryPolicy} and the number of past failed and successful
+-     * requests, the actual number of retries attempted may be less.
+-     * 

+-     * This has a default value of {@link #DEFAULT_MAX_CONSECUTIVE_RETRIES_BEFORE_THROTTLING}.
+-     *
+-     * @param maxConsecutiveRetriesBeforeThrottling The maximum number of consecutive retries.
+-     *
+-     * @return This object for chaining.
+-     */
+-    public ClientConfiguration withMaxConsecutiveRetriesBeforeThrottling(int maxConsecutiveRetriesBeforeThrottling) {
+-        setMaxConsecutiveRetriesBeforeThrottling(maxConsecutiveRetriesBeforeThrottling);
+-        return this;
+-    }
+-
+-    /**
+-     * @return Set the maximum number of consecutive failed retries that the client will permit
+-     * before throttling all subsequent retries of failed requests.
+-     */
+-    public int getMaxConsecutiveRetriesBeforeThrottling() {
+-        return maxConsecutiveRetriesBeforeThrottling;
+-    }
+-
+-    /**
+-     * Checks if gzip compression is used
+-     *
+-     * @return if gzip compression is used
+-     */
+-    public boolean useGzip() {
+-        return useGzip;
+-    }
+-
+-    /**
+-     * Sets whether gzip compression should be used
+-     *
+-     * @param use
+-     *            whether gzip compression should be used
+-     */
+-    public void setUseGzip(boolean use) {
+-        this.useGzip = use;
+-    }
+-
+-    /**
+-     * Sets whether gzip compression should be used
+-     *
+-     * @param use
+-     *            whether gzip compression should be used
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withGzip(boolean use) {
+-        setUseGzip(use);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the optional size hints (in bytes) for the low level TCP send and receive buffers.
+-     * This is an advanced option for advanced users who want to tune low level TCP parameters to
+-     * try and squeeze out more performance.
+-     * 

+-     * The optimal TCP buffer sizes for a particular application are highly dependent on network
+-     * configuration and operating system configuration and capabilities. For example, most modern
+-     * operating systems provide auto-tuning functionality for TCP buffer sizes, which can have a
+-     * big impact on performance for TCP connections that are held open long enough for the
+-     * auto-tuning to optimize buffer sizes.
+-     * 

+-     * Large buffer sizes (ex: 2MB) will allow the operating system to buffer more data in memory
+-     * without requiring the remote server to acknowledge receipt of that information, so can be
+-     * particularly useful when the network has high latency.
+-     * 

+-     * This is only a hint, and the operating system may choose not to honor it. When using
+-     * this option, users should always check the operating system's configured limits and
+-     * defaults. Most OS's have a maximum TCP buffer size limit configured, and won't let you go
+-     * beyond that limit unless you explicitly raise the max TCP buffer size limit.
+-     * 

+-     * There are many resources available online to help with configuring TCP buffer sizes and
+-     * operating system specific TCP settings, including:
+-     * 
    
+-     * 
  • http://onlamp.com/pub/a/onlamp/2005/11/17/tcp_tuning.html
    • 
+-     * 
  • http://fasterdata.es.net/TCP-tuning/
    • 
+-     * 

+-     *
+-     * @return A two element array containing first the TCP send buffer size hint and then the TCP
+-     *         receive buffer size hint.
+-     */
+-    public int[] getSocketBufferSizeHints() {
+-        return new int[] { socketSendBufferSizeHint, socketReceiveBufferSizeHint };
+-    }
+-
+-    /**
+-     * Sets the optional size hints (in bytes) for the low level TCP send and receive buffers. This
+-     * is an advanced option for advanced users who want to tune low level TCP parameters to try and
+-     * squeeze out more performance.
+-     * 

+-     * The optimal TCP buffer sizes for a particular application are highly dependent on network
+-     * configuration and operating system configuration and capabilities. For example, most modern
+-     * operating systems provide auto-tuning functionality for TCP buffer sizes, which can have a
+-     * big impact on performance for TCP connections that are held open long enough for the
+-     * auto-tuning to optimize buffer sizes.
+-     * 

+-     * Large buffer sizes (ex: 2MB) will allow the operating system to buffer more data in memory
+-     * without requiring the remote server to acknowledge receipt of that information, so can be
+-     * particularly useful when the network has high latency.
+-     * 

+-     * This is only a hint, and the operating system may choose not to honor it. When using
+-     * this option, users should always check the operating system's configured limits and
+-     * defaults. Most OS's have a maximum TCP buffer size limit configured, and won't let you go
+-     * beyond that limit unless you explicitly raise the max TCP buffer size limit.
+-     * 

+-     * There are many resources available online to help with configuring TCP buffer sizes and
+-     * operating system specific TCP settings, including:
+-     * 
    
+-     * 
  • http://onlamp.com/pub/a/onlamp/2005/11/17/tcp_tuning.html
    • 
+-     * 
  • http://fasterdata.es.net/TCP-tuning/
    • 
+-     * 

+-     *
+-     * @param socketSendBufferSizeHint
+-     *            The size hint (in bytes) for the low level TCP send buffer.
+-     * @param socketReceiveBufferSizeHint
+-     *            The size hint (in bytes) for the low level TCP receive buffer.
+-     */
+-    public void setSocketBufferSizeHints(int socketSendBufferSizeHint, int socketReceiveBufferSizeHint) {
+-        this.socketSendBufferSizeHint = socketSendBufferSizeHint;
+-        this.socketReceiveBufferSizeHint = socketReceiveBufferSizeHint;
+-    }
+-
+-    /**
+-     * Sets the optional size hints (in bytes) for the low level TCP send and receive buffers, and
+-     * returns the updated ClientConfiguration object so that additional method calls may be chained
+-     * together.
+-     * 

+-     * This is an advanced option for advanced users who want to tune low level TCP parameters to
+-     * try and squeeze out more performance.
+-     * 

+-     * The optimal TCP buffer sizes for a particular application are highly dependent on network
+-     * configuration and operating system configuration and capabilities. For example, most modern
+-     * operating systems provide auto-tuning functionality for TCP buffer sizes, which can have a
+-     * big impact on performance for TCP connections that are held open long enough for the
+-     * auto-tuning to optimize buffer sizes.
+-     * 

+-     * Large buffer sizes (ex: 2MB) will allow the operating system to buffer more data in memory
+-     * without requiring the remote server to acknowledge receipt of that information, so can be
+-     * particularly useful when the network has high latency.
+-     * 

+-     * This is only a hint, and the operating system may choose not to honor it. When using
+-     * this option, users should always check the operating system's configured limits and
+-     * defaults. Most OS's have a maximum TCP buffer size limit configured, and won't let you go
+-     * beyond that limit unless you explicitly raise the max TCP buffer size limit.
+-     * 

+-     * There are many resources available online to help with configuring TCP buffer sizes and
+-     * operating system specific TCP settings, including:
+-     * 
    
+-     * 
  • http://onlamp.com/pub/a/onlamp/2005/11/17/tcp_tuning.html
    • 
+-     * 
  • http://fasterdata.es.net/TCP-tuning/
    • 
+-     * 

+-     *
+-     * @param socketSendBufferSizeHint
+-     *            The size hint (in bytes) for the low level TCP send buffer.
+-     * @param socketReceiveBufferSizeHint
+-     *            The size hint (in bytes) for the low level TCP receive buffer.
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withSocketBufferSizeHints(int socketSendBufferSizeHint,
+-                                                         int socketReceiveBufferSizeHint) {
+-        setSocketBufferSizeHints(socketSendBufferSizeHint, socketReceiveBufferSizeHint);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the name of the signature algorithm to use for signing requests made by this client.
+-     * If not set or explicitly set to null, the client will choose a signature algorithm to use
+-     * based on a configuration file of supported signature algorithms for the service and region.
+-     * 

+-     * Most users do not need to concern themselves with which signature algorithm is being used, as
+-     * the defaults will be sufficient. This setting exists only so advanced users can opt in to
+-     * newer signature protocols which have not yet been made the default for a particular
+-     * service/region.
+-     * 

+-     * Not all services support all signature algorithms, and configuring an unsupported signature
+-     * algorithm will lead to authentication failures. Use me at your own risk, and only after
+-     * consulting the documentation for the service to ensure it actually does supports your chosen
+-     * algorithm.
+-     * 

+-     * If non-null, the name returned from this method is used to look up a {@code Signer} class
+-     * implementing the chosen algorithm by the {@code com.amazonaws.auth.SignerFactory} class.
+-     *
+-     * @return The signature algorithm to use for this client, or null to use the default.
+-     */
+-    public String getSignerOverride() {
+-        return signerOverride;
+-    }
+-
+-    /**
+-     * Sets the name of the signature algorithm to use for signing requests made by this client. If
+-     * not set or explicitly set to null, the client will choose a signature algorithm to use based
+-     * on a configuration file of supported signature algorithms for the service and region.
+-     * 

+-     * Most users do not need to concern themselves with which signature algorithm is being used, as
+-     * the defaults will be sufficient. This setting exists only so advanced users can opt in to
+-     * newer signature protocols which have not yet been made the default for a particular
+-     * service/region.
+-     * 

+-     * Not all services support all signature algorithms, and configuring an unsupported signature
+-     * algorithm will lead to authentication failures. Use me at your own risk, and only after
+-     * consulting the documentation for the service to ensure it actually does supports your chosen
+-     * algorithm.
+-     * 

+-     * If non-null, the name returned from this method is used to look up a {@code Signer} class
+-     * implementing the chosen algorithm by the {@code com.amazonaws.auth.SignerFactory} class.
+-     *
+-     * @param value
+-     *            The signature algorithm to use for this client, or null to use the default.
+-     */
+-    public void setSignerOverride(final String value) {
+-        signerOverride = value;
+-    }
+-
+-    /**
+-     * Sets the name of the signature algorithm to use for signing requests made by this client. If
+-     * not set or explicitly set to null, the client will choose a signature algorithm to use based
+-     * on a configuration file of supported signature algorithms for the service and region.
+-     * 

+-     * Most users do not need to concern themselves with which signature algorithm is being used, as
+-     * the defaults will be sufficient. This setting exists only so advanced users can opt in to
+-     * newer signature protocols which have not yet been made the default for a particular
+-     * service/region.
+-     * 

+-     * Not all services support all signature algorithms, and configuring an unsupported signature
+-     * algorithm will lead to authentication failures. Use me at your own risk, and only after
+-     * consulting the documentation for the service to ensure it actually does supports your chosen
+-     * algorithm.
+-     * 

+-     * If non-null, the name returned from this method is used to look up a {@code Signer} class
+-     * implementing the chosen algorithm by the {@code com.amazonaws.auth.SignerFactory} class.
+-     *
+-     * @param value
+-     *            The signature algorithm to use for this client, or null to use the default.
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withSignerOverride(final String value) {
+-        setSignerOverride(value);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns whether to attempt to authenticate preemptively against proxy servers using basic
+-     * authentication
+-     *
+-     * @return Whether to authenticate preemptively against proxy server.
+-     */
+-    public boolean isPreemptiveBasicProxyAuth() {
+-        return preemptiveBasicProxyAuth;
+-    }
+-
+-    /**
+-     * Sets whether to attempt to authenticate preemptively against proxy servers using basic
+-     * authentication
+-     *
+-     * @param preemptiveBasicProxyAuth
+-     *            Whether to authenticate preemptively against proxy server.
+-     */
+-    public void setPreemptiveBasicProxyAuth(Boolean preemptiveBasicProxyAuth) {
+-        this.preemptiveBasicProxyAuth = preemptiveBasicProxyAuth;
+-    }
+-
+-    /**
+-     * Sets whether to attempt to authenticate preemptively against proxy servers using basic
+-     * authentication, and returns the updated ClientConfiguration object so that additional method
+-     * calls may be chained together.
+-     *
+-     * @param preemptiveBasicProxyAuth
+-     *            Whether to authenticate preemptively against proxy server.
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withPreemptiveBasicProxyAuth(boolean preemptiveBasicProxyAuth) {
+-        setPreemptiveBasicProxyAuth(preemptiveBasicProxyAuth);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the expiration time (in milliseconds) for a connection in the connection pool. When
+-     * retrieving a connection from the pool to make a request, the total time that the connection
+-     * has been open is compared against this value. Connections which have been open for longer are
+-     * discarded, and if needed a new connection is created.
+-     * 

+-     * Tuning this setting down (together with an appropriately-low setting for Java's DNS cache
+-     * TTL) ensures that your application will quickly rotate over to new IP addresses when the
+-     * service begins announcing them through DNS, at the cost of having to re-establish new
+-     * connections more frequently.
+-     *
+-     * @return the connection TTL, in milliseconds
+-     */
+-    public long getConnectionTTL() {
+-        return connectionTTL;
+-    }
+-
+-    /**
+-     * Sets the expiration time (in milliseconds) for a connection in the connection pool. When
+-     * retrieving a connection from the pool to make a request, the total time that the connection
+-     * has been open is compared against this value. Connections which have been open for longer are
+-     * discarded, and if needed a new connection is created.
+-     * 

+-     * Tuning this setting down (together with an appropriately-low setting for Java's DNS cache
+-     * TTL) ensures that your application will quickly rotate over to new IP addresses when the
+-     * service begins announcing them through DNS, at the cost of having to re-establish new
+-     * connections more frequently.
+-     * 

+-     * By default, it is set to {@code -1], i.e. connections do not expire.
+-     *
+-     * @param connectionTTL
+-     *            the connection TTL, in milliseconds
+-     */
+-    public void setConnectionTTL(long connectionTTL) {
+-        this.connectionTTL = connectionTTL;
+-    }
+-
+-    /**
+-     * Sets the expiration time (in milliseconds) for a connection in the connection pool. When
+-     * retrieving a connection from the pool to make a request, the total time that the connection
+-     * has been open is compared against this value. Connections which have been open for longer are
+-     * discarded, and if needed a new connection is created.
+-     * 

+-     * Tuning this setting down (together with an appropriately-low setting for Java's DNS cache
+-     * TTL) ensures that your application will quickly rotate over to new IP addresses when the
+-     * service begins announcing them through DNS, at the cost of having to re-establish new
+-     * connections more frequently.
+-     * 

+-     * By default, it is set to {@code -1}, i.e. connections do not expire.
+-     *
+-     * @param connectionTTL
+-     *            the connection TTL, in milliseconds
+-     * @return the updated ClientConfiguration object
+-     */
+-    public ClientConfiguration withConnectionTTL(long connectionTTL) {
+-        setConnectionTTL(connectionTTL);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the maximum amount of time that an idle connection may sit in the connection pool and
+-     * still be eligible for reuse. When retrieving a connection from the pool to make a request,
+-     * the amount of time the connection has been idle is compared against this value. Connections
+-     * which have been idle for longer are discarded, and if needed a new connection is created.
+-     * 

+-     * Tuning this setting down reduces the likelihood of a race condition (wherein you begin
+-     * sending a request down a connection which appears to be healthy, but before it arrives the
+-     * service decides the connection has been idle for too long and closes it) at the cost of
+-     * having to re-establish new connections more frequently.
+-     *
+-     * @return the connection maximum idle time, in milliseconds
+-     */
+-    public long getConnectionMaxIdleMillis() {
+-        return connectionMaxIdleMillis;
+-    }
+-
+-    /**
+-     * Sets the maximum amount of time that an idle connection may sit in the connection pool and
+-     * still be eligible for reuse. When retrieving a connection from the pool to make a request,
+-     * the amount of time the connection has been idle is compared against this value. Connections
+-     * which have been idle for longer are discarded, and if needed a new connection is created.
+-     * 

+-     * Tuning this setting down reduces the likelihood of a race condition (wherein you begin
+-     * sending a request down a connection which appears to be healthy, but before it arrives the
+-     * service decides the connection has been idle for too long and closes it) at the cost of
+-     * having to re-establish new connections more frequently.
+-     * 

+-     * By default, it is set to one minute (60000ms).
+-     *
+-     * @param connectionMaxIdleMillis
+-     *            the connection maximum idle time, in milliseconds
+-     */
+-    public void setConnectionMaxIdleMillis(long connectionMaxIdleMillis) {
+-        this.connectionMaxIdleMillis = connectionMaxIdleMillis;
+-    }
+-
+-    /**
+-     * Sets the maximum amount of time that an idle connection may sit in the connection pool and
+-     * still be eligible for reuse. When retrieving a connection from the pool to make a request,
+-     * the amount of time the connection has been idle is compared against this value. Connections
+-     * which have been idle for longer are discarded, and if needed a new connection is created.
+-     * 

+-     * Tuning this setting down reduces the likelihood of a race condition (wherein you begin
+-     * sending a request down a connection which appears to be healthy, but before it arrives the
+-     * service decides the connection has been idle for too long and closes it) at the cost of
+-     * having to re-establish new connections more frequently.
+-     * 

+-     * By default, it is set to one minute (60000ms).
+-     *
+-     * @param connectionMaxIdleMillis
+-     *            the connection maximum idle time, in milliseconds
+-     * @return the updated ClientConfiguration object
+-     */
+-    public ClientConfiguration withConnectionMaxIdleMillis(long connectionMaxIdleMillis) {
+-
+-        setConnectionMaxIdleMillis(connectionMaxIdleMillis);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the amount of time (in milliseconds) that a connection can be idle in the connection pool before it must be
+-     * validated to ensure it's still open. This "stale connection check" adds a small bit of overhead to validate the
+-     * connection. Setting this value to larger values may increase the likelihood that the connection is not usable, potentially
+-     * resulting in a {@link org.apache.http.NoHttpResponseException}. Lowering this setting increases the overhead when leasing
+-     * connections from the connection pool. It is recommended to tune this setting based on how long a service allows a
+-     * connection to be idle before closing.
+-     *
+-     * 
A non positive value disables validation of connections.

+-     *
+-     * 
The default value is {@value #DEFAULT_VALIDATE_AFTER_INACTIVITY_MILLIS} milliseconds.

+-     */
+-    public int getValidateAfterInactivityMillis() {
+-        return validateAfterInactivityMillis;
+-    }
+-
+-    /**
+-     * Sets the amount of time (in milliseconds) that a connection can be idle in the connection pool before it must be validated
+-     * to ensure it's still open. This "stale connection check" adds a small bit of overhead to validate the connection. Setting
+-     * this value to larger values may increase the likelihood that the connection is not usable, potentially resulting in a
+-     * {@link org.apache.http.NoHttpResponseException}. Lowering this setting increases the overhead when leasing connections
+-     * from the connection pool. It is recommended to tune this setting based on how long a service allows a connection to be
+-     * idle before closing.
+-     *
+-     * 
A non positive value disables validation of connections.

+-     *
+-     * 
The default value is {@value #DEFAULT_VALIDATE_AFTER_INACTIVITY_MILLIS} milliseconds.

+-     *
+-     * @param validateAfterInactivityMillis The allowed time, in milliseconds, a connection can be idle before it must be
+-     *                                      re-validated.
+-     */
+-    public void setValidateAfterInactivityMillis(int validateAfterInactivityMillis) {
+-        this.validateAfterInactivityMillis = validateAfterInactivityMillis;
+-    }
+-
+-    /**
+-     * Sets the amount of time (in milliseconds) that a connection can be idle in the connection pool before it must be validated
+-     * to ensure it's still open. This "stale connection check" adds a small bit of overhead to validate the connection. Setting
+-     * this value to larger values may increase the likelihood that the connection is not usable, potentially resulting in a
+-     * {@link org.apache.http.NoHttpResponseException}. Lowering this setting increases the overhead when leasing connections
+-     * from the connection pool. It is recommended to tune this setting based on how long a service allows a connection to be
+-     * idle before closing.
+-     *
+-     * 
A non positive value disables validation of connections.

+-     *
+-     * 
The default value is {@value #DEFAULT_VALIDATE_AFTER_INACTIVITY_MILLIS} milliseconds.

+-     *
+-     * @param validateAfterInactivityMillis The allowed time, in milliseconds, a connection can be idle before it must be
+-     *                                      re-validated.
+-     * @return The updated {@link ClientConfiguration} object.
+-     */
+-    public ClientConfiguration withValidateAfterInactivityMillis(int validateAfterInactivityMillis) {
+-        setValidateAfterInactivityMillis(validateAfterInactivityMillis);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns whether or not TCP KeepAlive support is enabled.
+-     */
+-    public boolean useTcpKeepAlive() {
+-        return tcpKeepAlive;
+-    }
+-
+-    /**
+-     * Sets whether or not to enable TCP KeepAlive support at the socket level.
+-     */
+-    public void setUseTcpKeepAlive(final boolean use) {
+-        this.tcpKeepAlive = use;
+-    }
+-
+-    /**
+-     * Sets whether or not to enable TCP KeepAlive support at the socket level.
+-     *
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withTcpKeepAlive(final boolean use) {
+-        setUseTcpKeepAlive(use);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the DnsResolver for resolving AWS IP addresses.
+-     * Returns the {@link SystemDefaultDnsResolver} by default if not
+-     * explicitly configured by the user.
+-     */
+-    public DnsResolver getDnsResolver() {
+-        return dnsResolver;
+-    }
+-
+-    /**
+-     * Sets the DNS Resolver that should be used to for resolving AWS IP addresses.
+-     */
+-    public void setDnsResolver(final DnsResolver resolver) {
+-        if (resolver == null) {
+-            throw new IllegalArgumentException("resolver cannot be null");
+-        }
+-        this.dnsResolver = resolver;
+-    }
+-
+-    /**
+-     * Sets the DNS Resolver that should be used to for resolving AWS IP addresses.
+-     *
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withDnsResolver(final DnsResolver resolver) {
+-        setDnsResolver(resolver);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns whether or not to cache response metadata.
+-     * 

+-     * Response metadata is typically used for troubleshooting issues with AWS support staff when
+-     * services aren't acting as expected.
+-     * 

+-     * 

+-     * While this feature is useful for debugging it adds overhead and disabling it may
+-     * be desired in high throughput applications.
+-     * 

+-     *
+-     * @return true if response metadata will be cached
+-     */
+-    public boolean getCacheResponseMetadata() { return cacheResponseMetadata; }
+-
+-    /**
+-     * Sets whether or not to cache response metadata.
+-     * 

+-     * Response metadata is typically used for troubleshooting issues with AWS support staff when
+-     * services aren't acting as expected.
+-     * 

+-     * 

+-     * While this feature is useful for debugging it adds overhead and disabling it may
+-     * be desired in high throughput applications.
+-     * 

+-     *
+-     * @param shouldCache true if response metadata should be cached
+-     */
+-    public void setCacheResponseMetadata(boolean shouldCache) {
+-        this.cacheResponseMetadata = shouldCache;
+-    }
+-
+-    /**
+-     * Sets whether or not to cache response metadata.
+-     * 

+-     * Response metadata is typically used for troubleshooting issues with AWS support staff when
+-     * services aren't acting as expected.
+-     * 

+-     * 

+-     * While this feature is useful for debugging it adds overhead and disabling it may
+-     * be desired in high throughput applications.
+-     * 

+-     *
+-     * @param shouldCache true if response metadata should be cached
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withCacheResponseMetadata(final boolean shouldCache) {
+-        setCacheResponseMetadata(shouldCache);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the response metadata cache size.
+-     */
+-    public int getResponseMetadataCacheSize() {
+-        return responseMetadataCacheSize;
+-    }
+-
+-    /**
+-     * Sets the response metadata cache size. By default, it is set to
+-     * {@value #DEFAULT_RESPONSE_METADATA_CACHE_SIZE}.
+-     *
+-     * @param responseMetadataCacheSize
+-     *            maximum cache size.
+-     */
+-    public void setResponseMetadataCacheSize(int responseMetadataCacheSize) {
+-        this.responseMetadataCacheSize = responseMetadataCacheSize;
+-    }
+-
+-    /**
+-     * Sets the response metadata cache size. By default, it is set to
+-     * {@value #DEFAULT_RESPONSE_METADATA_CACHE_SIZE}.
+-     *
+-     * @param responseMetadataCacheSize
+-     *            maximum cache size.
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withResponseMetadataCacheSize(int responseMetadataCacheSize) {
+-        setResponseMetadataCacheSize(responseMetadataCacheSize);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns a non-null object that can be used to specify Apache HTTP client specific custom
+-     * configurations.
+-     */
+-    public ApacheHttpClientConfig getApacheHttpClientConfig() {
+-        return apacheHttpClientConfig;
+-    }
+-
+-    /**
+-     * Returns the instance of {@link SecureRandom} configured by the user; or the JDK default if it
+-     * is null.
+-     *
+-     * @return a non-null instance of SecureRandom.
+-     */
+-    public SecureRandom getSecureRandom() {
+-        if (secureRandom == null)
+-            secureRandom = new SecureRandom();
+-        return secureRandom;
+-    }
+-
+-    /**
+-     * Sets an instance of {@link SecureRandom} to be used by the SDK.
+-     */
+-    public void setSecureRandom(SecureRandom secureRandom) {
+-        this.secureRandom = secureRandom;
+-    }
+-
+-    /**
+-     * Fluent API for {@link #setSecureRandom(SecureRandom)}.
+-     */
+-    public ClientConfiguration withSecureRandom(SecureRandom secureRandom) {
+-        setSecureRandom(secureRandom);
+-        return this;
+-    }
+-
+-    /**
+-     * Returns the use expect continue flag
+-     */
+-    public boolean isUseExpectContinue() {
+-        return useExpectContinue;
+-    }
+-
+-    /**
+-     * Sets if use expect continue should be enabled. By default, it is set to
+-     * {@value #DEFAULT_USE_EXPECT_CONTINUE}.
+-     *
+-     * @param useExpectContinue
+-     *            use expect continue HTTP/1.1 header.
+-     */
+-    public void setUseExpectContinue(boolean useExpectContinue) {
+-        this.useExpectContinue = useExpectContinue;
+-    }
+-
+-    /**
+-     * Sets if use expect continue should be enabled. By default, it is set to
+-     * {@value #DEFAULT_USE_EXPECT_CONTINUE}.
+-     *
+-     * @param useExpectContinue
+-     *            use expect continue HTTP/1.1 header.
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withUseExpectContinue(boolean useExpectContinue) {
+-        setUseExpectContinue(useExpectContinue);
+-
+-        return this;
+-    }
+-
+-    /**
+-     * Adds a header to be added on all requests and returns the {@link ClientConfiguration} object
+-     *
+-     * @param name
+-     *            the name of the header
+-     * @param value
+-     *            the value of the header
+-     *
+-     * @return The updated ClientConfiguration object.
+-     */
+-    public ClientConfiguration withHeader(String name, String value) {
+-        addHeader(name, value);
+-        return this;
+-    }
+-
+-    /**
+-     * Adds a header to be added on all requests
+-     *
+-     * @param name
+-     *            the name of the header
+-     * @param value
+-     *            the value of the header
+-     */
+-    public void addHeader(String name, String value) {
+-        headers.put(name, value);
+-    }
+-
+-    /**
+-     * Returns headers to be added to all requests
+-     *
+-     * @return headers to be added to all requests
+-     */
+-    public Map getHeaders() {
+-        return Collections.unmodifiableMap(headers);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/DefaultRequest.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/DefaultRequest.java
+--- ./src/main/java/com/amazonaws/DefaultRequest.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/DefaultRequest.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,365 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws;
+-
+-import com.amazonaws.annotation.NotThreadSafe;
+-import com.amazonaws.event.ProgressInputStream;
+-import com.amazonaws.handlers.HandlerContextKey;
+-import com.amazonaws.http.HttpMethodName;
+-import com.amazonaws.util.AWSRequestMetrics;
+-import com.amazonaws.util.json.Jackson;
+-import java.io.InputStream;
+-import java.net.URI;
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.LinkedHashMap;
+-import java.util.List;
+-import java.util.Map;
+-
+-/**
+- * Default implementation of the {@linkplain com.amazonaws.Request} interface.
+- * 

+- * This class is only intended for internal use inside the AWS client libraries.
+- * Callers shouldn't ever interact directly with objects of this class.
+- */
+-@NotThreadSafe
+-public class DefaultRequest implements Request {
+-
+-    /** The resource path being requested */
+-    private String resourcePath;
+-
+-    /**
+-     * Map of the parameters being sent as part of this request.
+-     * 

+-     * Note that a LinkedHashMap is used, since we want to preserve the
+-     * insertion order so that members of a list parameter will still be ordered
+-     * by their indices when they are marshalled into the query string.
+-     *
+-     * Lists values in this Map must use an implementation that allows
+-     * null values to be present.
+-     */
+-    private Map> parameters = new LinkedHashMap>();
+-
+-    /** Map of the headers included in this request */
+-    private Map headers = new HashMap();
+-
+-    /** The service endpoint to which this request should be sent */
+-    private URI endpoint;
+-
+-    /** The name of the service to which this request is being sent */
+-    private String serviceName;
+-
+-    /**
+-     * The original, user facing request object which this internal request
+-     * object is representing
+-     */
+-    private final AmazonWebServiceRequest originalRequest;
+-
+-    /** The HTTP method to use when sending this request. */
+-    private HttpMethodName httpMethod = HttpMethodName.POST;
+-
+-    /** An optional stream from which to read the request payload. */
+-    private InputStream content;
+-
+-    /** An optional time offset to account for clock skew */
+-    private int timeOffset;
+-
+-    /** All AWS Request metrics are collected into this object. */
+-    private AWSRequestMetrics metrics;
+-
+-    /**
+-     * Context associated with a request. Mainly used to transfer
+-     * information between different {@link com.amazonaws.handlers.RequestHandler2}
+-     */
+-    private final Map, Object> handlerContext = new
+-            HashMap, Object>();
+-
+-    /**
+-     * Constructs a new DefaultRequest with the specified service name and the
+-     * original, user facing request object.
+-     *
+-     * @param serviceName
+-     *            The name of the service to which this request is being sent.
+-     * @param originalRequest
+-     *            The original, user facing, AWS request being represented by
+-     *            this internal request object.
+-     */
+-    public DefaultRequest(AmazonWebServiceRequest originalRequest, String serviceName) {
+-        this.serviceName = serviceName;
+-
+-        this.originalRequest = originalRequest == null ? AmazonWebServiceRequest.NOOP
+-                                                       : originalRequest;
+-        this.handlerContext.putAll(this.originalRequest.getHandlerContext());
+-    }
+-
+-    /**
+-     * Constructs a new DefaultRequest with the specified service name and no
+-     * specified original, user facing request object.
+-     *
+-     * @param serviceName
+-     *            The name of the service to which this request is being sent.
+-     */
+-    public DefaultRequest(String serviceName) {
+-        this(null, serviceName);
+-    }
+-
+-
+-    /**
+-     * Returns the original, user facing request object which this internal
+-     * request object is representing.
+-     *
+-     * @return The original, user facing request object which this request
+-     *         object is representing.
+-     */
+-    public AmazonWebServiceRequest getOriginalRequest() {
+-        return originalRequest;
+-    }
+-
+-    /**
+-     * @see com.amazonaws.Request#addHeader(java.lang.String, java.lang.String)
+-     */
+-    public void addHeader(String name, String value) {
+-        headers.put(name, value);
+-    }
+-
+-    /**
+-     * @see com.amazonaws.Request#getHeaders()
+-     */
+-    public Map getHeaders() {
+-        return headers;
+-    }
+-
+-    /**
+-     * @see com.amazonaws.Request#setResourcePath(java.lang.String)
+-     */
+-    public void setResourcePath(String resourcePath) {
+-        this.resourcePath = resourcePath;
+-    }
+-
+-    /**
+-     * @see com.amazonaws.Request#getResourcePath()
+-     */
+-    public String getResourcePath() {
+-        return resourcePath;
+-    }
+-
+-    /**
+-     * @see com.amazonaws.Request#addParameter(java.lang.String, java.lang.String)
+-     */
+-    public void addParameter(String name, String value) {
+-        List paramList = parameters.get(name);
+-        if (paramList == null) {
+-            paramList = new ArrayList();
+-            parameters.put(name, paramList);
+-        }
+-        paramList.add(value);
+-    }
+-
+-    /**
+-     *
+-     * @see com.amazonaws.Request#addParameters(java.lang.String, java.util.List)
+-     */
+-    public void addParameters(String name, List values) {
+-        if (values == null) return;
+-        for (String value : values) {
+-            addParameter(name, value);
+-        }
+-    }
+-
+-    /**
+-     * @see com.amazonaws.Request#getParameters()
+-     */
+-    public Map> getParameters() {
+-        return parameters;
+-    }
+-
+-    /**
+-     * @see com.amazonaws.Request#withParameter(java.lang.String, java.lang.String)
+-     */
+-    public Request withParameter(String name, String value) {
+-        addParameter(name, value);
+-        return this;
+-    }
+-
+-    /**
+-     * @see com.amazonaws.Request#getHttpMethod()
+-     */
+-    public HttpMethodName getHttpMethod() {
+-        return httpMethod;
+-    }
+-
+-    /**
+-     * @see com.amazonaws.Request#setHttpMethod(com.amazonaws.http.HttpMethodName)
+-     */
+-    public void setHttpMethod(HttpMethodName httpMethod) {
+-        this.httpMethod = httpMethod;
+-    }
+-
+-    /**
+-     * @see com.amazonaws.Request#setEndpoint(java.net.URI)
+-     */
+-    public void setEndpoint(URI endpoint) {
+-        this.endpoint = endpoint;
+-    }
+-
+-    /**
+-     * @see com.amazonaws.Request#getEndpoint()
+-     */
+-    public URI getEndpoint() {
+-        return endpoint;
+-    }
+-
+-    /**
+-     * @see com.amazonaws.Request#getServiceName()
+-     */
+-    public String getServiceName() {
+-        return serviceName;
+-    }
+-
+-    /**
+-     * @see com.amazonaws.Request#getContent()
+-     */
+-    public InputStream getContent() {
+-        return content;
+-    }
+-
+-    /**
+-     * @see com.amazonaws.Request#setContent(java.io.InputStream)
+-     */
+-    public void setContent(InputStream content) {
+-        this.content = content;
+-    }
+-
+-    /**
+-     * @see com.amazonaws.Request#setHeaders(java.util.Map)
+-     */
+-    public void setHeaders(Map headers) {
+-        this.headers.clear();
+-        this.headers.putAll(headers);
+-    }
+-
+-    /**
+-     * @see com.amazonaws.Request#setParameters(java.util.Map)
+-     */
+-    public void setParameters(Map> parameters) {
+-        this.parameters.clear();
+-        this.parameters.putAll(parameters);
+-    }
+-
+-    /**
+-     * @see com.amazonaws.Request#getTimeOffset
+-     */
+-    public int getTimeOffset() {
+-        return timeOffset;
+-    }
+-
+-    /**
+-     * @see Request#setTimeOffset(int)
+-     */
+-    public void setTimeOffset(int timeOffset) {
+-        this.timeOffset = timeOffset;
+-    }
+-
+-    /**
+-     * @see Request#setTimeOffset(int)
+-     */
+-    public Request withTimeOffset(int timeOffset) {
+-        setTimeOffset(timeOffset);
+-        return this;
+-    }
+-
+-    @Override
+-    public String toString() {
+-        final StringBuilder builder = new StringBuilder();
+-        builder.append(getHttpMethod()).append(" ");
+-        builder.append(getEndpoint()).append(" ");
+-        String resourcePath = getResourcePath();
+-
+-        if (resourcePath == null) {
+-            builder.append("/");
+-        }
+-        else {
+-            if (!resourcePath.startsWith("/")) {
+-                builder.append("/");
+-            }
+-            builder.append(resourcePath);
+-        }
+-        builder.append(" ");
+-        if (!getParameters().isEmpty()) {
+-            builder.append("Parameters: (")
+-                   .append(Jackson.toJsonString(parameters));
+-        }
+-
+-        if (!getHeaders().isEmpty()) {
+-            builder.append("Headers: (");
+-            for (String key : getHeaders().keySet()) {
+-                String value = getHeaders().get(key);
+-                builder.append(key).append(": ").append(value).append(", ");
+-            }
+-            builder.append(") ");
+-        }
+-
+-        return builder.toString();
+-    }
+-
+-    @Override
+-    public AWSRequestMetrics getAWSRequestMetrics() {
+-        return metrics;
+-    }
+-
+-    @Override
+-    public void setAWSRequestMetrics(AWSRequestMetrics metrics) {
+-        if (this.metrics == null) {
+-            this.metrics = metrics;
+-        } else {
+-            throw new IllegalStateException("AWSRequestMetrics has already been set on this request");
+-        }
+-    }
+-
+-    @Override
+-    public  void addHandlerContext(HandlerContextKey key, X value) {
+-        handlerContext.put(key, value);
+-    }
+-
+-    @Override
+-    public  X getHandlerContext(HandlerContextKey key) {
+-        return (X) handlerContext.get(key);
+-    }
+-
+-    @SuppressWarnings("resource")
+-    @Override
+-    public InputStream getContentUnwrapped() {
+-        InputStream is = getContent();
+-        if (is == null)
+-            return null;
+-        // We want to disable the progress reporting when the stream is
+-        // consumed for signing purpose.
+-        while (is instanceof ProgressInputStream) {
+-            ProgressInputStream pris = (ProgressInputStream)is;
+-            is = pris.getWrappedInputStream();
+-        }
+-        return is;
+-    }
+-
+-    @Override
+-    public ReadLimitInfo getReadLimitInfo() {
+-        return originalRequest;
+-    }
+-
+-    @Override
+-    public Object getOriginalRequestObject() {
+-        return originalRequest;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/DnsResolver.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/DnsResolver.java
+--- ./src/main/java/com/amazonaws/DnsResolver.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/DnsResolver.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,25 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws;
+-
+-import java.net.InetAddress;
+-import java.net.UnknownHostException;
+-
+-/**
+- * Given a hostname, will resolve the hostname to an ip, or list of ip addresses.
+- */
+-public interface DnsResolver {
+-    InetAddress[] resolve(String host) throws UnknownHostException;
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/event/DeliveryMode.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/DeliveryMode.java
+--- ./src/main/java/com/amazonaws/event/DeliveryMode.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/DeliveryMode.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,45 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.event;
+-
+-/**
+- * Used to indicate whether it is safe to deliver progress events to the
+- * listener synchronously. In general, a progress listener should never block,
+- * which is a necessary condition for the safety for synchronous delivery.
+- * 
+- * @see SyncProgressListener
+- */
+-public interface DeliveryMode {
+-    /**
+-     * Returns true if it is safe to make a synchronous callback to the
+-     * implementing listener without the risk of incurring undue latency; false
+-     * otherwise.
+-     */
+-    public boolean isSyncCallSafe();
+-
+-    /**
+-     * Provides convenient method to check if a listener is safe to be invoked
+-     * synchronously.
+-     */
+-    public static class Check {
+-        public static boolean isSyncCallSafe(ProgressListener listener) {
+-            if (listener instanceof DeliveryMode) {
+-                DeliveryMode mode = (DeliveryMode) listener;
+-                return mode.isSyncCallSafe();
+-            }
+-            return listener == null;
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/event/ProgressEventFilter.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/ProgressEventFilter.java
+--- ./src/main/java/com/amazonaws/event/ProgressEventFilter.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/ProgressEventFilter.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,28 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.event;
+-
+-/**
+- * An interface that filters the incoming events before passing
+- * them into the registered listeners.
+- */
+-public interface ProgressEventFilter {
+-
+-    /**
+-     * Returns the filtered event object that will be actually passed into
+-     * the listeners. Returns null if the event should be completely blocked.
+-     */
+-    public ProgressEvent filter(ProgressEvent progressEvent);
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/event/ProgressEvent.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/ProgressEvent.java
+--- ./src/main/java/com/amazonaws/event/ProgressEvent.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/ProgressEvent.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,180 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.event;
+-
+-import com.amazonaws.annotation.Immutable;
+-
+-import java.util.EnumMap;
+-import java.util.Map;
+-
+-/**
+- * A progress event. Typically this is used to notify a chunk of bytes has been
+- * transferred. Also used to notify other types of progress events such as a
+- * transfer starting, or failing.
+- * 

+- * The legacy Amazon S3 progress event
+- * com.amazonaws.services.s3.model.ProgressEvent has been deprecated in favor of
+- * this new class.
+- * 

+- */
+-@Immutable
+-public class ProgressEvent {
+-    /** The number of bytes associated with the progress event. */
+-    private final long bytes;
+-    private final ProgressEventType eventType;
+-
+-    /**
+-     * Creates a BYTE_TRANSFER_EVENT with the specified bytesTransferred data.
+-     */
+-    @Deprecated
+-    public ProgressEvent(long bytes) {
+-        this(ProgressEventType.BYTE_TRANSFER_EVENT, bytes);
+-    }
+-
+-    /**
+-     * Creates a ProgressEvent object with the specified event type.
+-     *
+-     * @param eventType
+-     *            Type of the progress event. This parameter must not be null.
+-     */
+-    public ProgressEvent(ProgressEventType eventType) {
+-        this(eventType, 0);
+-    }
+-
+-    /**
+-     * Creates a ProgressEvent object.
+-     *
+-     * @param eventType
+-     *            Type of the progress event. This parameter must not be null.
+-     * @param bytes
+-     *            Number of bytes involved.
+-     */
+-    public ProgressEvent(ProgressEventType eventType, long bytes) {
+-        if (eventType == null)
+-            throw new IllegalArgumentException("eventType must not be null.");
+-        if (bytes < 0)
+-            throw new IllegalArgumentException("bytes reported must be non-negative");
+-        this.eventType = eventType;
+-        this.bytes = bytes;
+-    }
+-
+-    /**
+-     * Returns the number of bytes associated with the event. The number of
+-     * bytes are not necessarily the same as the number of bytes transferred,
+-     * and it's meaning depends on the specific event type. For example, the
+-     * bytes of a {@link ProgressEventType#REQUEST_CONTENT_LENGTH_EVENT} refers
+-     * to the expected number of bytes to be sent to AWS, not the actual number
+-     * of bytes that have been transferred.
+-     */
+-    public long getBytes() {
+-        return bytes;
+-    }
+-
+-    /**
+-     * Convenient method to returns the number of bytes transferred in this
+-     * event, or the number of bytes reset (or discarded) if negative. In
+-     * particular, bytes of a content-length event is excluded.
+-     */
+-    public long getBytesTransferred() {
+-        switch(eventType) {
+-            case REQUEST_BYTE_TRANSFER_EVENT:
+-            case RESPONSE_BYTE_TRANSFER_EVENT:
+-                return bytes;
+-            case HTTP_RESPONSE_CONTENT_RESET_EVENT:
+-            case HTTP_REQUEST_CONTENT_RESET_EVENT:
+-            case RESPONSE_BYTE_DISCARD_EVENT:
+-                return 0 - bytes;
+-        default:
+-            return 0;
+-        }
+-    }
+-
+-    /**
+-     * Returns the unique event code identifying the type of event this object
+-     * represents.
+-     *
+-     * @return The unique event code that identifies what type of specific type
+-     *         of event this object represents.
+-     *
+-     * @deprecated Use {@link #getEventType()} instead.
+-     */
+-    @Deprecated
+-    public int getEventCode() {
+-        Integer legacyCode =  legacyEventCodes.get(eventType);
+-        // Returns -1 if the event type does not have a legacy event code
+-        return legacyCode == null ? -1 : legacyCode;
+-    }
+-
+-    /**
+-     * Returns the type of event this object represents. This method never
+-     * returns null.
+-     *
+-     * @return The type of event this object represents.
+-     */
+-    public ProgressEventType getEventType() {
+-        return eventType;
+-    }
+-
+-    // Deprecated integer event codes
+-
+-    /** @deprecated Replaced by {@link ProgressEventType#TRANSFER_PREPARING_EVENT} */
+-    @Deprecated public static final int PREPARING_EVENT_CODE = 1;
+-
+-    /** @deprecated Replaced by {@link ProgressEventType#TRANSFER_STARTED_EVENT} */
+-    @Deprecated public static final int STARTED_EVENT_CODE = 2;
+-
+-    /** @deprecated Replaced by {@link ProgressEventType#TRANSFER_COMPLETED_EVENT} */
+-    @Deprecated public static final int COMPLETED_EVENT_CODE = 4;
+-
+-    /** @deprecated Replaced by {@link ProgressEventType#TRANSFER_FAILED_EVENT} */
+-    @Deprecated public static final int FAILED_EVENT_CODE = 8;
+-
+-    /** @deprecated Replaced by {@link ProgressEventType#TRANSFER_CANCELED_EVENT} */
+-    @Deprecated public static final int CANCELED_EVENT_CODE = 16;
+-
+-    /** @deprecated Replaced by {@link ProgressEventType#HTTP_REQUEST_CONTENT_RESET_EVENT} */
+-    @Deprecated public static final int RESET_EVENT_CODE = 32;
+-
+-    /** @deprecated Replaced by {@link ProgressEventType#TRANSFER_PART_STARTED_EVENT} */
+-    @Deprecated public static final int PART_STARTED_EVENT_CODE = 1024;
+-
+-    /** @deprecated Replaced by {@link ProgressEventType#TRANSFER_PART_COMPLETED_EVENT} */
+-    @Deprecated public static final int PART_COMPLETED_EVENT_CODE = 2048;
+-
+-    /** @deprecated Replaced by {@link ProgressEventType#TRANSFER_PART_FAILED_EVENT} */
+-    @Deprecated public static final int PART_FAILED_EVENT_CODE = 4096;
+-
+-    // Mapping from event types to the legacy event codes
+-    private static final Map legacyEventCodes =
+-        new EnumMap(ProgressEventType.class);
+-    static {
+-        legacyEventCodes.put(ProgressEventType.BYTE_TRANSFER_EVENT,              0);
+-        legacyEventCodes.put(ProgressEventType.TRANSFER_PREPARING_EVENT,         PREPARING_EVENT_CODE);
+-        legacyEventCodes.put(ProgressEventType.TRANSFER_STARTED_EVENT,           STARTED_EVENT_CODE);
+-        legacyEventCodes.put(ProgressEventType.TRANSFER_COMPLETED_EVENT,         COMPLETED_EVENT_CODE);
+-        legacyEventCodes.put(ProgressEventType.TRANSFER_FAILED_EVENT,            FAILED_EVENT_CODE);
+-        legacyEventCodes.put(ProgressEventType.TRANSFER_CANCELED_EVENT,          CANCELED_EVENT_CODE);
+-        legacyEventCodes.put(ProgressEventType.HTTP_REQUEST_CONTENT_RESET_EVENT, RESET_EVENT_CODE);
+-        legacyEventCodes.put(ProgressEventType.HTTP_RESPONSE_CONTENT_RESET_EVENT,RESET_EVENT_CODE);
+-        legacyEventCodes.put(ProgressEventType.TRANSFER_PART_STARTED_EVENT,      PART_STARTED_EVENT_CODE);
+-        legacyEventCodes.put(ProgressEventType.TRANSFER_PART_COMPLETED_EVENT,    PART_COMPLETED_EVENT_CODE);
+-        legacyEventCodes.put(ProgressEventType.TRANSFER_PART_FAILED_EVENT,       PART_FAILED_EVENT_CODE);
+-    }
+-    
+-    @Override
+-    public String toString() {
+-        return eventType + ", bytes: " + bytes;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/event/ProgressEventType.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/ProgressEventType.java
+--- ./src/main/java/com/amazonaws/event/ProgressEventType.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/ProgressEventType.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,184 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.event;
+-
+-/**
+- * An enumeration that denotes various types of progress event.
+- */
+-public enum ProgressEventType {
+-    //////////////////////////////////////////////////////////////////////////
+-    // Request Cycle Event:
+-    // related to the execution of a single http request-response to AWS
+-    //////////////////////////////////////////////////////////////////////////
+-    /**
+-     * A general byte transfer event that happens during sending a request or
+-     * reading a response.
+-     */
+-    @Deprecated
+-    BYTE_TRANSFER_EVENT,
+-    /**
+-     * Event of the content length to be sent in a request.
+-     */
+-    REQUEST_CONTENT_LENGTH_EVENT,
+-    /**
+-     * Event of the content length received in a response.
+-     */
+-    RESPONSE_CONTENT_LENGTH_EVENT,
+-
+-    /**
+-     * Used to indicate the number of bytes to be sent to AWS.
+-     */
+-    REQUEST_BYTE_TRANSFER_EVENT,
+-    /**
+-     * Used to indicate the number of bytes received from AWS.
+-     */
+-    RESPONSE_BYTE_TRANSFER_EVENT,
+-    /**
+-     * Used to indicate the number of bytes discarded after being received from AWS.
+-     */
+-    RESPONSE_BYTE_DISCARD_EVENT,
+-
+-    /* Generic request progress events */
+-
+-    /**
+-     * Event indicating that the client has started sending the AWS API request.
+-     * This type of event is guaranteed to be only fired once during a
+-     * request-response cycle, even when the request is retried.
+-     */
+-    CLIENT_REQUEST_STARTED_EVENT,
+-
+-    /**
+-     * Event indicating that the client has started sending the HTTP request.
+-     * The request progress listener will be notified of multiple instances of
+-     * this type of event if the request gets retried.
+-     */
+-    HTTP_REQUEST_STARTED_EVENT,
+-
+-    /**
+-     * Event indicating that the client has finished sending the HTTP request.
+-     * The request progress listener will be notified of multiple instances of
+-     * this type of event if the request gets retried.
+-     */
+-    HTTP_REQUEST_COMPLETED_EVENT,
+-
+-    /**
+-     * Event indicating that the HTTP request content is reset, which may or may not
+-     * be caused by the retry of the request.
+-     */
+-    HTTP_REQUEST_CONTENT_RESET_EVENT,
+-
+-    /**
+-     * Event indicating that a failed request is detected as retryable and is
+-     * ready for the next retry.
+-     */
+-    CLIENT_REQUEST_RETRY_EVENT,
+-
+-    /**
+-     * Event indicating that the client has started reading the HTTP response.
+-     * The request progress listener will be notified of this event only if the
+-     * client receives a successful service response (i.e. 2XX status code).
+-     */
+-    HTTP_RESPONSE_STARTED_EVENT,
+-
+-    /**
+-     * Event indicating that the client has finished reading the HTTP response.
+-     * The request progress listener will be notified of this event only if the
+-     * client receives a successful service response (i.e. 2XX status code).
+-     */
+-    HTTP_RESPONSE_COMPLETED_EVENT,
+-
+-    /**
+-     * Event indicating that the HTTP response content is reset.
+-     */
+-    HTTP_RESPONSE_CONTENT_RESET_EVENT,
+-
+-    /**
+-     * Event indicating that the client has received a successful service
+-     * response and has finished parsing the response data.
+-     */
+-    CLIENT_REQUEST_SUCCESS_EVENT,
+-
+-    /**
+-     * Event indicating that a client request has failed (after retries have
+-     * been conducted).
+-     */
+-    CLIENT_REQUEST_FAILED_EVENT,
+-
+-    //////////////////////////////////////////////////////////////////////////
+-    // Transfer Event:
+-    // Progress events that are used by S3 and Glacier client */
+-    //////////////////////////////////////////////////////////////////////////
+-    TRANSFER_PREPARING_EVENT,
+-    TRANSFER_STARTED_EVENT,
+-    TRANSFER_COMPLETED_EVENT,
+-    TRANSFER_FAILED_EVENT,
+-    TRANSFER_CANCELED_EVENT,
+-    TRANSFER_PART_STARTED_EVENT,
+-    TRANSFER_PART_COMPLETED_EVENT,
+-    TRANSFER_PART_FAILED_EVENT;
+-
+-    /**
+-     * Returns true if this event type is a transfer event, which may involve
+-     * multiple request cycle events.
+-     * 
+-     * @see #isRequestCycleEvent()
+-     */
+-    public boolean isTransferEvent() {
+-        switch (this) {
+-            case TRANSFER_CANCELED_EVENT:
+-            case TRANSFER_COMPLETED_EVENT:
+-            case TRANSFER_FAILED_EVENT:
+-            case TRANSFER_PART_COMPLETED_EVENT:
+-            case TRANSFER_PART_FAILED_EVENT:
+-            case TRANSFER_PART_STARTED_EVENT:
+-            case TRANSFER_PREPARING_EVENT:
+-            case TRANSFER_STARTED_EVENT:
+-                return true;
+-            default:
+-                return false;
+-        }
+-    }
+-
+-    /**
+-     * Returns true if this event type is related to the execution of a 
+-     * single http request-response to AWS; false otherwise.
+-     */
+-    public boolean isRequestCycleEvent() {
+-        return !isTransferEvent();
+-    }
+-
+-    /**
+-     * Returns true if this even type is associated with some number of bytes;
+-     * false otherwise.
+-     */
+-    public boolean isByteCountEvent() {
+-        switch (this) {
+-            case BYTE_TRANSFER_EVENT:
+-            case HTTP_REQUEST_CONTENT_RESET_EVENT:
+-            case HTTP_RESPONSE_CONTENT_RESET_EVENT:
+-
+-            case REQUEST_BYTE_TRANSFER_EVENT:
+-            case RESPONSE_BYTE_TRANSFER_EVENT:
+-
+-            case RESPONSE_BYTE_DISCARD_EVENT:
+-
+-            case REQUEST_CONTENT_LENGTH_EVENT:
+-            case RESPONSE_CONTENT_LENGTH_EVENT:
+-                return true;
+-            default:
+-                return false;
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/event/ProgressInputStream.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/ProgressInputStream.java
+--- ./src/main/java/com/amazonaws/event/ProgressInputStream.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/ProgressInputStream.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,217 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.event;
+-
+-import com.amazonaws.AmazonWebServiceRequest;
+-import com.amazonaws.annotation.NotThreadSafe;
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.internal.SdkFilterInputStream;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-/**
+- * Used for input stream progress tracking purposes.
+- */
+-@NotThreadSafe
+-public abstract class ProgressInputStream extends SdkFilterInputStream {
+-    /**
+-     * Returns an input stream for request progress tracking purposes. If request/response progress
+-     * tracking is not enabled, this method simply return the given input stream as is.
+-     *
+-     * @param is the request content input stream
+-     * @deprecated
+-     */
+-    @Deprecated
+-    public static InputStream inputStreamForRequest(InputStream is,
+-            AmazonWebServiceRequest req) {
+-        return req == null
+-             ? is
+-             : inputStreamForRequest(is, req.getGeneralProgressListener());
+-    }
+-
+-    /**
+-     * @param is               the request content input stream
+-     * @param progressListener Optional progress listener
+-     * @return If the progress listener is non null returns a new input stream decorated with
+-     * progress reporting functionality. If progress listener is null it returns the same input
+-     * stream.
+-     */
+-    @SdkInternalApi
+-    public static InputStream inputStreamForRequest(InputStream is, ProgressListener progressListener) {
+-        return progressListener == null
+-                ? is
+-                : new RequestProgressInputStream(is, progressListener);
+-    }
+-
+-    /**
+-     * Returns an input stream for response progress tracking purposes. If
+-     * request/response progress tracking is not enabled, this method simply
+-     * return the given input stream as is.
+-     * 
+-     * @param is the response content input stream
+-     */
+-    public static InputStream inputStreamForResponse(InputStream is, AmazonWebServiceRequest req) {
+-        return req == null
+-             ? is
+-             : new ResponseProgressInputStream(is, req.getGeneralProgressListener());
+-    }
+-
+-    /**
+-     * Returns an input stream for response progress tracking purposes. If request/response progress tracking is not enabled, this
+-     * method simply return the given input stream as is.
+-     *
+-     * @param is               the response content input stream
+-     * @param progressListener Optional progress listener
+-     * @return If the progress listener is non null returns a new input stream decorated with progress reporting functionality. If
+-     * progress listener is null it returns the same input stream.
+-     */
+-    public static InputStream inputStreamForResponse(InputStream is, ProgressListener progressListener) {
+-        return progressListener == null
+-                ? is
+-                : new ResponseProgressInputStream(is, progressListener);
+-    }
+-
+-    /** The threshold of bytes between notifications. */
+-    private static final int DEFAULT_NOTIFICATION_THRESHOLD = 8 * 1024;
+-
+-    private final ProgressListener listener;
+-    private final int notifyThresHold;
+-    /** The number of bytes read that the listener hasn't been notified about yet. */
+-    private int unnotifiedByteCount;
+-    private boolean hasBeenRead;
+-    private boolean doneEOF;
+-    private long notifiedByteCount;
+-
+-    public ProgressInputStream(InputStream is, ProgressListener listener) {
+-        this(is, listener, DEFAULT_NOTIFICATION_THRESHOLD);
+-    }
+-
+-    public ProgressInputStream(InputStream is, ProgressListener listener, int notifyThresHold) {
+-        super(is);
+-        if (is == null || listener == null)
+-            throw new IllegalArgumentException();
+-        this.notifyThresHold = notifyThresHold;
+-        this.listener = listener;
+-    }
+-
+-    /**
+-     * The read method is called for the very first time.
+-     * Defaults to do nothing.
+-     */
+-    protected void onFirstRead() {}
+-    /**
+-     * An end-of-file event is to be notified.
+-     * Defaults to do nothing.
+-     */
+-    protected void onEOF() {}
+-
+-    /**
+-     * Defaults to behave the same as {@link #onEOF()}.
+-     */
+-    protected void onClose() {
+-        eof();
+-    }
+-    /**
+-     * A reset event is to be notified.  Default to do nothing.
+-     */
+-    protected void onReset() {}
+-    /**
+-     * Upon notification of the number of bytes transferred since last
+-     * notification.  Default to do nothing.
+-     */
+-    protected void onNotifyBytesRead() {}
+-
+-    /**
+-     * Upon reading the given number of bytes.
+-     * The default behavior is to accumulate the byte count and only fire off
+-     * a notification by invoking {@link #onNotifyBytesRead()} if the count
+-     * has exceeded the threshold.
+-     */
+-    private void onBytesRead(int bytesRead) {
+-        unnotifiedByteCount += bytesRead;
+-        if (unnotifiedByteCount >= notifyThresHold) {
+-            onNotifyBytesRead();
+-            notifiedByteCount += unnotifiedByteCount;
+-            unnotifiedByteCount = 0;
+-        }
+-    }
+-
+-    @Override
+-    public int read() throws IOException {
+-        if (!hasBeenRead) {
+-            onFirstRead();
+-            hasBeenRead = true;
+-        }
+-        int ch = super.read();
+-        if (ch == -1)
+-            eof();
+-        else
+-            onBytesRead(1);
+-        return ch;
+-    }
+-
+-    @Override
+-    public void reset() throws IOException {
+-        super.reset();
+-        onReset();
+-        unnotifiedByteCount = 0;
+-        notifiedByteCount = 0;
+-    }
+-
+-    @Override
+-    public int read(byte[] b, int off, int len) throws IOException {
+-        if (!hasBeenRead) {
+-            onFirstRead();
+-            hasBeenRead = true;
+-        }
+-        int bytesRead = super.read(b, off, len);
+-        if (bytesRead == -1)
+-            eof();
+-        else
+-            onBytesRead(bytesRead);
+-        return bytesRead;
+-    }
+-
+-    private void eof() {
+-        if (doneEOF)
+-            return;
+-        onEOF();
+-        unnotifiedByteCount = 0;
+-        doneEOF = true;
+-    }
+-
+-    public final InputStream getWrappedInputStream() {
+-        return in;
+-    }
+-
+-    protected final int getUnnotifiedByteCount() {
+-        return unnotifiedByteCount;
+-    }
+-
+-    protected final long getNotifiedByteCount() {
+-        return notifiedByteCount;
+-    }
+-
+-    @Override
+-    public void close() throws IOException {
+-        onClose(); // report any left over bytes not yet reported
+-        super.close();
+-    }
+-
+-    public final ProgressListener getListener() {
+-        return listener;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/event/ProgressListenerChain.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/ProgressListenerChain.java
+--- ./src/main/java/com/amazonaws/event/ProgressListenerChain.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/ProgressListenerChain.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,106 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.event;
+-
+-import java.util.List;
+-import java.util.concurrent.CopyOnWriteArrayList;
+-
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-
+-/**
+- * An implementation of ProgressListener interface that delegates
+- * progressChanged callback to multiple listeners. It also takes
+- * an optional ProgressEventFilter to filter incoming events before
+- * passing them to the listeners.
+- * 

+- * This class could be used for both Amazon S3 and Amazon Glacier clients. The
+- * legacy Amazon S3 progress listener chain
+- * com.amazonaws.services.s3.transfer.internal.ProgressListenerChain has been
+- * deprecated in favor of this new class.
+- * 

+- */
+-public class ProgressListenerChain implements ProgressListener, DeliveryMode {
+-    private static final Log log = LogFactory.getLog(ProgressListenerChain.class);
+-
+-    private final List listeners = new CopyOnWriteArrayList();
+-    private final ProgressEventFilter progressEventFilter;
+-    /**
+-     * True if synchronous callback to every listener in this chain is safe with
+-     * no risk of incurring undue latency.
+-     *
+-     * @see SDKProgressPublisher
+-     */
+-    private volatile boolean syncCallSafe = true;
+-
+-    /**
+-     * Create a listener chain that directly passes all the progress events to
+-     * the specified listeners.
+-     */
+-    public ProgressListenerChain(ProgressListener... listeners) {
+-        this(null, listeners);
+-    }
+-
+-    /**
+-     * Create a listener chain with a ProgressEventFilter.
+-     */
+-    public ProgressListenerChain(ProgressEventFilter progressEventFilter, ProgressListener... listeners) {
+-        if (listeners == null) {
+-            throw new IllegalArgumentException(
+-                    "Progress Listeners cannot be null.");
+-        }
+-        for (ProgressListener listener : listeners)
+-            addProgressListener(listener);
+-        this.progressEventFilter = progressEventFilter;
+-    }
+-
+-    public synchronized void addProgressListener(ProgressListener listener) {
+-        if (listener == null) 
+-            return;
+-        if (syncCallSafe)
+-            syncCallSafe = DeliveryMode.Check.isSyncCallSafe(listener);
+-        this.listeners.add(listener);
+-    }
+-
+-    public synchronized void removeProgressListener(ProgressListener listener) {
+-        if (listener == null) return;
+-        this.listeners.remove(listener);
+-    }
+-
+-    /**
+-     * Returns the listeners associated with this listener chain.
+-     */
+-    protected List getListeners() {
+-        return listeners;
+-    }
+-
+-    public void progressChanged(final ProgressEvent progressEvent) {
+-        ProgressEvent filteredEvent = progressEvent;
+-        if (progressEventFilter != null) {
+-            filteredEvent = progressEventFilter.filter(progressEvent);
+-            if (filteredEvent == null) return;
+-        }
+-
+-        for ( ProgressListener listener : listeners ) {
+-            try {
+-                listener.progressChanged(filteredEvent);
+-            } catch ( RuntimeException e ) {
+-                log.warn("Couldn't update progress listener", e);
+-            }
+-        }
+-    }
+-
+-    @Override public boolean isSyncCallSafe() { return syncCallSafe; }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/event/ProgressListener.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/ProgressListener.java
+--- ./src/main/java/com/amazonaws/event/ProgressListener.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/ProgressListener.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,130 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.event;
+-
+-import com.amazonaws.SdkClientException;
+-
+-/**
+- * Listener interface for transfer progress events.
+- * 

+- * This class could be used for both Amazon S3 and Amazon Glacier clients. The
+- * legacy Amazon S3 progress listener
+- * com.amazonaws.services.s3.model.ProgressListener has been deprecated in favor
+- * of this new class.
+- * 

+- *
+- * @see ProgressEvent
+- */
+-public interface ProgressListener {
+-	public static final ProgressListener NOOP = new NoOpProgressListener();
+-
+-    static class NoOpProgressListener implements ProgressListener, DeliveryMode {
+-
+-        @Override
+-        public boolean isSyncCallSafe() {
+-            return true;
+-        }
+-
+-        @Override
+-        public void progressChanged(ProgressEvent progressEvent) {
+-        }
+-    }
+-
+-    /**
+-     * Called when progress has changed, such as additional bytes transferred,
+-     * transfer failed, etc. The execution of the callback of this listener is managed
+-     * by {@link SDKProgressPublisher}.  Implementation of this interface
+-     * should never block.
+-     * 

+-     * If the implementation follows the best practice and doesn't block, it
+-     * should then extends from {@link SyncProgressListener}.
+-     * 

+-     * Note any exception thrown by the listener will get ignored.
+-     * Should there be need to capture any such exception, you may consider
+-     * wrapping the listener with {@link ExceptionReporter#wrap(ProgressListener)}.
+-     *
+-     * @param progressEvent
+-     *            The event describing the progress change.
+-     *
+-     * @see SDKProgressPublisher
+-     * @see ExceptionReporter
+-     */
+-    public void progressChanged(ProgressEvent progressEvent);
+-
+-    /**
+-     * A utility class for capturing and reporting the first exception thrown by
+-     * a given progress listener. Note once an exception is thrown by the
+-     * underlying listener, all subsequent events will no longer be notified to
+-     * the listener.
+-     */
+-    public static class ExceptionReporter implements ProgressListener, DeliveryMode {
+-        private final ProgressListener listener;
+-        private final boolean syncCallSafe;
+-        private volatile Throwable cause;
+-
+-        public ExceptionReporter(ProgressListener listener) {
+-            if (listener == null)
+-                throw new IllegalArgumentException();
+-            this.listener = listener;
+-            if (listener instanceof DeliveryMode) {
+-                DeliveryMode cs = (DeliveryMode) listener;
+-                syncCallSafe = cs.isSyncCallSafe();
+-            } else
+-                syncCallSafe = false;
+-        }
+-
+-        /**
+-         * Delivers the progress event to the underlying listener but only if
+-         * there has not been an exception previously thrown by the listener.
+-         * 

+-         * {@inheritDoc}
+-         */
+-        @Override public void progressChanged(ProgressEvent progressEvent) {
+-            if (cause != null)
+-                return;
+-            try {
+-                this.listener.progressChanged(progressEvent);
+-            } catch(Throwable t) {
+-                cause = t;
+-            }
+-        }
+-
+-        /**
+-         * Throws the underlying exception, if any, as an
+-         * {@link SdkClientException}; or do nothing otherwise.
+-         */
+-        public void throwExceptionIfAny() {
+-            if (cause != null)
+-                throw new SdkClientException(cause);
+-        }
+-
+-        /**
+-         * Returns the underlying exception, if any; or null otherwise.
+-         */
+-        public Throwable getCause() {
+-            return cause;
+-        }
+-
+-        /**
+-         * Returns a wrapper for the given listener to capture the first
+-         * exception thrown.
+-         */
+-        public static ExceptionReporter wrap(ProgressListener listener) {
+-            return new ExceptionReporter(listener);
+-        }
+-
+-        @Override public boolean isSyncCallSafe() { return syncCallSafe; }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/event/ProgressTracker.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/ProgressTracker.java
+--- ./src/main/java/com/amazonaws/event/ProgressTracker.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/ProgressTracker.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,61 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.event;
+-
+-import com.amazonaws.event.request.Progress;
+-import com.amazonaws.event.request.ProgressSupport;
+-
+-/**
+- * Default implementation for progress tracking.
+- */
+-public class ProgressTracker extends SyncProgressListener {
+-    public static final ProgressTracker NOOP = new ProgressTracker() {
+-        @Override public void progressChanged(ProgressEvent progressEvent) {}
+-    };
+-
+-    private final Progress progress = new ProgressSupport();
+-
+-    @Override
+-    public void progressChanged(ProgressEvent progressEvent) {
+-        long bytes = progressEvent.getBytes();
+-        if (bytes <= 0)
+-            return;
+-        switch (progressEvent.getEventType()) {
+-            case REQUEST_CONTENT_LENGTH_EVENT:
+-                progress.addRequestContentLength(bytes);
+-                break;
+-            case RESPONSE_CONTENT_LENGTH_EVENT:
+-                progress.addResponseContentLength(bytes);
+-                break;
+-            case REQUEST_BYTE_TRANSFER_EVENT:
+-                progress.addRequestBytesTransferred(bytes);
+-                break;
+-            case RESPONSE_BYTE_TRANSFER_EVENT:
+-                progress.addResponseBytesTransferred(bytes);
+-                break;
+-            case HTTP_REQUEST_CONTENT_RESET_EVENT:
+-                progress.addRequestBytesTransferred(0-bytes);
+-                break;
+-            case HTTP_RESPONSE_CONTENT_RESET_EVENT: 
+-            case RESPONSE_BYTE_DISCARD_EVENT: 
+-                progress.addResponseBytesTransferred(0-bytes);
+-                break;
+-            default:
+-                break;
+-        }
+-    }
+-    
+-    public Progress getProgress() { return progress; }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/event/request/Progress.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/request/Progress.java
+--- ./src/main/java/com/amazonaws/event/request/Progress.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/request/Progress.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,64 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.event.request;
+-
+-import com.amazonaws.annotation.ThreadSafe;
+-
+-/**
+- * Base class used to represent the progress of a logical request/response,
+- * which may correspond to either be a physical http request/response, or
+- * multiple requests/responses as in a composite operation such as
+- * multi-part uploads.
+- * 
+- * @see ProgressSupport
+- */
+-@ThreadSafe
+-public class Progress {
+-    public static final Progress NOOP = new Progress();
+-    private static final String MSG = "No progress tracking configured";
+-    protected Progress() {}
+-
+-    /**
+-     * Returns true if progress tracking is enabled; false otherwise.
+-     */
+-    public boolean isEnabled() { return false; }
+-    /**
+-     * @param bytes can be negative if it was a reset event.
+-     */
+-    public void addRequestBytesTransferred(long bytes) {}
+-    /**
+-     * @param bytes can be negative if it was a reset event.
+-     */
+-    public void addResponseBytesTransferred(long bytes) {}
+-
+-    public long getRequestContentLength() { 
+-        throw new UnsupportedOperationException(MSG);
+-    }
+-
+-    public void addRequestContentLength(long contentLength) {}
+-    public long getRequestBytesTransferred() { 
+-        throw new UnsupportedOperationException(MSG);
+-    }
+-
+-    public long getResponseContentLength() {
+-        throw new UnsupportedOperationException(MSG);
+-    }
+-
+-    public void addResponseContentLength(long contentLength) {}
+-
+-    public long getResponseBytesTransferred() {
+-        throw new UnsupportedOperationException(MSG);
+-    }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/event/request/ProgressSupport.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/request/ProgressSupport.java
+--- ./src/main/java/com/amazonaws/event/request/ProgressSupport.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/request/ProgressSupport.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,124 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.event.request;
+-
+-import com.amazonaws.annotation.ThreadSafe;
+-
+-/**
+- * An actual implementation to represent the progress of a request/response.
+- */
+-@ThreadSafe
+-public class ProgressSupport extends Progress {
+-    /* Request transfer progress */
+-    private volatile long requestContentLength = -1;
+-    private volatile long requestBytesTransferred;
+-
+-    /* Response transfer progress */
+-    private volatile long responseContentLength = -1;
+-    private volatile long responseBytesTransferred;
+-
+-    private static final Object lock = new Object();
+-
+-    /**
+-     * Returns the number of bytes to be expected in the request, or -1 if the
+-     * number is unknown (e.g. when the request is still not serialized yet, or
+-     * when the request contains raw InputStream as the payload in which case
+-     * the SDK cannot infer the content-length in advance).
+-     */
+-    @Override
+-    public long getRequestContentLength() {
+-        return requestContentLength;
+-    }
+-
+-    /**
+-     * Adds the number of bytes to be expected in the request.
+-     */
+-    @Override
+-    public void addRequestContentLength(long contentLength) {
+-        if (contentLength < 0)
+-            throw new IllegalArgumentException();
+-        synchronized(lock) {
+-            if (this.requestContentLength == -1)
+-                this.requestContentLength = contentLength;
+-            else
+-                this.requestContentLength += contentLength;
+-        }
+-    }
+-
+-    /**
+-     * Returns the number of bytes that have been transferred in the request.
+-     */
+-    @Override
+-    public long getRequestBytesTransferred() {
+-        return requestBytesTransferred;
+-    }
+-
+-    /**
+-     * Returns the number of bytes to be expected in the response, or -1 if the
+-     * number is unknown (e.g. when the client hasn't received the response
+-     * yet).
+-     */
+-    @Override
+-    public long getResponseContentLength() {
+-        return responseContentLength;
+-    }
+-
+-    /**
+-     * Adds the number of bytes to be expected in the response.
+-     */
+-    @Override
+-    public void addResponseContentLength(long contentLength) {
+-        if (contentLength < 0)
+-            throw new IllegalArgumentException();
+-        synchronized(lock) {
+-            if (this.responseContentLength == -1)
+-                this.responseContentLength = contentLength;
+-            else
+-                this.responseContentLength += contentLength;
+-        }
+-    }
+-
+-    /**
+-     * Returns the number of bytes that have been transferred in the response.
+-     */
+-    @Override
+-    public long getResponseBytesTransferred() {
+-        return responseBytesTransferred;
+-    }
+-
+-    @Override
+-    public void addRequestBytesTransferred(long bytes) {
+-        synchronized (lock) {
+-            requestBytesTransferred += bytes;
+-        }
+-    }
+-
+-    @Override
+-    public void addResponseBytesTransferred(long bytes) {
+-        synchronized(lock) {
+-            responseBytesTransferred += bytes;
+-        }
+-    }
+-
+-    @Override
+-    public String toString() {
+-        return String.format("Request: %d/%d, Response: %d/%d",
+-                requestBytesTransferred, requestContentLength,
+-                responseBytesTransferred, responseContentLength);
+-    }
+-
+-    @Override
+-    public final boolean isEnabled() { return true; }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/event/RequestProgressInputStream.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/RequestProgressInputStream.java
+--- ./src/main/java/com/amazonaws/event/RequestProgressInputStream.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/RequestProgressInputStream.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,45 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.event;
+-
+-import static com.amazonaws.event.SDKProgressPublisher.publishRequestBytesTransferred;
+-import static com.amazonaws.event.SDKProgressPublisher.publishRequestReset;
+-
+-import java.io.InputStream;
+-
+-/**
+- * Used for request input stream progress tracking purposes.
+- */
+-class RequestProgressInputStream extends ProgressInputStream {
+-
+-    RequestProgressInputStream(InputStream is, ProgressListener listener) {
+-        super(is, listener);
+-    }
+-
+-    @Override
+-    protected void onReset() {
+-        publishRequestReset(getListener(), getNotifiedByteCount());
+-    }
+-
+-    @Override
+-    protected void onEOF() {
+-        onNotifyBytesRead();
+-    }
+-
+-    @Override
+-    protected void onNotifyBytesRead() {
+-        publishRequestBytesTransferred(getListener(), getUnnotifiedByteCount());
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/event/ResponseProgressInputStream.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/ResponseProgressInputStream.java
+--- ./src/main/java/com/amazonaws/event/ResponseProgressInputStream.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/ResponseProgressInputStream.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,43 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.event;
+-import static com.amazonaws.event.SDKProgressPublisher.publishResponseBytesTransferred;
+-import static com.amazonaws.event.SDKProgressPublisher.publishResponseReset;
+-
+-import java.io.InputStream;
+-
+-/**
+- * Used for response input stream progress tracking purposes.
+- */
+-class ResponseProgressInputStream extends ProgressInputStream {
+-    ResponseProgressInputStream(InputStream is, ProgressListener listener) {
+-        super(is, listener);
+-    }
+-
+-    @Override
+-    protected void onReset() {
+-        publishResponseReset(getListener(), getNotifiedByteCount());
+-    }
+-
+-    @Override
+-    protected void onEOF() {
+-        onNotifyBytesRead();
+-    }
+-
+-    @Override
+-    protected void onNotifyBytesRead() {
+-        publishResponseBytesTransferred(getListener(), getUnnotifiedByteCount());
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/event/SDKProgressPublisher.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/SDKProgressPublisher.java
+--- ./src/main/java/com/amazonaws/event/SDKProgressPublisher.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/SDKProgressPublisher.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,280 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.event;
+-
+-import static com.amazonaws.event.ProgressEventType.HTTP_REQUEST_CONTENT_RESET_EVENT;
+-import static com.amazonaws.event.ProgressEventType.HTTP_RESPONSE_CONTENT_RESET_EVENT;
+-import static com.amazonaws.event.ProgressEventType.REQUEST_BYTE_TRANSFER_EVENT;
+-import static com.amazonaws.event.ProgressEventType.REQUEST_CONTENT_LENGTH_EVENT;
+-import static com.amazonaws.event.ProgressEventType.RESPONSE_BYTE_TRANSFER_EVENT;
+-import static com.amazonaws.event.ProgressEventType.RESPONSE_CONTENT_LENGTH_EVENT;
+-
+-import java.util.concurrent.ExecutionException;
+-import java.util.concurrent.ExecutorService;
+-import java.util.concurrent.Executors;
+-import java.util.concurrent.Future;
+-import java.util.concurrent.ThreadFactory;
+-
+-import org.apache.commons.logging.LogFactory;
+-
+-/**
+- * This class is responsible for executing the callback method of
+- * ProgressListener; listener callbacks are executed sequentially in a separate
+- * single thread.
+- */
+-public class SDKProgressPublisher {
+-
+-    /**
+-     * Used for testing purposes only.
+-     */
+-    private static volatile Future latestFutureTask;
+-
+-    /**
+-     * Used to deliver a progress event to the given listener.
+-     *
+-     * @return the future of a submitted task; or null if the delivery is
+-     * synchronous with no future task involved.  Note a listener should never
+-     * block, and therefore returning null is the typical case.
+-     */
+-    public static Future publishProgress(
+-            final ProgressListener listener,
+-            final ProgressEventType type) {
+-        if (listener == ProgressListener.NOOP || listener == null
+-        ||  type == null) {
+-            return null;
+-        }
+-        return deliverEvent(listener, new ProgressEvent(type));
+-    }
+-
+-    private static Future deliverEvent(final ProgressListener listener,
+-            final ProgressEvent event) {
+-
+-        if (listener instanceof DeliveryMode) {
+-            DeliveryMode mode = (DeliveryMode) listener;
+-            if (mode.isSyncCallSafe()) {
+-                // Safe to call the listener directly
+-                return quietlyCallListener(listener, event);
+-            }
+-        }
+-        // Not safe to call the listener directly; so submit an async task.
+-        // This is unfortunate as the listener should never block in the first
+-        // place, but such task submission is necessary to remain backward
+-        // compatible.
+-        return latestFutureTask = LazyHolder.executor.submit(new Runnable() {
+-            @Override
+-            public void run() {
+-                listener.progressChanged(event);
+-            }
+-        });
+-    }
+-
+-    private static Future quietlyCallListener(final ProgressListener listener,
+-            final ProgressEvent event) {
+-        try {
+-            listener.progressChanged(event);
+-        } catch(Throwable t) {
+-            // That's right, we need to suppress all errors so as to be on par
+-            // with the async mode where all failures will be ignored.
+-            LogFactory.getLog(SDKProgressPublisher.class)
+-                .debug("Failure from the event listener", t);
+-        }
+-        return null;
+-    }
+-
+-    /**
+-     * Convenient method to publish a request content length event to the given
+-     * listener.
+-     *
+-     * @param listener
+-     *            must not be null or else the publication will be skipped
+-     * @param bytes
+-     *            must be non-negative or else the publication will be skipped
+-     */
+-    public static Future publishRequestContentLength(
+-            final ProgressListener listener,
+-            final long bytes) {
+-        return publishByteCountEvent(listener, REQUEST_CONTENT_LENGTH_EVENT, bytes);
+-    }
+-
+-    /**
+-     * Convenient method to publish a response content length event to the given
+-     * listener.
+-     *
+-     * @param listener
+-     *            must not be null or else the publication will be skipped
+-     * @param bytes
+-     *            must be non-negative or else the publication will be skipped
+-     */
+-    public static Future publishResponseContentLength(
+-            final ProgressListener listener,
+-            final long bytes) {
+-        return publishByteCountEvent(listener, RESPONSE_CONTENT_LENGTH_EVENT, bytes);
+-    }
+-
+-    /**
+-     * Convenient method to publish a request byte transfer event to the given
+-     * listener.
+-     *
+-     * @param listener
+-     *            must not be null or else the publication will be skipped
+-     * @param bytes
+-     *            must be non-negative or else the publication will be skipped
+-     */
+-    public static Future publishRequestBytesTransferred(
+-            final ProgressListener listener,
+-            final long bytes) {
+-        return publishByteCountEvent(listener, REQUEST_BYTE_TRANSFER_EVENT, bytes);
+-    }
+-
+-    /**
+-     * Convenient method to publish a response byte transfer event to the given
+-     * listener.
+-     *
+-     * @param listener
+-     *            must not be null or else the publication will be skipped
+-     * @param bytes
+-     *            must be non-negative or else the publication will be skipped
+-     */
+-    public static Future publishResponseBytesTransferred(
+-            final ProgressListener listener,
+-            final long bytes) {
+-        return publishByteCountEvent(listener, RESPONSE_BYTE_TRANSFER_EVENT, bytes);
+-    }
+-
+-    private static Future publishByteCountEvent(
+-            final ProgressListener listener,
+-            final ProgressEventType type,
+-            final long bytes) {
+-        if (listener == ProgressListener.NOOP || listener == null || bytes <= 0)
+-            return null;
+-        return deliverEvent(listener, new ProgressEvent(type, bytes));
+-    }
+-
+-    /**
+-     * Convenient method to publish a request reset event to the given listener.
+-     *
+-     * @param listener
+-     *            must not be null or else the publication will be skipped
+-     * @param bytesReset
+-     *            must be non-negative or else the publication will be skipped
+-     */
+-    public static Future publishRequestReset(
+-            final ProgressListener listener,
+-            final long bytesReset) {
+-        return publishResetEvent(listener, HTTP_REQUEST_CONTENT_RESET_EVENT, bytesReset);
+-    }
+-
+-    /**
+-     * Convenient method to publish a response reset event to the given listener.
+-     */
+-    public static Future publishResponseReset(
+-            final ProgressListener listener,
+-            final long bytesReset) {
+-        return publishResetEvent(listener, HTTP_RESPONSE_CONTENT_RESET_EVENT, bytesReset);
+-    }
+-
+-    /**
+-     * Convenient method to publish a response bytes discard event to the given listener.
+-     */
+-    public static Future publishResponseBytesDiscarded(
+-            final ProgressListener listener,
+-            final long bytesDiscarded) {
+-        return publishResetEvent(listener,
+-                ProgressEventType.RESPONSE_BYTE_DISCARD_EVENT, bytesDiscarded);
+-    }
+-
+-    /**
+-     * @param listener
+-     *            must not be null or else the publication will be skipped
+-     * @param bytesReset
+-     *            the publication will be skipped unless the number of bytes
+-     *            reset is positive
+-     */
+-    private static Future publishResetEvent(
+-            final ProgressListener listener,
+-            final ProgressEventType resetEventType,
+-            final long bytesReset) {
+-        if (bytesReset <= 0)
+-            return null;
+-        if (listener == ProgressListener.NOOP || listener == null)
+-            return null;
+-        return deliverEvent(listener, new ProgressEvent(resetEventType, bytesReset));
+-    }
+-
+-    /**
+-     * Returns the executor service used for performing the callbacks.
+-     */
+-    protected static ExecutorService getExecutorService() {
+-        return LazyHolder.executor;
+-    }
+-
+-    protected static Future setLatestFutureTask(Future f) {
+-        return latestFutureTask = f;
+-    }
+-
+-    /**
+-     * For internal testing and backward compatibility only. This method blocks
+-     * until all the submitted callbacks are executed. Listeners should never
+-     * block so this method should never be used.
+-     */
+-    @Deprecated
+-    public static void waitTillCompletion()
+-            throws InterruptedException, ExecutionException {
+-        if (latestFutureTask != null) {
+-            latestFutureTask.get();
+-        }
+-    }
+-
+-    /**
+-     * Used to avoid creating the extra thread until absolutely necessary.
+-     */
+-    private static final class LazyHolder {
+-        /** A single thread pool for executing all ProgressListener callbacks. **/
+-        private static final ExecutorService executor = createNewExecutorService();
+-
+-        /**
+-         * Creates a new single threaded executor service for performing the
+-         * callbacks.
+-         */
+-        private static ExecutorService createNewExecutorService() {
+-            return Executors.newSingleThreadExecutor(new ThreadFactory() {
+-                public Thread newThread(Runnable r) {
+-                    Thread t = new Thread(r);
+-                    t.setName("java-sdk-progress-listener-callback-thread");
+-                    t.setDaemon(true);
+-                    return t;
+-                }
+-            });
+-        }
+-    }
+-
+-    /**
+-     * Can be used to shutdown the (legacy) executor.
+-     * 

+-     * However, the recommended best practice is to always make use of progress
+-     * listeners that are short-lived (ie do not block) and are subclasses of
+-     * either {@link SyncProgressListener} or
+-     * S3SyncProgressListener. That way, the progress publisher
+-     * (legacy) thread will never be activated in the first place.
+-     *
+-     * @param now true if shutdown now; false otherwise.
+-     */
+-    public static void shutdown(boolean now) {
+-        if (now)
+-            LazyHolder.executor.shutdownNow();
+-        else
+-            LazyHolder.executor.shutdown();
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/event/SyncProgressListener.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/SyncProgressListener.java
+--- ./src/main/java/com/amazonaws/event/SyncProgressListener.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/event/SyncProgressListener.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,27 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.event;
+-
+-/**
+- * Abstract adapter class for a progress listener that is delivered with
+- * progress event synchronously. 
+- */
+-public abstract class SyncProgressListener
+-    implements ProgressListener, DeliveryMode {
+-    /**
+-     * Always returns true.
+-     */
+-    @Override public boolean isSyncCallSafe() { return true; }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/HandlerContextAware.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/HandlerContextAware.java
+--- ./src/main/java/com/amazonaws/HandlerContextAware.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/HandlerContextAware.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,43 +0,0 @@
+-/*
+- * Copyright 2012-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws;
+-
+-import com.amazonaws.handlers.HandlerContextKey;
+-
+-/**
+- * An implementing object is capable of storing context that is visible to all {@link com.amazonaws.handlers.RequestHandler2}.
+- *
+- * 
This interface is subject to change and should not be implemented by users of the SDK.

+- */
+-public interface HandlerContextAware {
+-    /**
+-     * Adds a context to that is visible to all {@link com.amazonaws.handlers.RequestHandler2}s.
+-     *
+-     * Note that, context added here will available only for the scope of
+-     * the request execution and will not be marshalled over the wire.
+-     * @param key the key for the property being set in the request.
+-     * @param value the value for the property being set in the request.
+-     */
+-     void addHandlerContext(HandlerContextKey key, X value);
+-
+-    /**
+-     * Return the context for the given key if present; else return null.
+-     *
+-     * @param key the key for the context
+-     * @return the context if present else null.
+-     */
+-     X getHandlerContext(HandlerContextKey key);
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/handlers/AbstractRequestHandler.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/handlers/AbstractRequestHandler.java
+--- ./src/main/java/com/amazonaws/handlers/AbstractRequestHandler.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/handlers/AbstractRequestHandler.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,30 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.handlers;
+-
+-import com.amazonaws.Request;
+-import com.amazonaws.util.TimingInfo;
+-
+-/**
+- * @deprecated by {@link RequestHandler2}.
+- * 

+- * Simple implementation of RequestHandler to stub out required methods.
+- */
+-@Deprecated
+-public abstract class AbstractRequestHandler implements RequestHandler {
+-	public void beforeRequest(Request request) {}
+-	public void afterResponse(Request request, Object response, TimingInfo timingInfo) {}
+-	public void afterError(Request request, Exception e) {}
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/handlers/AsyncHandler.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/handlers/AsyncHandler.java
+--- ./src/main/java/com/amazonaws/handlers/AsyncHandler.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/handlers/AsyncHandler.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,43 +0,0 @@
+-/*
+- * Copyright 2012-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.handlers;
+-
+-import com.amazonaws.AmazonWebServiceRequest;
+-
+-/**
+- * Callback interface for notification on web service requests executed with the
+- * asynchronous clients in the AWS SDK for Java.
+- */
+-public interface AsyncHandler {
+-
+-	/**
+-	 * Invoked after an asynchronous request 
+-	 * @param exception
+-	 */
+-	public void onError(Exception exception);
+-
+-	/**
+-	 * Invoked after an asynchronous request has completed successfully. Callers
+-	 * have access to the original request object and the returned response
+-	 * object.
+-	 *
+-	 * @param request
+-	 *            The initial request created by the caller
+-	 * @param result
+-	 *            The successful result of the executed operation.
+-	 */
+-	public void onSuccess(REQUEST request, RESULT result);
+-
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/handlers/CredentialsRequestHandler.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/handlers/CredentialsRequestHandler.java
+--- ./src/main/java/com/amazonaws/handlers/CredentialsRequestHandler.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/handlers/CredentialsRequestHandler.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,42 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.handlers;
+-
+-import com.amazonaws.auth.AWSCredentials;
+-
+-/**
+- * A special type of
+- * RequestHandler2 that takes in AWSCredentials.
+- *
+- * @deprecated Use of this class to retrieve the credentials is unsafe in
+- * multithreading scenarios. If a client is used across multiple threads,
+- * there's a possibility of running into a race condition where one handler
+- * might access the credentials through the reference as another thread is
+- * updating it. Retrieve the credentials from the handler context instead using
+- * the {@link HandlerContextKey#AWS_CREDENTIALS} key.
+- */
+-@Deprecated
+-public abstract class CredentialsRequestHandler extends RequestHandler2 {
+-
+-    /** AWSCredentials to be used in the RequestHandler. */
+-    protected AWSCredentials awsCredentials;
+-
+-    /**
+-     * Sets the AWSCredentials.
+-     */
+-    public void setCredentials(AWSCredentials awsCredentials) {
+-        this.awsCredentials = awsCredentials;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/handlers/HandlerAfterAttemptContext.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/handlers/HandlerAfterAttemptContext.java
+--- ./src/main/java/com/amazonaws/handlers/HandlerAfterAttemptContext.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/handlers/HandlerAfterAttemptContext.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,146 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.handlers;
+-
+-import com.amazonaws.Request;
+-import com.amazonaws.Response;
+-
+-/**
+- * Contextual data for the RequestHandler2 afterAttempt callback
+- *
+- * Under certain conditions (redirects), both response and exception may be null
+- */
+-public final class HandlerAfterAttemptContext {
+-
+-    /**
+-     * The request being attempted
+-     */
+-    private final Request request;
+-
+-    /**
+-     * The response returned by the request; null if the request was not successful
+-     */
+-    private final Response response;
+-
+-    /**
+-     * Exception generated while processing the request; possibly null
+-     */
+-    private final Exception exception;
+-
+-    /**
+-     * Default constructor for the HandlerAfterAttemptContext class
+-     */
+-    private HandlerAfterAttemptContext(Request request, Response response, Exception exception) {
+-        this.request = request;
+-        this.response = response;
+-        this.exception = exception;
+-    }
+-
+-    /**
+-     * @return the request being attempted
+-     */
+-    public Request getRequest() {
+-        return request;
+-    }
+-
+-    /**
+-     * @return the response to the request or null if the attempt failed
+-     */
+-    public Response getResponse() {
+-        return response;
+-    }
+-
+-    /**
+-     * @return the exception that was generated while processing the request, or null if the attempt succeeded
+-     */
+-    public Exception getException() {
+-        return exception;
+-    }
+-
+-
+-    /**
+-     * @return a new builder for a HandlerAfterAttemptContext instance
+-     */
+-    public static HandlerAfterAttemptContextBuilder builder() {
+-        return new HandlerAfterAttemptContextBuilder();
+-    }
+-
+-    /**
+-     * Builder class for HandlerAfterAttemptContext
+-     */
+-    public static class HandlerAfterAttemptContextBuilder {
+-
+-        /**
+-         * The request being attempted
+-         */
+-        private Request request;
+-
+-        /**
+-         * The response returned by the request; null if the request was not successful
+-         */
+-        private Response response;
+-
+-        /**
+-         * Exception generated while processing the request; possibly null
+-         */
+-        private Exception exception;
+-
+-        /**
+-         * Default constructor
+-         */
+-        private HandlerAfterAttemptContextBuilder() {}
+-
+-        /**
+-         * Fluent set for what the request should be on the eventual HandlerAfterAttemptContext instance
+-         * @param request the request that was attempted
+-         * @return the modified builder
+-         */
+-        public HandlerAfterAttemptContextBuilder withRequest(Request request) {
+-            this.request = request;
+-
+-            return this;
+-        }
+-
+-        /**
+-         * Fluent set for what the response should be on the eventual HandlerAfterAttemptContext instance
+-         * @param response response from the request attempt, or null if there was an error
+-         * @return the modified builder
+-         */
+-        public HandlerAfterAttemptContextBuilder withResponse(Response response) {
+-            this.response = response;
+-
+-            return this;
+-        }
+-
+-        /**
+-         * Fluent set for what the exception should be on the eventual HandlerAfterAttemptContext instance
+-         * @param exception exception generated by the request attempt, or null if the attempt was succcessful
+-         * @return the modified builder
+-         */
+-        public HandlerAfterAttemptContextBuilder withException(Exception exception) {
+-            this.exception = exception;
+-
+-            return this;
+-        }
+-
+-        /**
+-         * @return a new HandlerAfterAttemptContext object
+-         */
+-        public HandlerAfterAttemptContext build() {
+-            return new HandlerAfterAttemptContext(request, response, exception);
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/handlers/HandlerBeforeAttemptContext.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/handlers/HandlerBeforeAttemptContext.java
+--- ./src/main/java/com/amazonaws/handlers/HandlerBeforeAttemptContext.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/handlers/HandlerBeforeAttemptContext.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,85 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.handlers;
+-
+-import com.amazonaws.Request;
+-
+-/**
+- * Contextual data for the RequestHandler2 beforeAttempt callback
+- */
+-public final class HandlerBeforeAttemptContext {
+-
+-    /**
+-     * The request being attempted
+-     */
+-    private final Request request;
+-
+-    /**
+-     * Default constructor for the HandlerBeforeAttemptContext object
+-     */
+-    private HandlerBeforeAttemptContext(Request request) {
+-        this.request = request;
+-    }
+-
+-    /**
+-     * @return the request that is about to be attempted
+-     */
+-    public Request getRequest() {
+-        return request;
+-    }
+-
+-
+-    /**
+-     * @return a new builder for a HandlerBeforeAttemptContext instance
+-     */
+-    public static HandlerBeforeAttemptContextBuilder builder() {
+-        return new HandlerBeforeAttemptContextBuilder();
+-    }
+-
+-    /**
+-     * Builder class for HandlerBeforeAttemptContext
+-     */
+-    public static class HandlerBeforeAttemptContextBuilder {
+-
+-        /**
+-         * The request being attempted
+-         */
+-        private Request request;
+-
+-        /**
+-         * Default constructor
+-         */
+-        private HandlerBeforeAttemptContextBuilder() {}
+-
+-        /**
+-         * Fluent set for what the request should be on the eventual HandlerBeforeAttemptContext instance
+-         * @param request the request that is to be attempted
+-         * @return the modified builder
+-         */
+-        public HandlerBeforeAttemptContextBuilder withRequest(Request request) {
+-            this.request = request;
+-
+-            return this;
+-        }
+-
+-        /**
+-         * @return a new HandlerBeforeAttemptContext object
+-         */
+-        public HandlerBeforeAttemptContext build() {
+-            return new HandlerBeforeAttemptContext(request);
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/handlers/HandlerChainFactory.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/handlers/HandlerChainFactory.java
+--- ./src/main/java/com/amazonaws/handlers/HandlerChainFactory.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/handlers/HandlerChainFactory.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,169 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.handlers;
+-
+-import com.amazonaws.AmazonClientException;
+-import com.amazonaws.util.ClassLoaderHelper;
+-import com.amazonaws.util.StringUtils;
+-import java.io.BufferedReader;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.io.InputStreamReader;
+-import java.net.URL;
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.Enumeration;
+-import java.util.List;
+-
+-/**
+- * Factory for creating request/response handler chains.
+- */
+-public class HandlerChainFactory {
+-
+-    private static final String GLOBAL_HANDLER_PATH = "com/amazonaws/global/handlers/request.handler2s";
+-
+-    /**
+-     * For backward compatibility, constructs a new request handler chain adapted to {@link RequestHandler2} by analyzing the
+-     * specified classpath resource.
+-     *
+-     * @param resource The resource to load from the classpath containing the list of request handlers to instantiate.
+-     * @return A list of request handlers based on the handlers referenced in the specified resource.
+-     */
+-    public List newRequestHandlerChain(String resource) {
+-        return createRequestHandlerChain(resource, RequestHandler.class);
+-    }
+-
+-    /**
+-     * Constructs a new request handler (v2) chain by analyzing the specified classpath resource.
+-     *
+-     * @param resource The resource to load from the classpath containing the list of request handlers to instantiate.
+-     * @return A list of request handlers based on the handlers referenced in the specified resource.
+-     */
+-    public List newRequestHandler2Chain(String resource) {
+-        return createRequestHandlerChain(resource, RequestHandler2.class);
+-    }
+-
+-    public List getGlobalHandlers() {
+-        List handlers = new ArrayList();
+-        BufferedReader fileReader = null;
+-
+-        try {
+-            List globalHandlerListLocations = Collections
+-                    .list(getGlobalHandlerResources());
+-
+-            for (URL url : globalHandlerListLocations) {
+-
+-                fileReader = new BufferedReader(new InputStreamReader(url.openStream(), StringUtils.UTF8));
+-                while (true) {
+-                    String requestHandlerClassName = fileReader.readLine();
+-                    if (requestHandlerClassName == null) {
+-                        break;
+-                    }
+-                    RequestHandler2 requestHandler = createRequestHandler(requestHandlerClassName, RequestHandler2.class);
+-                    if (requestHandler == null) {
+-                        continue;
+-                    }
+-                    handlers.add(requestHandler);
+-                }
+-            }
+-
+-        } catch (Exception e) {
+-            throw new AmazonClientException("Unable to instantiate request handler chain for client: "
+-                                            + e.getMessage(), e);
+-        } finally {
+-            try {
+-                if (fileReader != null) {
+-                    fileReader.close();
+-                }
+-            } catch (IOException e) {
+-            }
+-        }
+-        return handlers;
+-    }
+-
+-    private Enumeration getGlobalHandlerResources() throws IOException {
+-        // Classloader may be null if loaded by bootstrap classloader.
+-        if (HandlerChainFactory.class.getClassLoader() == null) {
+-            return ClassLoader.getSystemResources(GLOBAL_HANDLER_PATH);
+-        }
+-        return HandlerChainFactory.class.getClassLoader().getResources(GLOBAL_HANDLER_PATH);
+-    }
+-
+-    private RequestHandler2 createRequestHandler(String handlerClassName, Class handlerApiClass)
+-            throws ClassNotFoundException, InstantiationException, IllegalAccessException {
+-        handlerClassName = handlerClassName.trim();
+-        if (handlerClassName.equals("")) {
+-            return null;
+-        }
+-        Class requestHandlerClass = ClassLoaderHelper.loadClass(
+-                handlerClassName,
+-                handlerApiClass, getClass());
+-        Object requestHandlerObject = requestHandlerClass.newInstance();
+-        if (handlerApiClass.isInstance(requestHandlerObject)) {
+-            if (handlerApiClass == RequestHandler2.class) {
+-                return (RequestHandler2) requestHandlerObject;
+-
+-            } else if (handlerApiClass == RequestHandler.class) {
+-                return RequestHandler2.adapt((RequestHandler) requestHandlerObject);
+-
+-            } else {
+-                throw new IllegalStateException();
+-            }
+-        } else {
+-            throw new AmazonClientException(
+-                    "Unable to instantiate request handler chain for client.  "
+-                    + "Listed request handler ('"
+-                    + handlerClassName + "') "
+-                    + "does not implement the "
+-                    + handlerApiClass + " API.");
+-        }
+-    }
+-
+-    private List createRequestHandlerChain(String resource, Class handlerApiClass) {
+-        List handlers = new ArrayList();
+-        BufferedReader reader = null;
+-
+-        try {
+-            InputStream input = getClass().getResourceAsStream(resource);
+-            if (input == null) {
+-                return handlers;
+-            }
+-
+-            reader = new BufferedReader(new InputStreamReader(input, StringUtils.UTF8));
+-            while (true) {
+-                String requestHandlerClassName = reader.readLine();
+-                if (requestHandlerClassName == null) {
+-                    break;
+-                }
+-                RequestHandler2 requestHandler = createRequestHandler(requestHandlerClassName, handlerApiClass);
+-                if (requestHandler == null) {
+-                    continue;
+-                }
+-                handlers.add(requestHandler);
+-            }
+-        } catch (Exception e) {
+-            throw new AmazonClientException("Unable to instantiate request handler chain for client: "
+-                                            + e.getMessage(), e);
+-        } finally {
+-            try {
+-                if (reader != null) {
+-                    reader.close();
+-                }
+-            } catch (IOException e) {
+-            }
+-        }
+-        return handlers;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/handlers/HandlerContextKey.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/handlers/HandlerContextKey.java
+--- ./src/main/java/com/amazonaws/handlers/HandlerContextKey.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/handlers/HandlerContextKey.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,85 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.handlers;
+-
+-import com.amazonaws.auth.AWSCredentials;
+-
+-/**
+- * A type safe key used for setting and retrieving context in a {@link
+- * com.amazonaws.Request} object.
+- *
+- * 
+- *     final HandlerContextKey METRICS_KEY = new HandlerContextKey("METRICS_KEY");
+- *
+- *      new RequestHandler2(){
+- *
+- *          @Override
+- *          public void beforeRequest(Request request) {
+- *              request.addHandlerContext(METRICS_KEY, AWSRequestMetrics
+- *                                                  .Field.HttpRequestTime.name());
+- *          }
+- *
+- *          @Override
+- *          public void afterResponse(Request request, Response response) {
+- *              String metricsKey = request.getHandlerContext(METRICS_KEY);
+- *          }
+- *
+- *          @Override
+- *          public void afterError(Request request, Response response,
+- *          Exception e) { }
+- *      }
+- * 

+- */
+-public class HandlerContextKey {
+-
+-    /**
+-     * The key under which the request credentials are set.
+-     **/
+-    public static final HandlerContextKey AWS_CREDENTIALS = new HandlerContextKey("AWSCredentials");
+-
+-    /**
+-     * The region used to sign the request.
+-     */
+-    public static final HandlerContextKey SIGNING_REGION = new HandlerContextKey("SigningRegion");
+-
+-    private final String name;
+-
+-    public HandlerContextKey(String name) {
+-        if (name == null) {
+-            throw new IllegalArgumentException("Name cannot be null");
+-        }
+-        this.name = name;
+-    }
+-
+-    @Override
+-    public boolean equals(Object o) {
+-        if (this == o) return true;
+-        if (o == null || getClass() != o.getClass()) return false;
+-
+-        HandlerContextKey key = (HandlerContextKey) o;
+-
+-        return name.equals(key.getName());
+-
+-    }
+-
+-    public String getName() {
+-        return name;
+-    }
+-
+-    @Override
+-    public int hashCode() {
+-        return name.hashCode();
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/handlers/IRequestHandler2.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/handlers/IRequestHandler2.java
+--- ./src/main/java/com/amazonaws/handlers/IRequestHandler2.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/handlers/IRequestHandler2.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,140 +0,0 @@
+-/*
+- * Copyright (c) 2016. Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.handlers;
+-
+-import com.amazonaws.AmazonServiceException;
+-import com.amazonaws.AmazonWebServiceRequest;
+-import com.amazonaws.Request;
+-import com.amazonaws.Response;
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.http.HttpResponse;
+-
+-/**
+- * Interface for {@link RequestHandler2}. Do not use this outside the core SDK. We can and will add
+- * methods to this interface in the future. Extend {@link RequestHandler2} to implement a custom
+- * request handler.
+- */
+-@SdkInternalApi
+-public interface IRequestHandler2 {
+-    /**
+-     * Runs any additional processing logic on the specified request object as soon as the request
+-     * is provided to the service client.
+-     *
+-     * 
This request handler is excluded from the client execution time metrics and is run on the
+-     * application's thread, even for asynchronous requests.

+-     *
+-     * 
Warning: Modifications to this message will leak out to the user, who might reuse the request
+-     * object without realizing that it was modified as part of sending it the first time. For this
+-     * reason, we recommend that you only modify the request in the {@link #beforeRequest(Request)}
+-     * method. If you require data that is not available in that method, you should create a
+-     * {@link AmazonWebServiceRequest#clone()} of the request (which performs a deep copy of the
+-     * handler context map), add any context data you require in the {@link #beforeRequest(Request)}
+-     * method using {@link AmazonWebServiceRequest#addHandlerContext(HandlerContextKey, Object)}, and
+-     * return your cloned message from this method. You can then extract that data for use in the
+-     * request using {@link Request#getHandlerContext(HandlerContextKey)}.

+-     *
+-     * @param request the request passed in by the user
+-     * @return the (possibly different) request to execute
+-     */
+-    AmazonWebServiceRequest beforeExecution(AmazonWebServiceRequest request);
+-
+-    /**
+-     * Runs any additional processing logic on the specified request object before it is marshaled
+-     * into an HTTP request.
+-     *
+-     * 
Warning: Modifications to this message will leak out to the user, who might reuse the request
+-     * object without realizing that it was modified as part of sending it the first time. For this
+-     * reason, we recommend that you only modify the request in the {@link #beforeRequest(Request)}
+-     * method. If you require data that is not available in that method, you should create a
+-     * {@link AmazonWebServiceRequest#clone()} of the request (which performs a deep copy of the
+-     * handler context map), add any context data you require in the {@link #beforeRequest(Request)}
+-     * method using {@link AmazonWebServiceRequest#addHandlerContext(HandlerContextKey, Object)}, and
+-     * return your cloned message from this method. You can then extract that data for use in the
+-     * request using {@link Request#getHandlerContext(HandlerContextKey)}.

+-     *
+-     * @param request
+-     *            the request passed in by the user
+-     * @return the (possibly different) request to marshal
+-     */
+-    AmazonWebServiceRequest beforeMarshalling(AmazonWebServiceRequest request);
+-
+-    /**
+-     * Runs any additional processing logic on the specified request (before it is executed by the
+-     * client runtime).
+-     *
+-     * @param request
+-     *            The low level request being processed.
+-     */
+-    void beforeRequest(Request request);
+-
+-    /**
+-     * Runs any additional processing logic on a request before each individual attempt is made.
+-     *
+-     * @param context
+-     *              container for callback-related data; includes the request
+-     */
+-    void beforeAttempt(HandlerBeforeAttemptContext context);
+-
+-    /**
+-     * Runs any additional processing logic on the specified response before it's unmarshalled. This
+-     * callback is only invoked on successful responses that will be unmarshalled into an
+-     * appropriate modeled class and not for unsuccessful responses that will be unmarshalled into a
+-     * subclass of {@link AmazonServiceException}
+-     *
+-     * @param request
+-     *            The low level request being processed.
+-     * @param httpResponse
+-     *            The Raw HTTP response before being unmarshalled
+-     * @return {@link HttpResponse} to replace the actual response. May be a mutated version of the
+-     *         original or a completely new {@link HttpResponse} object
+-     */
+-    HttpResponse beforeUnmarshalling(Request request, HttpResponse httpResponse);
+-
+-    /**
+-     * Runs any additional processing logic on a request after each individual attempt.  Callback is
+-     * invoked whether or not the attempt resulted in a successful response or an error.  This callback
+-     * is invoked within a finally block and so any exceptions it generates will "replace" the current
+-     * exception, if one is outstanding.
+-     *
+-     * @param context
+-     *              container for the request as well as all possible results of the attempt
+-     */
+-    void afterAttempt(HandlerAfterAttemptContext context);
+-
+-    /**
+-     * Runs any additional processing logic on the specified request (after is has been executed by
+-     * the client runtime).
+-     *
+-     * @param request
+-     *            The low level request being processed.
+-     * @param response
+-     *            The response generated from the specified request.
+-     */
+-    void afterResponse(Request request, Response response);
+-
+-    /**
+-     * Runs any additional processing logic on a request after it has failed.  This callback is invoked
+-     * from a catch block.  If it generates an exception, the original AmazonClientException will be lost.
+-     *
+-     * @param request
+-     *            The request that generated an error.
+-     * @param response
+-     *            the response or null if the failure occurred before the response is made available
+-     * @param e
+-     *            The error that resulted from executing the request.
+-     */
+-    void afterError(Request request, Response response, Exception e);
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/handlers/RequestHandler2Adaptor.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/handlers/RequestHandler2Adaptor.java
+--- ./src/main/java/com/amazonaws/handlers/RequestHandler2Adaptor.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/handlers/RequestHandler2Adaptor.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,68 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.handlers;
+-
+-import com.amazonaws.Request;
+-import com.amazonaws.Response;
+-import com.amazonaws.util.AWSRequestMetrics;
+-import com.amazonaws.util.TimingInfo;
+-
+-/**
+- * Internal class used to adapt a request handler that implements the
+- * deprecated {@link RequestHandler} interface to the deprecating
+- * {@link RequestHandler2} interface.
+- */
+-final class RequestHandler2Adaptor extends RequestHandler2 {
+-    @SuppressWarnings("deprecation")
+-    private final RequestHandler old;
+-    RequestHandler2Adaptor(@SuppressWarnings("deprecation") RequestHandler old) {
+-        if (old == null)
+-            throw new IllegalArgumentException();
+-        this.old = old;
+-    }
+-    @SuppressWarnings("deprecation")
+-    @Override public void beforeRequest(Request request) {
+-        old.beforeRequest(request);
+-    }
+-
+-    @SuppressWarnings("deprecation")
+-    @Override
+-    public void afterResponse(Request request, Response response) {
+-        AWSRequestMetrics awsRequestMetrics = request == null ? null : request
+-                .getAWSRequestMetrics();
+-        Object awsResponse = response == null ? null : response
+-                .getAwsResponse();
+-        TimingInfo timingInfo = awsRequestMetrics == null ? null
+-                : awsRequestMetrics.getTimingInfo();
+-        old.afterResponse(request, awsResponse, timingInfo);
+-    }
+-
+-    @SuppressWarnings("deprecation")
+-    @Override public void afterError(Request request, Response response,
+-            Exception e) {
+-        old.afterError(request, e);
+-    }
+-
+-    @Override public int hashCode() {
+-        return old.hashCode();
+-    }
+-
+-    @Override public boolean equals(Object o) {
+-        if (!(o instanceof RequestHandler2Adaptor))
+-            return false;
+-        RequestHandler2Adaptor that = (RequestHandler2Adaptor)o;
+-        return this.old.equals(that.old);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/handlers/RequestHandler2.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/handlers/RequestHandler2.java
+--- ./src/main/java/com/amazonaws/handlers/RequestHandler2.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/handlers/RequestHandler2.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,77 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.handlers;
+-
+-import com.amazonaws.AmazonWebServiceRequest;
+-import com.amazonaws.Request;
+-import com.amazonaws.Response;
+-import com.amazonaws.http.HttpResponse;
+-import com.amazonaws.util.TimingInfo;
+-
+-/**
+- * Interface for addition request handling in clients. A request handler is executed on a request
+- * object before it is sent to the client runtime to be executed.
+- * 

+- * This interface deprecates {@link RequestHandler} by providing access to not only the AWS
+- * response, but also the associated http response via {@link Response}.
+- * 

+- * Note {@link TimingInfo} is accessible via {@link Request#getAWSRequestMetrics()} and hence is
+- * omitted from the interface to reduce duplication by design.
+- */
+-public abstract class RequestHandler2 implements IRequestHandler2 {
+-
+-    @Override
+-    public AmazonWebServiceRequest beforeExecution(AmazonWebServiceRequest request) {
+-        return request;
+-    }
+-
+-    @Override
+-    public AmazonWebServiceRequest beforeMarshalling(AmazonWebServiceRequest request) {
+-        return request;
+-    }
+-
+-    @Override
+-    public void beforeRequest(Request request) {
+-    }
+-
+-    @Override
+-    public void beforeAttempt(HandlerBeforeAttemptContext context) {
+-    }
+-
+-    @Override
+-    public HttpResponse beforeUnmarshalling(Request request, HttpResponse httpResponse) {
+-        return httpResponse;
+-    }
+-
+-    @Override
+-    public void afterAttempt(HandlerAfterAttemptContext context) {
+-    }
+-
+-    @Override
+-    public void afterResponse(Request request, Response response) {
+-    }
+-
+-    @Override
+-    public void afterError(Request request, Response response, Exception e) {
+-    }
+-
+-    /**
+-     * Returns an instance of request handler adapted to the {@link RequestHandler2} interface from
+-     * the given request handler implementing the deprecated {@link RequestHandler} interface.
+-     */
+-    public static RequestHandler2 adapt(@SuppressWarnings("deprecation") RequestHandler old) {
+-        return new RequestHandler2Adaptor(old);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/handlers/RequestHandler.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/handlers/RequestHandler.java
+--- ./src/main/java/com/amazonaws/handlers/RequestHandler.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/handlers/RequestHandler.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,62 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.handlers;
+-
+-import com.amazonaws.Request;
+-import com.amazonaws.util.TimingInfo;
+-
+-/**
+- * @deprecated by {@link RequestHandler2}.
+- *  
+- * Interface for addition request handling in clients. A request handler is
+- * executed on a request object before it is sent to the client runtime
+- * to be executed.
+- */
+-@Deprecated
+-public interface RequestHandler {
+-
+-    /**
+-     * Runs any additional processing logic on the specified request (before it
+-     * is executed by the client runtime).
+-     *
+-     * @param request
+-     *            The low level request being processed.
+-     */
+-    public void beforeRequest(Request request);
+-
+-	/**
+-	 * Runs any additional processing logic on the specified request (after is
+-	 * has been executed by the client runtime).
+-	 *
+-	 * @param request
+-	 *            The low level request being processed.
+-	 * @param response
+-	 *            The response generated from the specified request.
+-	 * @param timingInfo
+-	 *            Timing information on the request's processing.
+-	 */
+-    public void afterResponse(Request request, Object response, TimingInfo timingInfo);
+-
+-	/**
+-	 * Runs any additional processing logic on a request after it has failed.
+-	 *
+-	 * @param request
+-	 *            The request that generated an error.
+-	 * @param e
+-	 *            The error that resulted from executing the request.
+-	 */
+-    public void afterError(Request request, Exception e);
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/handlers/StackedRequestHandler.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/handlers/StackedRequestHandler.java
+--- ./src/main/java/com/amazonaws/handlers/StackedRequestHandler.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/handlers/StackedRequestHandler.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,131 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.handlers;
+-
+-import com.amazonaws.AmazonWebServiceRequest;
+-import com.amazonaws.Request;
+-import com.amazonaws.Response;
+-import com.amazonaws.annotation.ThreadSafe;
+-import com.amazonaws.http.HttpResponse;
+-import com.amazonaws.util.ValidationUtils;
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.Collections;
+-import java.util.List;
+-
+-/**
+- * Composite {@link RequestHandler2} to execute a chain of {@link RequestHandler2} implementations
+- * in stack order. That is if you have request handlers R1, R2, R3 the order of execution is as
+- * follows
+- * 
+- * 
+- *    
+- * {@code   
+- * R1.beforeMarshalling   
+- * R2.beforeMarshalling   
+- * R3.beforeMarshalling   
+- *    
+- * R1.beforeRequest   
+- * R2.beforeRequest   
+- * R3.beforeRequest   
+- *    
+- * R3.beforeUnmarshalling
+- * R2.beforeUnmarshalling
+- * R1.beforeUnmarshalling
+- * 
+- * R3.after(Response|Error)   
+- * R2.after(Response|Error)   
+- * R1.after(Response|Error)   
+- * }
+- * 

+- */
+-@ThreadSafe
+-public class StackedRequestHandler implements IRequestHandler2 {
+-
+-    private final List inOrderRequestHandlers;
+-    private final List reverseOrderRequestHandlers;
+-
+-    public StackedRequestHandler(RequestHandler2...requestHandlers) {
+-       this(Arrays.asList(ValidationUtils.assertNotNull(requestHandlers, "requestHandlers")));
+-    }
+-
+-    public StackedRequestHandler(List requestHandlers) {
+-        this.inOrderRequestHandlers = ValidationUtils.assertNotNull(requestHandlers, "requestHandlers");
+-        this.reverseOrderRequestHandlers = new ArrayList(requestHandlers);
+-        Collections.reverse(reverseOrderRequestHandlers);
+-    }
+-
+-    @Override
+-    public AmazonWebServiceRequest beforeExecution(AmazonWebServiceRequest origRequest) {
+-        AmazonWebServiceRequest toReturn = origRequest;
+-        for (RequestHandler2 handler : inOrderRequestHandlers) {
+-            toReturn = handler.beforeExecution(toReturn);
+-        }
+-        return toReturn;
+-    }
+-
+-    @Override
+-    public AmazonWebServiceRequest beforeMarshalling(AmazonWebServiceRequest origRequest) {
+-        AmazonWebServiceRequest toReturn = origRequest;
+-        for (RequestHandler2 handler : inOrderRequestHandlers) {
+-            toReturn = handler.beforeMarshalling(toReturn);
+-        }
+-        return toReturn;
+-    }
+-
+-    @Override
+-    public void beforeRequest(Request request) {
+-        for (RequestHandler2 handler : inOrderRequestHandlers) {
+-            handler.beforeRequest(request);
+-        }
+-    }
+-
+-    @Override
+-    public void beforeAttempt(HandlerBeforeAttemptContext context) {
+-        for (RequestHandler2 handler : inOrderRequestHandlers) {
+-            handler.beforeAttempt(context);
+-        }
+-    }
+-
+-    @Override
+-    public HttpResponse beforeUnmarshalling(Request request, HttpResponse origHttpResponse) {
+-        HttpResponse toReturn = origHttpResponse;
+-        for(RequestHandler2 handler : reverseOrderRequestHandlers) {
+-            toReturn = handler.beforeUnmarshalling(request, toReturn);
+-        }
+-        return toReturn;
+-    }
+-
+-    @Override
+-    public void afterAttempt(HandlerAfterAttemptContext context) {
+-        for(RequestHandler2 handler : reverseOrderRequestHandlers) {
+-            handler.afterAttempt(context);
+-        }
+-    }
+-
+-    @Override
+-    public void afterResponse(Request request, Response response) {
+-        for(RequestHandler2 handler : reverseOrderRequestHandlers) {
+-            handler.afterResponse(request, response);
+-        }
+-    }
+-
+-    @Override
+-    public void afterError(Request request, Response response, Exception e) {
+-        for(RequestHandler2 handler : reverseOrderRequestHandlers) {
+-            handler.afterError(request, response, e);
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/AmazonHttpClient.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/AmazonHttpClient.java
+--- ./src/main/java/com/amazonaws/http/AmazonHttpClient.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/AmazonHttpClient.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,1846 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http;
+-
+-import static com.amazonaws.SDKGlobalConfiguration.PROFILING_SYSTEM_PROPERTY;
+-import static com.amazonaws.event.SDKProgressPublisher.publishProgress;
+-import static com.amazonaws.event.SDKProgressPublisher.publishRequestContentLength;
+-import static com.amazonaws.event.SDKProgressPublisher.publishResponseContentLength;
+-import static com.amazonaws.util.AWSRequestMetrics.Field.HttpClientPoolAvailableCount;
+-import static com.amazonaws.util.AWSRequestMetrics.Field.HttpClientPoolLeasedCount;
+-import static com.amazonaws.util.AWSRequestMetrics.Field.HttpClientPoolPendingCount;
+-import static com.amazonaws.util.AWSRequestMetrics.Field.ThrottledRetryCount;
+-import static com.amazonaws.util.IOUtils.closeQuietly;
+-
+-import com.amazonaws.AbortedException;
+-import com.amazonaws.AmazonClientException;
+-import com.amazonaws.AmazonServiceException;
+-import com.amazonaws.AmazonWebServiceRequest;
+-import com.amazonaws.AmazonWebServiceResponse;
+-import com.amazonaws.ClientConfiguration;
+-import com.amazonaws.Request;
+-import com.amazonaws.RequestClientOptions;
+-import com.amazonaws.RequestClientOptions.Marker;
+-import com.amazonaws.RequestConfig;
+-import com.amazonaws.ResetException;
+-import com.amazonaws.Response;
+-import com.amazonaws.ResponseMetadata;
+-import com.amazonaws.SDKGlobalTime;
+-import com.amazonaws.SdkBaseException;
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.annotation.SdkTestInternalApi;
+-import com.amazonaws.annotation.ThreadSafe;
+-import com.amazonaws.auth.AWSCredentials;
+-import com.amazonaws.auth.AWSCredentialsProvider;
+-import com.amazonaws.auth.CanHandleNullCredentials;
+-import com.amazonaws.auth.Signer;
+-import com.amazonaws.event.ProgressEventType;
+-import com.amazonaws.event.ProgressInputStream;
+-import com.amazonaws.event.ProgressListener;
+-import com.amazonaws.handlers.CredentialsRequestHandler;
+-import com.amazonaws.handlers.HandlerAfterAttemptContext;
+-import com.amazonaws.handlers.HandlerBeforeAttemptContext;
+-import com.amazonaws.handlers.HandlerContextKey;
+-import com.amazonaws.handlers.RequestHandler2;
+-import com.amazonaws.http.apache.client.impl.ApacheHttpClientFactory;
+-import com.amazonaws.http.apache.client.impl.ConnectionManagerAwareHttpClient;
+-import com.amazonaws.http.apache.request.impl.ApacheHttpRequestFactory;
+-import com.amazonaws.http.apache.utils.ApacheUtils;
+-import com.amazonaws.http.client.HttpClientFactory;
+-import com.amazonaws.http.exception.HttpRequestTimeoutException;
+-import com.amazonaws.http.request.HttpRequestFactory;
+-import com.amazonaws.http.response.AwsResponseHandlerAdapter;
+-import com.amazonaws.http.settings.HttpClientSettings;
+-import com.amazonaws.http.timers.client.ClientExecutionAbortTrackerTask;
+-import com.amazonaws.http.timers.client.ClientExecutionTimeoutException;
+-import com.amazonaws.http.timers.client.ClientExecutionTimer;
+-import com.amazonaws.http.timers.client.SdkInterruptedException;
+-import com.amazonaws.http.timers.request.HttpRequestAbortTaskTracker;
+-import com.amazonaws.http.timers.request.HttpRequestTimer;
+-import com.amazonaws.internal.AmazonWebServiceRequestAdapter;
+-import com.amazonaws.internal.CRC32MismatchException;
+-import com.amazonaws.internal.ReleasableInputStream;
+-import com.amazonaws.internal.ResettableInputStream;
+-import com.amazonaws.internal.SdkBufferedInputStream;
+-import com.amazonaws.internal.auth.SignerProviderContext;
+-import com.amazonaws.metrics.AwsSdkMetrics;
+-import com.amazonaws.metrics.RequestMetricCollector;
+-import com.amazonaws.retry.RetryPolicyAdapter;
+-import com.amazonaws.retry.RetryUtils;
+-import com.amazonaws.retry.internal.AuthErrorRetryStrategy;
+-import com.amazonaws.retry.internal.AuthRetryParameters;
+-import com.amazonaws.retry.v2.RetryPolicy;
+-import com.amazonaws.retry.v2.RetryPolicyContext;
+-import com.amazonaws.util.AWSRequestMetrics;
+-import com.amazonaws.util.AWSRequestMetrics.Field;
+-import com.amazonaws.util.CapacityManager;
+-import com.amazonaws.util.CollectionUtils;
+-import com.amazonaws.util.CountingInputStream;
+-import com.amazonaws.util.DateUtils;
+-import com.amazonaws.util.FakeIOException;
+-import com.amazonaws.util.ImmutableMapParameter;
+-import com.amazonaws.util.MetadataCache;
+-import com.amazonaws.util.NullResponseMetadataCache;
+-import com.amazonaws.util.ResponseMetadataCache;
+-import com.amazonaws.util.RuntimeHttpUtils;
+-import com.amazonaws.util.SdkHttpUtils;
+-import com.amazonaws.util.UnreliableFilterInputStream;
+-import java.io.BufferedInputStream;
+-import java.io.FileInputStream;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.net.URI;
+-import java.util.Arrays;
+-import java.util.Collections;
+-import java.util.Date;
+-import java.util.HashMap;
+-import java.util.LinkedHashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Map.Entry;
+-import java.util.Random;
+-import java.util.UUID;
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-import org.apache.http.Header;
+-import org.apache.http.HttpEntity;
+-import org.apache.http.HttpEntityEnclosingRequest;
+-import org.apache.http.HttpStatus;
+-import org.apache.http.StatusLine;
+-import org.apache.http.client.methods.HttpRequestBase;
+-import org.apache.http.client.protocol.HttpClientContext;
+-import org.apache.http.entity.BufferedHttpEntity;
+-import org.apache.http.pool.ConnPoolControl;
+-import org.apache.http.pool.PoolStats;
+-import org.apache.http.protocol.HttpContext;
+-
+-@ThreadSafe
+-public class AmazonHttpClient {
+-    public static final String HEADER_USER_AGENT = "User-Agent";
+-    public static final String HEADER_SDK_TRANSACTION_ID = "amz-sdk-invocation-id";
+-    public static final String HEADER_SDK_RETRY_INFO = "amz-sdk-retry";
+-    /**
+-     * Logger for more detailed debugging information, that might not be as useful for end users
+-     * (ex: HTTP client configuration, etc).
+-     */
+-    static final Log log = LogFactory.getLog(AmazonHttpClient.class);
+-
+-    /**
+-     * Logger providing detailed information on requests/responses. Users can enable this logger to
+-     * get access to AWS request IDs for responses, individual requests and parameters sent to AWS,
+-     * etc.
+-     */
+-    @SdkInternalApi
+-    public static final Log requestLog = LogFactory.getLog("com.amazonaws.request");
+-
+-    private static final HttpClientFactory httpClientFactory = new
+-            ApacheHttpClientFactory();
+-    /**
+-     * Used for testing via failure injection.
+-     */
+-    private static UnreliableTestConfig unreliableTestConfig;
+-
+-    /**
+-     * When throttled retries are enabled, each retry attempt will consume this much capacity.
+-     * Successful retry attempts will release this capacity back to the pool while failed retries
+-     * will not.  Successful initial (non-retry) requests will always release 1 capacity unit to the
+-     * pool.
+-     */
+-    private static final int THROTTLED_RETRY_COST = 5;
+-
+-    static {
+-        // Customers have reported XML parsing issues with the following
+-        // JVM versions, which don't occur with more recent versions, so
+-        // if we detect any of these, give customers a heads up.
+-        // https://bugs.openjdk.java.net/browse/JDK-8028111
+-        List problematicJvmVersions = Arrays
+-                .asList("1.6.0_06", "1.6.0_13", "1.6.0_17", "1.6.0_65", "1.7.0_45");
+-        String jvmVersion = System.getProperty("java.version");
+-        if (problematicJvmVersions.contains(jvmVersion)) {
+-            log.warn("Detected a possible problem with the current JVM version (" + jvmVersion +
+-                     ").  " +
+-                     "If you experience XML parsing problems using the SDK, try upgrading to a more recent JVM update.");
+-        }
+-    }
+-
+-    private final HttpRequestFactory httpRequestFactory =
+-            new ApacheHttpRequestFactory();
+-    /**
+-     * Internal client for sending HTTP requests
+-     */
+-    private ConnectionManagerAwareHttpClient httpClient;
+-    /**
+-     * Client configuration options, such as proxy httpClientSettings, max retries, etc.
+-     */
+-    private final ClientConfiguration config;
+-
+-    private final RetryPolicy retryPolicy;
+-
+-    /**
+-     * Client configuration options, such as proxy httpClientSettings, max retries, etc.
+-     */
+-    private final HttpClientSettings httpClientSettings;
+-    /**
+-     * Cache of metadata for recently executed requests for diagnostic purposes
+-     */
+-    private final MetadataCache responseMetadataCache;
+-    /**
+-     * Timer to enforce HTTP request timeouts.
+-     */
+-    private final HttpRequestTimer httpRequestTimer;
+-
+-    /**
+-     * Retry capacity manager, used to manage throttled retry resource
+-     */
+-    private final CapacityManager retryCapacity;
+-
+-    /**
+-     * Timer to enforce timeouts on the whole execution of the request (request handlers, retries,
+-     * backoff strategy, unmarshalling, etc)
+-     */
+-    private final ClientExecutionTimer clientExecutionTimer;
+-    /**
+-     * A request metric collector used specifically for this httpClientSettings client; or null if
+-     * there is none. This collector, if specified, always takes precedence over the one specified
+-     * at the AWS SDK level.
+-     *
+-     * @see AwsSdkMetrics
+-     */
+-    private final RequestMetricCollector requestMetricCollector;
+-
+-    /**
+-     * Used to generate UUID's for client transaction id. This gives a higher probability of id
+-     * clashes but is more performant then using {@link UUID#randomUUID()} which uses SecureRandom
+-     * internally.
+-     **/
+-    private final Random random = new Random();
+-
+-    /**
+-     * The time difference in seconds between this client and AWS.
+-     */
+-    private volatile int timeOffset = SDKGlobalTime.getGlobalTimeOffset();
+-
+-    /**
+-     * Constructs a new AWS client using the specified client configuration options (ex: max retry
+-     * attempts, proxy httpClientSettings, etc).
+-     *
+-     * @param config Configuration options specifying how this client will communicate with AWS (ex:
+-     *               proxy httpClientSettings, retry count, etc.).
+-     */
+-    public AmazonHttpClient(ClientConfiguration config) {
+-        this(config, null);
+-    }
+-
+-    /**
+-     * Constructs a new AWS client using the specified client configuration options (ex: max retry
+-     * attempts, proxy httpClientSettings, etc), and request metric collector.
+-     *
+-     * @param config                 Configuration options specifying how this client will
+-     *                               communicate with AWS (ex: proxy httpClientSettings, retry
+-     *                               count, etc.).
+-     * @param requestMetricCollector client specific request metric collector, which takes
+-     *                               precedence over the one at the AWS SDK level; or null if there
+-     *                               is none.
+-     */
+-    public AmazonHttpClient(ClientConfiguration config,
+-                            RequestMetricCollector requestMetricCollector) {
+-        this(config, requestMetricCollector, false);
+-    }
+-
+-    /**
+-     * Constructs a new AWS client using the specified client configuration options (ex: max retry
+-     * attempts, proxy httpClientSettings, etc), and request metric collector.
+-     *
+-     * @param config                 Configuration options specifying how this client will
+-     *                               communicate with AWS (ex: proxy httpClientSettings, retry
+-     *                               count, etc.).
+-     * @param requestMetricCollector client specific request metric collector, which takes
+-     *                               precedence over the one at the AWS SDK level; or null if there
+-     *                               is none.
+-     */
+-    public AmazonHttpClient(ClientConfiguration config,
+-                            RequestMetricCollector requestMetricCollector,
+-                            boolean useBrowserCompatibleHostNameVerifier) {
+-        this(config, requestMetricCollector, useBrowserCompatibleHostNameVerifier, false);
+-    }
+-
+-    /**
+-     * Constructs a new AWS client using the specified client configuration options (ex: max retry
+-     * attempts, proxy httpClientSettings, etc), and request metric collector.
+-     *
+-     * @param config                           Configuration options specifying how this client will
+-     *                                         communicate with AWS (ex: proxy httpClientSettings,
+-     *                                         retry count, etc.).
+-     * @param requestMetricCollector           client specific request metric collector, which takes
+-     *                                         precedence over the one at the AWS SDK level; or null
+-     *                                         if there is none.
+-     * @param calculateCRC32FromCompressedData The flag indicating whether the CRC32 checksum is
+-     *                                         calculated from compressed data or not. It is only
+-     *                                         applicable when the header "x-amz-crc32" is set in
+-     *                                         the response.
+-     */
+-    public AmazonHttpClient(ClientConfiguration config,
+-                            RequestMetricCollector requestMetricCollector,
+-                            boolean useBrowserCompatibleHostNameVerifier,
+-                            boolean calculateCRC32FromCompressedData) {
+-        this(config,
+-             null,
+-             requestMetricCollector,
+-             useBrowserCompatibleHostNameVerifier,
+-             calculateCRC32FromCompressedData);
+-    }
+-
+-    private AmazonHttpClient(ClientConfiguration config,
+-                             RetryPolicy retryPolicy,
+-                             RequestMetricCollector requestMetricCollector,
+-                             boolean useBrowserCompatibleHostNameVerifier,
+-                             boolean calculateCRC32FromCompressedData) {
+-        this(config,
+-             retryPolicy,
+-             requestMetricCollector,
+-             HttpClientSettings.adapt(config, useBrowserCompatibleHostNameVerifier, calculateCRC32FromCompressedData));
+-        this.httpClient = httpClientFactory.create(this.httpClientSettings);
+-    }
+-
+-    /**
+-     * Package-protected constructor for unit test purposes.
+-     */
+-    @SdkTestInternalApi
+-    public AmazonHttpClient(ClientConfiguration clientConfig,
+-                            ConnectionManagerAwareHttpClient httpClient,
+-                            RequestMetricCollector requestMetricCollector) {
+-        this(clientConfig,
+-             null,
+-             requestMetricCollector,
+-             HttpClientSettings.adapt(clientConfig, false));
+-        this.httpClient = httpClient;
+-    }
+-
+-    private AmazonHttpClient(ClientConfiguration clientConfig,
+-                             RetryPolicy retryPolicy,
+-                             RequestMetricCollector requestMetricCollector,
+-                             HttpClientSettings httpClientSettings) {
+-        this.config = clientConfig;
+-        this.retryPolicy =
+-                retryPolicy == null ? new RetryPolicyAdapter(clientConfig.getRetryPolicy(), clientConfig) : retryPolicy;
+-        this.httpClientSettings = httpClientSettings;
+-        this.requestMetricCollector = requestMetricCollector;
+-        this.responseMetadataCache =
+-                clientConfig.getCacheResponseMetadata() ?
+-                        new ResponseMetadataCache(clientConfig.getResponseMetadataCacheSize()) :
+-                        new NullResponseMetadataCache();
+-        this.httpRequestTimer = new HttpRequestTimer();
+-        this.clientExecutionTimer = new ClientExecutionTimer();
+-
+-        // When enabled, total retry capacity is computed based on retry cost
+-        // and desired number of retries.
+-        int throttledRetryMaxCapacity = clientConfig.useThrottledRetries()
+-                ? THROTTLED_RETRY_COST * config.getMaxConsecutiveRetriesBeforeThrottling() : -1;
+-        this.retryCapacity = new CapacityManager(throttledRetryMaxCapacity);
+-    }
+-
+-    public static Builder builder() {
+-        return new Builder();
+-    }
+-
+-    public static class Builder {
+-
+-        private ClientConfiguration clientConfig;
+-        private RetryPolicy retryPolicy;
+-        private RequestMetricCollector requestMetricCollector;
+-        private boolean useBrowserCompatibleHostNameVerifier;
+-        private boolean calculateCRC32FromCompressedData;
+-
+-        private Builder() {
+-        }
+-
+-        public Builder clientConfiguration(ClientConfiguration clientConfig) {
+-            this.clientConfig = clientConfig;
+-            return this;
+-        }
+-
+-        public Builder retryPolicy(RetryPolicy retryPolicy) {
+-            this.retryPolicy = retryPolicy;
+-            return this;
+-        }
+-
+-        public Builder requestMetricCollector(RequestMetricCollector requestMetricCollector) {
+-            this.requestMetricCollector = requestMetricCollector;
+-            return this;
+-        }
+-
+-        public Builder useBrowserCompatibleHostNameVerifier(boolean useBrowserCompatibleHostNameVerifier) {
+-            this.useBrowserCompatibleHostNameVerifier = useBrowserCompatibleHostNameVerifier;
+-            return this;
+-        }
+-
+-        public Builder calculateCRC32FromCompressedData(boolean calculateCRC32FromCompressedData) {
+-            this.calculateCRC32FromCompressedData = calculateCRC32FromCompressedData;
+-            return this;
+-        }
+-
+-        public AmazonHttpClient build() {
+-            return new AmazonHttpClient(clientConfig,
+-                                        retryPolicy,
+-                                        requestMetricCollector,
+-                                        useBrowserCompatibleHostNameVerifier,
+-                                        calculateCRC32FromCompressedData);
+-        }
+-    }
+-
+-    private static boolean isTemporaryRedirect(org.apache.http.HttpResponse response) {
+-        int status = response.getStatusLine().getStatusCode();
+-        return status == HttpStatus.SC_TEMPORARY_REDIRECT && response.getHeaders("Location") != null
+-               && response.getHeaders("Location").length > 0;
+-    }
+-
+-    @Override
+-    protected void finalize() throws Throwable {
+-        this.shutdown();
+-        super.finalize();
+-    }
+-
+-    /**
+-     * Shuts down this HTTP client object, releasing any resources that might be held open. This is
+-     * an optional method, and callers are not expected to call it, but can if they want to
+-     * explicitly release any open resources. Once a client has been shutdown, it cannot be used to
+-     * make more requests.
+-     */
+-    public void shutdown() {
+-        clientExecutionTimer.shutdown();
+-        httpRequestTimer.shutdown();
+-        IdleConnectionReaper.removeConnectionManager(httpClient.getHttpClientConnectionManager());
+-        httpClient.getHttpClientConnectionManager().shutdown();
+-    }
+-
+-    /**
+-     * Used to configure the test conditions for injecting intermittent failures to the content
+-     * input stream.
+-     *
+-     * @param config unreliable test configuration for failure injection; or null to disable such
+-     *               test.
+-     */
+-    static void configUnreliableTestConditions(UnreliableTestConfig config) {
+-        unreliableTestConfig = config;
+-    }
+-
+-    /**
+-     * Package protected for unit-testing
+-     */
+-    @SdkTestInternalApi
+-    public HttpRequestTimer getHttpRequestTimer() {
+-        return this.httpRequestTimer;
+-    }
+-
+-    /**
+-     * Package protected for unit-testing
+-     */
+-    @SdkTestInternalApi
+-    public ClientExecutionTimer getClientExecutionTimer() {
+-        return this.clientExecutionTimer;
+-    }
+-
+-    /**
+-     * Returns additional response metadata for an executed request. Response metadata isn't
+-     * considered part of the standard results returned by an operation, so it's accessed instead
+-     * through this diagnostic interface. Response metadata is typically used for troubleshooting
+-     * issues with AWS support staff when services aren't acting as expected.
+-     *
+-     * @param request A previously executed AmazonWebServiceRequest object, whose response metadata
+-     *                is desired.
+-     * @return The response metadata for the specified request, otherwise null if there is no
+-     * response metadata available for the request.
+-     */
+-    public ResponseMetadata getResponseMetadataForRequest(AmazonWebServiceRequest request) {
+-        return responseMetadataCache.get(request);
+-    }
+-
+-    /**
+-     * Returns the httpClientSettings client specific request metric collector; or null if there is
+-     * none.
+-     */
+-    public RequestMetricCollector getRequestMetricCollector() {
+-        return requestMetricCollector;
+-    }
+-
+-    /**
+-     * Returns the time difference in seconds between this client and AWS.
+-     */
+-    public int getTimeOffset() {
+-        return timeOffset;
+-    }
+-
+-    /**
+-     * Executes the request and returns the result.
+-     *
+-     * @param request              The AmazonWebServices request to send to the remote server
+-     * @param responseHandler      A response handler to accept a successful response from the
+-     *                             remote server
+-     * @param errorResponseHandler A response handler to accept an unsuccessful response from the
+-     *                             remote server
+-     * @param executionContext     Additional information about the context of this web service
+-     *                             call
+-     * @deprecated Use {@link #requestExecutionBuilder()} to configure and execute a HTTP request.
+-     */
+-    @Deprecated
+-    public  Response execute(Request request,
+-                                   HttpResponseHandler> responseHandler,
+-                                   HttpResponseHandler errorResponseHandler,
+-                                   ExecutionContext executionContext) {
+-        HttpResponseHandler adaptedRespHandler = new AwsResponseHandlerAdapter(
+-                getNonNullResponseHandler(responseHandler),
+-                request,
+-                executionContext.getAwsRequestMetrics(),
+-                responseMetadataCache);
+-        return requestExecutionBuilder()
+-                .request(request)
+-                .requestConfig(new AmazonWebServiceRequestAdapter(request.getOriginalRequest()))
+-                .errorResponseHandler(new AwsErrorResponseHandler(errorResponseHandler, executionContext.getAwsRequestMetrics()))
+-                .executionContext(executionContext)
+-                .execute(adaptedRespHandler);
+-    }
+-
+-    /**
+-     * Ensures the response handler is not null. If it is this method returns a dummy response
+-     * handler.
+-     *
+-     * @return Either original response handler or dummy response handler.
+-     */
+-    private  HttpResponseHandler getNonNullResponseHandler(
+-            HttpResponseHandler responseHandler) {
+-        if (responseHandler != null) {
+-            return responseHandler;
+-        } else {
+-            // Return a Dummy, No-Op handler
+-            return new HttpResponseHandler() {
+-
+-                @Override
+-                public T handle(HttpResponse response) throws Exception {
+-                    return null;
+-                }
+-
+-                @Override
+-                public boolean needsConnectionLeftOpen() {
+-                    return false;
+-                }
+-            };
+-        }
+-    }
+-
+-    /**
+-     * @return A builder used to configure and execute a HTTP request.
+-     */
+-    public RequestExecutionBuilder requestExecutionBuilder() {
+-        return new RequestExecutionBuilderImpl();
+-    }
+-
+-    /**
+-     * Interface to configure a request execution and execute the request.
+-     */
+-    public interface RequestExecutionBuilder {
+-
+-        /**
+-         * Fluent setter for {@link Request}
+-         *
+-         * @param request Request object
+-         * @return This builder for method chaining.
+-         */
+-        RequestExecutionBuilder request(Request request);
+-
+-        /**
+-         * Fluent setter for the error response handler
+-         *
+-         * @param errorResponseHandler Error response handler
+-         * @return This builder for method chaining.
+-         */
+-        RequestExecutionBuilder errorResponseHandler(
+-                HttpResponseHandler errorResponseHandler);
+-
+-        /**
+-         * Fluent setter for the execution context
+-         *
+-         * @param executionContext Execution context
+-         * @return This builder for method chaining.
+-         */
+-        RequestExecutionBuilder executionContext(ExecutionContext executionContext);
+-
+-        /**
+-         * Fluent setter for {@link RequestConfig}
+-         *
+-         * @param requestConfig Request config object
+-         * @return This builder for method chaining.
+-         */
+-        RequestExecutionBuilder requestConfig(RequestConfig requestConfig);
+-
+-        /**
+-         * Executes the request with the given configuration.
+-         *
+-         * @param responseHandler Response handler that outputs the actual result type which is
+-         *                        preferred going forward.
+-         * @param         Result type
+-         * @return Unmarshalled result type.
+-         */
+-         Response execute(HttpResponseHandler responseHandler);
+-
+-        /**
+-         * Executes the request with the given configuration; not handling response.
+-         *
+-         * @return Void response
+-         */
+-        Response execute();
+-
+-    }
+-
+-    private class RequestExecutionBuilderImpl implements RequestExecutionBuilder {
+-
+-        private Request request;
+-        private RequestConfig requestConfig;
+-        private HttpResponseHandler errorResponseHandler;
+-        private ExecutionContext executionContext = new ExecutionContext();
+-
+-        @Override
+-        public RequestExecutionBuilder request(Request request) {
+-            this.request = request;
+-            return this;
+-        }
+-
+-        @Override
+-        public RequestExecutionBuilder errorResponseHandler(
+-                HttpResponseHandler errorResponseHandler) {
+-            this.errorResponseHandler = errorResponseHandler;
+-            return this;
+-        }
+-
+-        @Override
+-        public RequestExecutionBuilder executionContext(
+-                ExecutionContext executionContext) {
+-            this.executionContext = executionContext;
+-            return this;
+-        }
+-
+-        @Override
+-        public RequestExecutionBuilder requestConfig(RequestConfig requestConfig) {
+-            this.requestConfig = requestConfig;
+-            return this;
+-        }
+-
+-        @Override
+-        public  Response execute(HttpResponseHandler responseHandler) {
+-            RequestConfig config = requestConfig != null ? requestConfig : new AmazonWebServiceRequestAdapter(request.getOriginalRequest());
+-            return new RequestExecutor(request,
+-                                               config,
+-                                               getNonNullResponseHandler(errorResponseHandler),
+-                                               getNonNullResponseHandler(responseHandler),
+-                                               executionContext,
+-                                               getRequestHandlers()
+-            ).execute();
+-        }
+-
+-        @Override
+-        public Response execute() {
+-            return execute(null);
+-        }
+-
+-        private List getRequestHandlers() {
+-            List requestHandler2s = executionContext.getRequestHandler2s();
+-            if (requestHandler2s == null) {
+-                return Collections.emptyList();
+-            }
+-            return requestHandler2s;
+-        }
+-
+-    }
+-
+-    private class RequestExecutor {
+-        private final Request request;
+-        private final RequestConfig requestConfig;
+-        private final HttpResponseHandler errorResponseHandler;
+-        private final HttpResponseHandler responseHandler;
+-        private final ExecutionContext executionContext;
+-        private final List requestHandler2s;
+-        private final AWSRequestMetrics awsRequestMetrics;
+-
+-        private RequestExecutor(Request request, RequestConfig requestConfig,
+-                                HttpResponseHandler errorResponseHandler,
+-                                HttpResponseHandler responseHandler,
+-                                ExecutionContext executionContext,
+-                                List requestHandler2s) {
+-            this.request = request;
+-            this.requestConfig = requestConfig;
+-            this.errorResponseHandler = errorResponseHandler;
+-            this.responseHandler = responseHandler;
+-            this.executionContext = executionContext;
+-            this.requestHandler2s = requestHandler2s;
+-            this.awsRequestMetrics = executionContext.getAwsRequestMetrics();
+-        }
+-
+-        /**
+-         * Executes the request and returns the result.
+-         */
+-        private Response execute() {
+-            if (executionContext == null) {
+-                throw new SdkClientException(
+-                        "Internal SDK Error: No execution context parameter specified.");
+-            }
+-            try {
+-                return executeWithTimer();
+-            } catch (InterruptedException ie) {
+-                throw handleInterruptedException(ie);
+-            } catch (AbortedException ae) {
+-                throw handleAbortedException(ae);
+-            }
+-        }
+-
+-        /**
+-         * Start and end client execution timer around the execution of the request. It's important
+-         * that the client execution task is canceled before the InterruptedExecption is handled by
+-         * {@link #execute()} so * the interrupt status doesn't leak out to the callers code
+-         */
+-        private Response executeWithTimer() throws InterruptedException {
+-            ClientExecutionAbortTrackerTask clientExecutionTrackerTask =
+-                    clientExecutionTimer.startTimer(getClientExecutionTimeout(requestConfig));
+-            try {
+-                executionContext.setClientExecutionTrackerTask(clientExecutionTrackerTask);
+-                return doExecute();
+-            } finally {
+-                executionContext.getClientExecutionTrackerTask().cancelTask();
+-            }
+-        }
+-
+-        private Response doExecute() throws InterruptedException {
+-            runBeforeRequestHandlers();
+-            setSdkTransactionId(request);
+-            setUserAgent(request);
+-
+-            ProgressListener listener = requestConfig.getProgressListener();
+-            // add custom headers
+-            request.getHeaders().putAll(config.getHeaders());
+-            request.getHeaders().putAll(requestConfig.getCustomRequestHeaders());
+-            // add custom query parameters
+-            mergeQueryParameters(requestConfig.getCustomQueryParameters());
+-            Response response = null;
+-            final InputStream origContent = request.getContent();
+-            final InputStream toBeClosed = beforeRequest(); // for progress tracking
+-            // make "notCloseable", so reset would work with retries
+-            final InputStream notCloseable = (toBeClosed == null) ? null
+-                    : ReleasableInputStream.wrap(toBeClosed).disableClose();
+-            request.setContent(notCloseable);
+-            try {
+-                publishProgress(listener, ProgressEventType.CLIENT_REQUEST_STARTED_EVENT);
+-                response = executeHelper();
+-                publishProgress(listener, ProgressEventType.CLIENT_REQUEST_SUCCESS_EVENT);
+-                awsRequestMetrics.getTimingInfo().endTiming();
+-                afterResponse(response);
+-                return response;
+-            } catch (AmazonClientException e) {
+-                publishProgress(listener, ProgressEventType.CLIENT_REQUEST_FAILED_EVENT);
+-
+-                // Exceptions generated here will block the rethrow of e.
+-                afterError(response, e);
+-                throw e;
+-            } finally {
+-                // Always close so any progress tracking would get the final events propagated.
+-                closeQuietly(toBeClosed, log);
+-                request.setContent(origContent); // restore the original content
+-            }
+-        }
+-
+-        private void runBeforeRequestHandlers() {
+-            AWSCredentials credentials = getCredentialsFromContext();
+-            request.addHandlerContext(HandlerContextKey.AWS_CREDENTIALS, credentials);
+-            // Apply any additional service specific request handlers that need to be run
+-            for (RequestHandler2 requestHandler2 : requestHandler2s) {
+-                // If the request handler is a type of CredentialsRequestHandler, then set the credentials in the request handler.
+-                if (requestHandler2 instanceof CredentialsRequestHandler) {
+-                    ((CredentialsRequestHandler) requestHandler2).setCredentials(credentials);
+-                }
+-                requestHandler2.beforeRequest(request);
+-            }
+-        }
+-
+-        /**
+-         * Determine if an interrupted exception is caused by the client execution timer
+-         * interrupting the current thread or some other task interrupting the thread for another
+-         * purpose.
+-         *
+-         * @return {@link ClientExecutionTimeoutException} if the {@link InterruptedException} was
+-         * caused by the {@link ClientExecutionTimer}. Otherwise re-interrupts the current thread
+-         * and returns a {@link SdkClientException} wrapping an {@link InterruptedException}
+-         */
+-        private RuntimeException handleInterruptedException(InterruptedException e) {
+-            if (e instanceof SdkInterruptedException) {
+-                if (((SdkInterruptedException) e).getResponse() != null) {
+-                    ((SdkInterruptedException) e).getResponse().getHttpResponse().getHttpRequest().abort();
+-                }
+-            }
+-            if (executionContext.getClientExecutionTrackerTask().hasTimeoutExpired()) {
+-                // Clear the interrupt status
+-                Thread.interrupted();
+-                return new ClientExecutionTimeoutException();
+-            } else {
+-                Thread.currentThread().interrupt();
+-                return new AbortedException(e);
+-            }
+-        }
+-
+-        /**
+-         * Determine if an aborted exception is caused by the client execution timer interrupting
+-         * the current thread. If so throws {@link ClientExecutionTimeoutException} else throws the
+-         * original {@link AbortedException}
+-         *
+-         * @param ae aborted exception that occurred
+-         * @return {@link ClientExecutionTimeoutException} if the {@link AbortedException} was
+-         * caused by the {@link ClientExecutionTimer}. Otherwise throws the original {@link
+-         * AbortedException}
+-         */
+-        private RuntimeException handleAbortedException(final AbortedException ae) {
+-            if (executionContext.getClientExecutionTrackerTask().hasTimeoutExpired()) {
+-                return new ClientExecutionTimeoutException();
+-            } else {
+-                Thread.currentThread().interrupt();
+-                return ae;
+-            }
+-        }
+-
+-        /**
+-         * Check if the thread has been interrupted. If so throw an {@link InterruptedException}.
+-         * Long running tasks should be periodically checked if the current thread has been
+-         * interrupted and handle it appropriately
+-         *
+-         * @throws InterruptedException If thread has been interrupted
+-         */
+-        private void checkInterrupted() throws InterruptedException {
+-            checkInterrupted(null);
+-        }
+-
+-        /**
+-         * Check if the thread has been interrupted. If so throw an {@link InterruptedException}.
+-         * Long running tasks should be periodically checked if the current thread has been
+-         * interrupted and handle it appropriately
+-         *
+-         * @param response Response to be closed before returning control to the caller to avoid
+-         *                 leaking the connection.
+-         * @throws InterruptedException If thread has been interrupted
+-         */
+-        private void checkInterrupted(Response response) throws InterruptedException {
+-            if (Thread.interrupted()) {
+-                throw new SdkInterruptedException(response);
+-            }
+-        }
+-
+-        /**
+-         * Merge query parameters into the given request.
+-         */
+-        private void mergeQueryParameters(Map> params) {
+-            Map> existingParams = request.getParameters();
+-            for (Entry> param : params.entrySet()) {
+-                String pName = param.getKey();
+-                List pValues = param.getValue();
+-                existingParams.put(pName, CollectionUtils.mergeLists(existingParams.get(pName), pValues));
+-            }
+-        }
+-
+-        /**
+-         * Publishes the "request content length" event, and returns an input stream, which will be
+-         * made mark-and-resettable if possible, for progress tracking purposes.
+-         *
+-         * @return an input stream, which will be made mark-and-resettable if possible, for progress
+-         * tracking purposes; or null if the request doesn't have an input stream
+-         */
+-        private InputStream beforeRequest() {
+-            ProgressListener listener = requestConfig.getProgressListener();
+-            reportContentLength(listener);
+-            if (request.getContent() == null) {
+-                return null;
+-            }
+-            final InputStream content = monitorStreamProgress(listener,
+-                                                              buffer(
+-                                                                      makeResettable(
+-                                                                              request.getContent())));
+-            if (AmazonHttpClient.unreliableTestConfig == null) {
+-                return content;
+-            }
+-            return wrapWithUnreliableStream(content);
+-        }
+-
+-        /**
+-         * If content length is present on the request, report it to the progress listener.
+-         *
+-         * @param listener Listener to notify.
+-         */
+-        private void reportContentLength(ProgressListener listener) {
+-            Map headers = request.getHeaders();
+-            String contentLengthStr = headers.get("Content-Length");
+-            if (contentLengthStr != null) {
+-                try {
+-                    long contentLength = Long.parseLong(contentLengthStr);
+-                    publishRequestContentLength(listener, contentLength);
+-                } catch (NumberFormatException e) {
+-                    log.warn("Cannot parse the Content-Length header of the request.");
+-                }
+-            }
+-        }
+-
+-        /**
+-         * Make input stream resettable if possible.
+-         *
+-         * @param content Input stream to make resettable
+-         * @return ResettableInputStream if possible otherwise original input stream.
+-         */
+-        private InputStream makeResettable(InputStream content) {
+-            if (!content.markSupported()) {
+-                // try to wrap the content input stream to become
+-                // mark-and-resettable for signing and retry purposes.
+-                if (content instanceof FileInputStream) {
+-                    try {
+-                        // ResettableInputStream supports mark-and-reset without
+-                        // memory buffering
+-                        return new ResettableInputStream((FileInputStream) content);
+-                    } catch (IOException e) {
+-                        if (log.isDebugEnabled()) {
+-                            log.debug("For the record; ignore otherwise", e);
+-                        }
+-                    }
+-                }
+-            }
+-            return content;
+-        }
+-
+-        /**
+-         * Buffer input stream if possible.
+-         *
+-         * @param content Input stream to buffer
+-         * @return SdkBufferedInputStream if possible, otherwise original input stream.
+-         */
+-        private InputStream buffer(InputStream content) {
+-            if (!content.markSupported()) {
+-                content = new SdkBufferedInputStream(content);
+-            }
+-            return content;
+-        }
+-
+-        /**
+-         * Wrap with a {@link ProgressInputStream} to report request progress to listener.
+-         *
+-         * @param listener Listener to report to
+-         * @param content  Input stream to monitor progress for
+-         * @return Wrapped input stream with progress monitoring capabilities.
+-         */
+-        private InputStream monitorStreamProgress(ProgressListener listener,
+-                                                  InputStream content) {
+-            return ProgressInputStream.inputStreamForRequest(content, listener);
+-        }
+-
+-        /**
+-         * Used only for internal testing purposes. Makes a stream unreliable in certain ways for
+-         * fault testing.
+-         *
+-         * @param content Input stream to make unreliable.
+-         * @return UnreliableFilterInputStream
+-         */
+-        private InputStream wrapWithUnreliableStream(InputStream content) {
+-            return new UnreliableFilterInputStream(content,
+-                                                   unreliableTestConfig.isFakeIOException())
+-                    .withBytesReadBeforeException(
+-                            unreliableTestConfig.getBytesReadBeforeException())
+-                    .withMaxNumErrors(unreliableTestConfig.getMaxNumErrors())
+-                    .withResetIntervalBeforeException(
+-                            unreliableTestConfig.getResetIntervalBeforeException());
+-        }
+-
+-
+-        private void afterError(Response response,
+-                                AmazonClientException e) throws InterruptedException {
+-            for (RequestHandler2 handler2 : requestHandler2s) {
+-                handler2.afterError(request, response, e);
+-                checkInterrupted(response);
+-            }
+-        }
+-
+-        private  void afterResponse(Response response) throws InterruptedException {
+-            for (RequestHandler2 handler2 : requestHandler2s) {
+-                handler2.afterResponse(request, response);
+-                checkInterrupted(response);
+-            }
+-        }
+-
+-        private  void beforeAttempt(HandlerBeforeAttemptContext context) throws InterruptedException {
+-            for (RequestHandler2 handler2 : requestHandler2s) {
+-                handler2.beforeAttempt(context);
+-                checkInterrupted();
+-            }
+-        }
+-
+-        private  void afterAttempt(HandlerAfterAttemptContext context) throws InterruptedException {
+-            for (RequestHandler2 handler2 : requestHandler2s) {
+-                handler2.afterAttempt(context);
+-                checkInterrupted(context.getResponse());
+-            }
+-        }
+-
+-        /**
+-         * Internal method to execute the HTTP method given.
+-         */
+-        private Response executeHelper() throws InterruptedException {
+-        /*
+-         * add the service endpoint to the logs. You can infer service name from service endpoint
+-         */
+-            awsRequestMetrics
+-                    .addPropertyWith(Field.RequestType, requestConfig.getRequestType())
+-                    .addPropertyWith(Field.ServiceName, request.getServiceName())
+-                    .addPropertyWith(Field.ServiceEndpoint, request.getEndpoint());
+-            // Make a copy of the original request params and headers so that we can
+-            // permute it in this loop and start over with the original every time.
+-            final Map> originalParameters = new LinkedHashMap>(request.getParameters());
+-            final Map originalHeaders = new HashMap(request.getHeaders());
+-            // Always mark the input stream before execution.
+-            final ExecOneRequestParams execOneParams = new ExecOneRequestParams();
+-            final InputStream originalContent = request.getContent();
+-            if (originalContent != null && originalContent.markSupported()
+-                && !(originalContent instanceof BufferedInputStream)) {
+-                // Mark only once for non-BufferedInputStream
+-                final int readLimit = requestConfig.getRequestClientOptions().getReadLimit();
+-                originalContent.mark(readLimit);
+-            }
+-            while (true) {
+-                checkInterrupted();
+-                if (originalContent instanceof BufferedInputStream && originalContent.markSupported()) {
+-                    // Mark everytime for BufferedInputStream, since the marker could have been invalidated
+-                    final int readLimit = requestConfig.getRequestClientOptions().getReadLimit();
+-                    originalContent.mark(readLimit);
+-                }
+-                execOneParams.initPerRetry();
+-                if (execOneParams.redirectedURI != null) {
+-                /*
+-                 * [scheme:][//authority][path][?query][#fragment]
+-                 */
+-                    String scheme = execOneParams.redirectedURI.getScheme();
+-                    String beforeAuthority = scheme == null ? "" : scheme + "://";
+-                    String authority = execOneParams.redirectedURI.getAuthority();
+-                    String path = execOneParams.redirectedURI.getPath();
+-
+-                    request.setEndpoint(URI.create(beforeAuthority + authority));
+-                    request.setResourcePath(SdkHttpUtils.urlEncode(path, true));
+-                }
+-                if (execOneParams.authRetryParam != null) {
+-                    request.setEndpoint(execOneParams.authRetryParam.getEndpointForRetry());
+-                }
+-                awsRequestMetrics.setCounter(Field.RequestCount, execOneParams.requestCount);
+-                if (execOneParams.isRetry()) {
+-                    request.setParameters(originalParameters);
+-                    request.setHeaders(originalHeaders);
+-                    request.setContent(originalContent);
+-                }
+-
+-                Response response = null;
+-                Exception savedException = null;
+-                try {
+-                    HandlerBeforeAttemptContext beforeAttemptContext = HandlerBeforeAttemptContext.builder()
+-                            .withRequest(request)
+-                            .build();
+-
+-                    beforeAttempt(beforeAttemptContext);
+-                    response = executeOneRequest(execOneParams);
+-                    savedException = execOneParams.retriedException;
+-
+-                    if (response != null) {
+-                        return response;
+-                    }
+-                } catch (IOException ioe) {
+-                    savedException = ioe;
+-                    handleRetryableException(execOneParams, ioe);
+-                } catch (InterruptedException ie) {
+-                    savedException = ie;
+-                    throw ie;
+-                } catch (RuntimeException e) {
+-                    savedException = e;
+-                    throw lastReset(captureExceptionMetrics(e));
+-                } catch (Error e) {
+-                    throw lastReset(captureExceptionMetrics(e));
+-                } finally {
+-                /*
+-                 * Some response handlers need to manually manage the HTTP connection and will take
+-                 * care of releasing the connection on their own, but if this response handler
+-                 * doesn't need the connection left open, we go ahead and release the it to free up
+-                 * resources.
+-                 */
+-                    if (!execOneParams.leaveHttpConnectionOpen) {
+-                        if (execOneParams.apacheResponse != null) {
+-                            HttpEntity entity = execOneParams.apacheResponse.getEntity();
+-                            if (entity != null) {
+-                                try {
+-                                    closeQuietly(entity.getContent(), log);
+-                                } catch (IOException e) {
+-                                    log.warn("Cannot close the response content.", e);
+-                                }
+-                            }
+-                        }
+-                    }
+-
+-                    HandlerAfterAttemptContext afterAttemptContext = HandlerAfterAttemptContext.builder()
+-                            .withRequest(request)
+-                            .withResponse(response)
+-                            .withException(savedException)
+-                            .build();
+-
+-                    /*
+-                     * Exceptions generated here will replace ones rethrown in catch-blocks
+-                     * above or thrown in the original try-block.
+-                     */
+-                    afterAttempt(afterAttemptContext);
+-                }
+-            } /* end while (true) */
+-        }
+-
+-        private void handleRetryableException(ExecOneRequestParams execOneParams, Exception e) {
+-            captureExceptionMetrics(e);
+-            awsRequestMetrics.addProperty(Field.AWSRequestID, null);
+-            SdkClientException sdkClientException;
+-            if (!(e instanceof SdkClientException)) {
+-                sdkClientException = new SdkClientException(
+-                        "Unable to execute HTTP request: " + e.getMessage(), e);
+-            } else {
+-                sdkClientException = (SdkClientException) e;
+-            }
+-            boolean willRetry = shouldRetry(execOneParams, sdkClientException);
+-            if (log.isTraceEnabled()) {
+-                log.trace(sdkClientException.getMessage() + (willRetry ? " Request will be retried." : ""), e);
+-            } else if (log.isDebugEnabled()) {
+-                log.trace(sdkClientException.getMessage() + (willRetry ? " Request will be retried." : ""));
+-            }
+-            if (!willRetry) {
+-                throw lastReset(sdkClientException);
+-            }
+-            // Cache the retryable exception
+-            execOneParams.retriedException = sdkClientException;
+-        }
+-
+-        /**
+-         * Used to perform a last reset on the content input stream (if mark-supported); this is so
+-         * that, for backward compatibility reason, any "blind" retry (ie without calling reset) by
+-         * user of this library with the same input stream (such as ByteArrayInputStream) could
+-         * still succeed.
+-         *
+-         * @param t the failure
+-         * @return the failure as given
+-         */
+-        private  T lastReset(final T t) {
+-            try {
+-                InputStream content = request.getContent();
+-                if (content != null) {
+-                    if (content.markSupported()) {
+-                        content.reset();
+-                    }
+-                }
+-            } catch (Exception ex) {
+-                log.debug("FYI: failed to reset content inputstream before throwing up", ex);
+-            }
+-            return t;
+-        }
+-
+-        /**
+-         * Returns the credentials from the execution if exists. Else returns null.
+-         */
+-        private AWSCredentials getCredentialsFromContext() {
+-            final AWSCredentialsProvider credentialsProvider = executionContext.getCredentialsProvider();
+-
+-            AWSCredentials credentials = null;
+-            if (credentialsProvider != null) {
+-                awsRequestMetrics.startEvent(Field.CredentialsRequestTime);
+-                try {
+-                    credentials = credentialsProvider.getCredentials();
+-                } finally {
+-                    awsRequestMetrics.endEvent(Field.CredentialsRequestTime);
+-                }
+-            }
+-            return credentials;
+-        }
+-
+-        /**
+-         * Returns the response from executing one httpClientSettings request; or null for retry.
+-         */
+-        private Response executeOneRequest(ExecOneRequestParams execOneParams)
+-                throws IOException, InterruptedException {
+-
+-            if (execOneParams.isRetry()) {
+-                resetRequestInputStream(request);
+-            }
+-            checkInterrupted();
+-            if (requestLog.isDebugEnabled()) {
+-                requestLog.debug((execOneParams.isRetry() ? "Retrying " : "Sending ") + "Request: " + request);
+-            }
+-            final AWSCredentials credentials = getCredentialsFromContext();
+-            final ProgressListener listener = requestConfig.getProgressListener();
+-
+-            if (execOneParams.isRetry()) {
+-                pauseBeforeRetry(execOneParams, listener);
+-            }
+-            updateRetryHeaderInfo(request, execOneParams);
+-
+-            // Sign the request if a signer was provided
+-            execOneParams.newSigner(request, executionContext);
+-            if (execOneParams.signer != null &&
+-                (credentials != null || execOneParams.signer instanceof CanHandleNullCredentials)) {
+-                awsRequestMetrics.startEvent(Field.RequestSigningTime);
+-                try {
+-                    if (timeOffset != 0) {
+-                        // Always use the client level timeOffset if it was
+-                        // non-zero; Otherwise, we respect the timeOffset in the
+-                        // request, which could have been externally configured (at
+-                        // least for the 1st non-retry request).
+-                        //
+-                        // For retry due to clock skew, the timeOffset in the
+-                        // request used for the retry is assumed to have been
+-                        // adjusted when execution reaches here.
+-                        request.setTimeOffset(timeOffset);
+-                    }
+-                    execOneParams.signer.sign(request, credentials);
+-                } finally {
+-                    awsRequestMetrics.endEvent(Field.RequestSigningTime);
+-                }
+-            }
+-
+-            checkInterrupted();
+-            execOneParams.newApacheRequest(httpRequestFactory, request, httpClientSettings);
+-
+-            captureConnectionPoolMetrics();
+-
+-            final HttpClientContext localRequestContext =
+-                    ApacheUtils.newClientContext(httpClientSettings, ImmutableMapParameter.of
+-                            (AWSRequestMetrics.SIMPLE_NAME, awsRequestMetrics));
+-
+-            execOneParams.resetBeforeHttpRequest();
+-            publishProgress(listener, ProgressEventType.HTTP_REQUEST_STARTED_EVENT);
+-            awsRequestMetrics.startEvent(Field.HttpRequestTime);
+-            awsRequestMetrics.setCounter(Field.RetryCapacityConsumed, retryCapacity.consumedCapacity());
+-
+-            /////////// Send HTTP request ////////////
+-            executionContext.getClientExecutionTrackerTask().setCurrentHttpRequest(execOneParams.apacheRequest);
+-            final HttpRequestAbortTaskTracker requestAbortTaskTracker = httpRequestTimer
+-                    .startTimer(execOneParams.apacheRequest, getRequestTimeout(requestConfig));
+-
+-            try {
+-                execOneParams.apacheResponse = httpClient.execute(execOneParams.apacheRequest, localRequestContext);
+-                if (shouldBufferHttpEntity(responseHandler.needsConnectionLeftOpen(),
+-                                           executionContext,
+-                                           execOneParams,
+-                                           requestAbortTaskTracker)) {
+-                    execOneParams.apacheResponse
+-                            .setEntity(new BufferedHttpEntity(
+-                                    execOneParams.apacheResponse.getEntity()));
+-                }
+-            } catch (IOException ioe) {
+-                // Client execution timeouts take precedence as it's not retryable
+-                if (executionContext.getClientExecutionTrackerTask().hasTimeoutExpired()) {
+-                    throw new InterruptedException();
+-                } else if (requestAbortTaskTracker.httpRequestAborted()) {
+-                    throw new HttpRequestTimeoutException(ioe);
+-                } else {
+-                    throw ioe;
+-                }
+-            } finally {
+-                requestAbortTaskTracker.cancelTask();
+-                awsRequestMetrics.endEvent(Field.HttpRequestTime);
+-            }
+-
+-            publishProgress(listener, ProgressEventType.HTTP_REQUEST_COMPLETED_EVENT);
+-            final StatusLine statusLine = execOneParams.apacheResponse.getStatusLine();
+-            final int statusCode = statusLine == null ? -1 : statusLine.getStatusCode();
+-            if (ApacheUtils.isRequestSuccessful(execOneParams.apacheResponse)) {
+-                awsRequestMetrics.addProperty(Field.StatusCode, statusCode);
+-            /*
+-             * If we get back any 2xx status code, then we know we should treat the service call as
+-             * successful.
+-             */
+-                execOneParams.leaveHttpConnectionOpen = responseHandler.needsConnectionLeftOpen();
+-                HttpResponse httpResponse = ApacheUtils.createResponse(request, execOneParams.apacheRequest, execOneParams.apacheResponse, localRequestContext);
+-                Output response = handleResponse(httpResponse);
+-
+-            /*
+-             * If this was a successful retry attempt we'll release the full retry capacity that
+-             * the attempt originally consumed.  If this was a successful initial request
+-             * we return a lesser amount.
+-             */
+-                if (execOneParams.isRetry() && executionContext.retryCapacityConsumed()) {
+-                    retryCapacity.release(THROTTLED_RETRY_COST);
+-                } else {
+-                    retryCapacity.release();
+-                }
+-                return new Response(response, httpResponse);
+-            }
+-            if (isTemporaryRedirect(execOneParams.apacheResponse)) {
+-            /*
+-             * S3 sends 307 Temporary Redirects if you try to delete an EU bucket from the US
+-             * endpoint. If we get a 307, we'll point the HTTP method to the redirected location,
+-             * and let the next retry deliver the request to the right location.
+-             */
+-                Header[] locationHeaders = execOneParams.apacheResponse.getHeaders("location");
+-                String redirectedLocation = locationHeaders[0].getValue();
+-                if (log.isDebugEnabled()) {
+-                    log.debug("Redirecting to: " + redirectedLocation);
+-                }
+-                execOneParams.redirectedURI = URI.create(redirectedLocation);
+-                awsRequestMetrics.addPropertyWith(Field.StatusCode, statusCode)
+-                        .addPropertyWith(Field.RedirectLocation, redirectedLocation)
+-                        .addPropertyWith(Field.AWSRequestID, null);
+-                return null; // => retry
+-            }
+-            execOneParams.leaveHttpConnectionOpen = errorResponseHandler.needsConnectionLeftOpen();
+-            final SdkBaseException exception = handleErrorResponse(execOneParams.apacheRequest,
+-                                                             execOneParams.apacheResponse,
+-                                                             localRequestContext);
+-
+-            /*
+-             * If the exception is related to Clock skew,
+-             * then update the client global time offset
+-             * irrespective of retry logic
+-             */
+-            if (RetryUtils.isClockSkewError(exception)) {
+-                int clockSkew = parseClockSkewOffset(execOneParams.apacheResponse, exception);
+-                SDKGlobalTime.setGlobalTimeOffset(timeOffset = clockSkew);
+-                request.setTimeOffset(timeOffset); // adjust time offset for the retry
+-            }
+-
+-
+-            // Check whether we should internally retry the auth error
+-            execOneParams.authRetryParam = null;
+-            AuthErrorRetryStrategy authRetry = executionContext.getAuthErrorRetryStrategy();
+-            if (authRetry != null && exception instanceof AmazonServiceException) {
+-                HttpResponse httpResponse = ApacheUtils.createResponse(request, execOneParams.apacheRequest, execOneParams.apacheResponse, localRequestContext);
+-                execOneParams.authRetryParam = authRetry
+-                        .shouldRetryWithAuthParam(request, httpResponse, (AmazonServiceException) exception);
+-            }
+-            if (execOneParams.authRetryParam == null && !shouldRetry(execOneParams, exception)) {
+-                throw exception;
+-            }
+-            // Comment out for now. Ref: CR2662349
+-            // Preserve the cause of retry before retrying
+-            // awsRequestMetrics.addProperty(RetryCause, ase);
+-            if (RetryUtils.isThrottlingException(exception)) {
+-                awsRequestMetrics.incrementCounterWith(Field.ThrottleException)
+-                        .addProperty(Field.ThrottleException, exception);
+-            }
+-            // Cache the retryable exception
+-            execOneParams.retriedException = exception;
+-
+-            return null; // => retry
+-        }
+-
+-        /**
+-         * Reset the input stream of the request before a retry.
+-         *
+-         * @param request Request containing input stream to reset
+-         * @throws ResetException If Input Stream can't be reset which means the request can't be
+-         *                        retried
+-         */
+-        private void resetRequestInputStream(final Request request) throws ResetException {
+-            InputStream requestInputStream = request.getContent();
+-            if (requestInputStream != null) {
+-                if (requestInputStream.markSupported()) {
+-                    try {
+-                        requestInputStream.reset();
+-                    } catch (IOException ex) {
+-                        throw new ResetException("Failed to reset the request input stream", ex);
+-                    }
+-                }
+-            }
+-        }
+-
+-        /**
+-         * @return True if the {@link HttpEntity} should be wrapped in a {@link BufferedHttpEntity}
+-         */
+-        private boolean shouldBufferHttpEntity(final boolean needsConnectionLeftOpen,
+-                                               final ExecutionContext execContext,
+-                                               ExecOneRequestParams execParams,
+-                                               final HttpRequestAbortTaskTracker requestAbortTaskTracker) {
+-            return (execContext.getClientExecutionTrackerTask().isEnabled() ||
+-                    requestAbortTaskTracker.isEnabled())
+-                   && !needsConnectionLeftOpen && execParams.apacheResponse.getEntity() != null;
+-        }
+-
+-
+-        /**
+-         * Captures the connection pool metrics.
+-         */
+-        private void captureConnectionPoolMetrics() {
+-            if (awsRequestMetrics.isEnabled() &&
+-                httpClient.getHttpClientConnectionManager() instanceof
+-                        ConnPoolControl) {
+-                final PoolStats stats = ((ConnPoolControl) httpClient
+-                        .getHttpClientConnectionManager()).getTotalStats();
+-
+-                awsRequestMetrics
+-                        .withCounter(HttpClientPoolAvailableCount, stats.getAvailable())
+-                        .withCounter(HttpClientPoolLeasedCount, stats.getLeased())
+-                        .withCounter(HttpClientPoolPendingCount, stats.getPending());
+-            }
+-
+-        }
+-
+-        /**
+-         * Capture the metrics for the given throwable.
+-         */
+-        private  T captureExceptionMetrics(T t) {
+-            awsRequestMetrics.incrementCounterWith(Field.Exception)
+-                    .addProperty(Field.Exception, t);
+-            if (t instanceof AmazonServiceException) {
+-                AmazonServiceException ase = (AmazonServiceException) t;
+-                if (RetryUtils.isThrottlingException(ase)) {
+-                    awsRequestMetrics.incrementCounterWith(Field.ThrottleException)
+-                            .addProperty(Field.ThrottleException, ase);
+-                }
+-            }
+-            return t;
+-        }
+-
+-        /**
+-         * Create a client side identifier that will be sent with the initial request and each
+-         * retry.
+-         */
+-        private void setSdkTransactionId(Request request) {
+-            request.addHeader(HEADER_SDK_TRANSACTION_ID,
+-                              new UUID(random.nextLong(), random.nextLong()).toString());
+-        }
+-
+-        /**
+-         * Sets a User-Agent for the specified request, taking into account any custom data.
+-         */
+-        private void setUserAgent(Request request) {
+-            RequestClientOptions opts = requestConfig.getRequestClientOptions();
+-            if (opts != null) {
+-                request.addHeader(HEADER_USER_AGENT, RuntimeHttpUtils
+-                        .getUserAgent(config, opts.getClientMarker(Marker.USER_AGENT)));
+-            } else {
+-                request.addHeader(HEADER_USER_AGENT, RuntimeHttpUtils.getUserAgent(config, null));
+-            }
+-        }
+-
+-        /**
+-         * Adds Retry information to the {@link #HEADER_SDK_RETRY_INFO} header. Used for analysis of
+-         * retry policy.
+-         *
+-         * @param request              Request to add header to
+-         * @param execOneRequestParams Request context containing retry information
+-         */
+-        private void updateRetryHeaderInfo(Request request,
+-                                           ExecOneRequestParams execOneRequestParams) {
+-            int availableRetryCapacity = retryCapacity.availableCapacity();
+-
+-            String headerValue = String.format("%s/%s/%s",
+-                                               execOneRequestParams.requestCount - 1,
+-                                               execOneRequestParams.lastBackoffDelay,
+-                                               availableRetryCapacity >= 0 ?
+-                                                       availableRetryCapacity : "");
+-
+-            request.addHeader(HEADER_SDK_RETRY_INFO, headerValue);
+-        }
+-
+-        /**
+-         * Returns true if a failed request should be retried.
+-         *
+-         * @param params    Params for the individual request being executed.
+-         * @param exception The client/service exception from the failed request.
+-         * @return True if the failed request should be retried.
+-         */
+-        private boolean shouldRetry(ExecOneRequestParams params, SdkBaseException exception) {
+-            final int retriesAttempted = params.requestCount - 1;
+-            final HttpRequestBase method = params.apacheRequest;
+-
+-            // Never retry on requests containing non-repeatable entity
+-            if (method instanceof HttpEntityEnclosingRequest) {
+-                HttpEntity entity = ((HttpEntityEnclosingRequest) method).getEntity();
+-                if (entity != null && !entity.isRepeatable()) {
+-                    if (log.isDebugEnabled()) {
+-                        log.debug("Entity not repeatable");
+-                    }
+-                    return false;
+-                }
+-            }
+-
+-            // Do not use retry capacity for throttling exceptions
+-            if (!RetryUtils.isThrottlingException(exception)) {
+-                // See if we have enough available retry capacity to be able to execute
+-                // this retry attempt.
+-                if (!retryCapacity.acquire(THROTTLED_RETRY_COST)) {
+-                    awsRequestMetrics.incrementCounter(ThrottledRetryCount);
+-                    return false;
+-                }
+-                executionContext.markRetryCapacityConsumed();
+-            }
+-
+-            RetryPolicyContext context = RetryPolicyContext.builder()
+-                    .request(request)
+-                    .originalRequest(requestConfig.getOriginalRequest())
+-                    .exception(exception)
+-                    .retriesAttempted(retriesAttempted)
+-                    .httpStatusCode(params.getStatusCode())
+-                    .build();
+-            // Finally, pass all the context information to the RetryCondition and let it
+-            // decide whether it should be retried.
+-            if (!retryPolicy.shouldRetry(context)) {
+-                // If the retry policy fails we immediately return consumed capacity to the pool.
+-                if (executionContext.retryCapacityConsumed()) {
+-                    retryCapacity.release(THROTTLED_RETRY_COST);
+-                }
+-                return false;
+-            }
+-
+-            return true;
+-        }
+-
+-        /**
+-         * Handles a successful response from a service call by unmarshalling the results using the
+-         * specified response handler.
+-         *
+-         * @return The contents of the response, unmarshalled using the specified response handler.
+-         * @throws IOException If any problems were encountered reading the response contents from
+-         *                     the HTTP method object.
+-         */
+-        @SuppressWarnings("deprecation")
+-        private Output handleResponse(HttpResponse httpResponse) throws IOException,
+-                                                                        InterruptedException {
+-            ProgressListener listener = requestConfig.getProgressListener();
+-            try {
+-            /*
+-             * Apply the byte counting stream wrapper if the legacy runtime profiling is enabled.
+-             */
+-                CountingInputStream countingInputStream = null;
+-                InputStream is = httpResponse.getContent();
+-                if (is != null) {
+-                    if (System.getProperty(PROFILING_SYSTEM_PROPERTY) != null) {
+-                        is = countingInputStream = new CountingInputStream(is);
+-                        httpResponse.setContent(is);
+-                    }
+-                    httpResponse.setContent(ProgressInputStream.inputStreamForResponse(is, listener));
+-                }
+-                Map headers = httpResponse.getHeaders();
+-                String s = headers.get("Content-Length");
+-                if (s != null) {
+-                    try {
+-                        long contentLength = Long.parseLong(s);
+-                        publishResponseContentLength(listener, contentLength);
+-                    } catch (NumberFormatException e) {
+-                        log.warn("Cannot parse the Content-Length header of the response.");
+-                    }
+-                }
+-
+-                Output awsResponse;
+-                awsRequestMetrics.startEvent(Field.ResponseProcessingTime);
+-                publishProgress(listener, ProgressEventType.HTTP_RESPONSE_STARTED_EVENT);
+-                try {
+-                    awsResponse = responseHandler
+-                            .handle(beforeUnmarshalling(httpResponse));
+-                } finally {
+-                    awsRequestMetrics.endEvent(Field.ResponseProcessingTime);
+-                }
+-                publishProgress(listener, ProgressEventType.HTTP_RESPONSE_COMPLETED_EVENT);
+-
+-                if (countingInputStream != null) {
+-                    awsRequestMetrics
+-                            .setCounter(Field.BytesProcessed, countingInputStream.getByteCount());
+-                }
+-                return awsResponse;
+-            } catch (CRC32MismatchException e) {
+-                throw e;
+-            } catch (IOException e) {
+-                throw e;
+-            } catch (AmazonClientException e) {
+-                throw e; // simply rethrow rather than further wrapping it
+-            } catch (InterruptedException e) {
+-                throw e;
+-            } catch (Exception e) {
+-                String errorMessage =
+-                        "Unable to unmarshall response (" + e.getMessage() + "). Response Code: "
+-                        + httpResponse.getStatusCode() + ", Response Text: " +
+-                        httpResponse.getStatusText();
+-                throw new SdkClientException(errorMessage, e);
+-            }
+-        }
+-
+-        /**
+-         * Run {@link RequestHandler2#beforeUnmarshalling(Request, HttpResponse)} callback
+-         *
+-         * @param origHttpResponse Original {@link HttpResponse}
+-         * @return {@link HttpResponse} object to pass to unmarshaller. May have been modified or
+-         * replaced by the request handlers
+-         */
+-        private HttpResponse beforeUnmarshalling(HttpResponse origHttpResponse) {
+-            HttpResponse toReturn = origHttpResponse;
+-            for (RequestHandler2 requestHandler : requestHandler2s) {
+-                toReturn = requestHandler.beforeUnmarshalling(request, toReturn);
+-            }
+-            return toReturn;
+-        }
+-
+-        /**
+-         * Responsible for handling an error response, including unmarshalling the error response
+-         * into the most specific exception type possible, and throwing the exception.
+-         *
+-         * @param method The HTTP method containing the actual response content.
+-         * @throws IOException If any problems are encountering reading the error response.
+-         */
+-        private SdkBaseException handleErrorResponse(HttpRequestBase method,
+-                                                           final org.apache.http.HttpResponse apacheHttpResponse,
+-                                                           final HttpContext context)
+-                throws IOException, InterruptedException {
+-            final StatusLine statusLine = apacheHttpResponse.getStatusLine();
+-            final int statusCode;
+-            final String reasonPhrase;
+-            if (statusLine == null) {
+-                statusCode = -1;
+-                reasonPhrase = null;
+-            } else {
+-                statusCode = statusLine.getStatusCode();
+-                reasonPhrase = statusLine.getReasonPhrase();
+-            }
+-            HttpResponse response = ApacheUtils.createResponse(request, method, apacheHttpResponse, context);
+-            SdkBaseException exception;
+-            try {
+-                exception = errorResponseHandler.handle(response);
+-                if (requestLog.isDebugEnabled()) {
+-                    requestLog.debug("Received error response: " + exception);
+-                }
+-            } catch (InterruptedException e) {
+-                throw e;
+-            } catch (Exception e) {
+-                if (e instanceof IOException) {
+-                    throw (IOException) e;
+-                } else {
+-                    String errorMessage = "Unable to unmarshall error response (" + e.getMessage() +
+-                                          "). Response Code: "
+-                                          + (statusLine == null ? "None" : statusCode) +
+-                                          ", Response Text: " + reasonPhrase;
+-                    throw new SdkClientException(errorMessage, e);
+-                }
+-            }
+-
+-            exception.fillInStackTrace();
+-            return exception;
+-        }
+-
+-        /**
+-         * Pause before the next retry and record metrics around retry behavior.
+-         */
+-        private void pauseBeforeRetry(ExecOneRequestParams execOneParams,
+-                                      final ProgressListener listener) throws InterruptedException {
+-            publishProgress(listener, ProgressEventType.CLIENT_REQUEST_RETRY_EVENT);
+-            // Notify the progress listener of the retry
+-            awsRequestMetrics.startEvent(Field.RetryPauseTime);
+-            try {
+-                doPauseBeforeRetry(execOneParams);
+-            } finally {
+-                awsRequestMetrics.endEvent(Field.RetryPauseTime);
+-            }
+-        }
+-
+-        /**
+-         * Sleep for a period of time on failed request to avoid flooding a service with retries.
+-         */
+-        private void doPauseBeforeRetry(ExecOneRequestParams execOneParams) throws InterruptedException {
+-            final int retriesAttempted = execOneParams.requestCount - 2;
+-            RetryPolicyContext context = RetryPolicyContext.builder()
+-                    .request(request)
+-                    .originalRequest(requestConfig.getOriginalRequest())
+-                    .retriesAttempted(retriesAttempted)
+-                    .exception(execOneParams.retriedException)
+-                    .build();
+-            // don't pause if the retry was not due to a redirection (I.E. when retried exception is null)
+-            if (context.exception() != null) {
+-                long delay = retryPolicy.computeDelayBeforeNextRetry(context);
+-                execOneParams.lastBackoffDelay = delay;
+-
+-                if (log.isDebugEnabled()) {
+-                    log.debug("Retriable error detected, " + "will retry in " + delay +
+-                              "ms, attempt number: " + retriesAttempted);
+-                }
+-                Thread.sleep(delay);
+-            }
+-        }
+-
+-        // SWF: Signature not yet current: 20140819T173921Z is still later than 20140819T173829Z
+-        // (20140819T173329Z + 5 min.)
+-
+-        /**
+-         * Returns date string from the exception message body in form of yyyyMMdd'T'HHmmss'Z' We
+-         * needed to extract date from the message body because SQS is the only service that does
+-         * not provide date header in the response. Example, when device time is behind than the
+-         * server time than we get a string that looks something like this: "Signature expired:
+-         * 20130401T030113Z is now earlier than 20130401T034613Z (20130401T040113Z - 15 min.)"
+-         *
+-         * @param body The message from where the server time is being extracted
+-         * @return Return datetime in string format (yyyyMMdd'T'HHmmss'Z')
+-         */
+-        private String getServerDateFromException(String body) {
+-            final int startPos = body.indexOf("(");
+-            int endPos = body.indexOf(" + ");
+-            if (endPos == -1) {
+-                endPos = body.indexOf(" - ");
+-            }
+-            return endPos == -1 ? null : body.substring(startPos + 1, endPos);
+-        }
+-
+-        /**
+-         * Returns the difference between the client's clock time and the service clock time in unit
+-         * of seconds.
+-         */
+-        private int parseClockSkewOffset(org.apache.http.HttpResponse response,
+-                                         SdkBaseException exception) {
+-            final long currentTimeMilli = System.currentTimeMillis();
+-            Date serverDate;
+-            String serverDateStr = null;
+-            Header[] responseDateHeader = response.getHeaders("Date");
+-
+-            try {
+-                if (responseDateHeader.length == 0) {
+-                    // SQS doesn't return Date header
+-                    final String errmsg = exception.getMessage();
+-                    serverDateStr = getServerDateFromException(errmsg);
+-                    if (serverDateStr == null) {
+-                        log.warn("Unable to parse clock skew offset from errmsg: " + errmsg);
+-                        return 0;
+-                    }
+-                    serverDate = DateUtils.parseCompressedISO8601Date(serverDateStr);
+-                } else {
+-                    serverDateStr = responseDateHeader[0].getValue();
+-                    serverDate = DateUtils.parseRFC822Date(serverDateStr);
+-                }
+-            } catch (RuntimeException e) {
+-                log.warn("Unable to parse clock skew offset from response: " + serverDateStr, e);
+-                return 0;
+-            }
+-
+-            long diff = currentTimeMilli - serverDate.getTime();
+-            return (int) (diff / 1000);
+-        }
+-
+-        /**
+-         * Gets the correct request timeout taking into account precedence of the configuration in
+-         * {@link AmazonWebServiceRequest} versus {@link ClientConfiguration}
+-         *
+-         * @param requestConfig Current request configuration
+-         * @return Request timeout value or 0 if none is set
+-         */
+-        private int getRequestTimeout(RequestConfig requestConfig) {
+-            if (requestConfig.getRequestTimeout() != null) {
+-                return requestConfig.getRequestTimeout();
+-            } else {
+-                return config.getRequestTimeout();
+-            }
+-        }
+-
+-        /**
+-         * Gets the correct client execution timeout taking into account precedence of the
+-         * configuration in {@link AmazonWebServiceRequest} versus {@link ClientConfiguration}
+-         *
+-         * @param requestConfig Current request configuration
+-         * @return Client Execution timeout value or 0 if none is set
+-         */
+-        private int getClientExecutionTimeout(RequestConfig requestConfig) {
+-            if (requestConfig.getClientExecutionTimeout() != null) {
+-                return requestConfig.getClientExecutionTimeout();
+-            } else {
+-                return config.getClientExecutionTimeout();
+-            }
+-        }
+-
+-        /**
+-         * Stateful parameters that are used for executing a single httpClientSettings request.
+-         */
+-        private class ExecOneRequestParams {
+-            int requestCount; // monotonic increasing
+-            /**
+-             * Last delay between retries
+-             */
+-            long lastBackoffDelay = 0;
+-            SdkBaseException retriedException; // last retryable exception
+-            HttpRequestBase apacheRequest;
+-            org.apache.http.HttpResponse apacheResponse;
+-            URI redirectedURI;
+-            AuthRetryParameters authRetryParam;
+-            /*
+-             * Depending on which response handler we end up choosing to handle the HTTP response, it
+-             * might require us to leave the underlying HTTP connection open, depending on whether or
+-             * not it reads the complete HTTP response stream from the HTTP connection, or if delays
+-             * reading any of the content until after a response is returned to the caller.
+-             */
+-            boolean leaveHttpConnectionOpen;
+-            private Signer signer; // cached
+-            private URI signerURI;
+-
+-            boolean isRetry() {
+-                return requestCount > 1 || redirectedURI != null || authRetryParam != null;
+-            }
+-
+-            void initPerRetry() {
+-                requestCount++;
+-                apacheRequest = null;
+-                apacheResponse = null;
+-                leaveHttpConnectionOpen = false;
+-            }
+-
+-            void newSigner(final Request request, final ExecutionContext execContext) {
+-                final SignerProviderContext.Builder signerProviderContext = SignerProviderContext
+-                        .builder()
+-                        .withRequest(request)
+-                        .withRequestConfig(requestConfig);
+-                if (authRetryParam != null) {
+-                    signerURI = authRetryParam.getEndpointForRetry();
+-                    signer = authRetryParam.getSignerForRetry();
+-                    // Push the local signer override back to the execution context
+-                    execContext.setSigner(signer);
+-                } else if (redirectedURI != null && !redirectedURI.equals(signerURI)) {
+-                    signerURI = redirectedURI;
+-                    signer = execContext.getSigner(signerProviderContext
+-                                                           .withUri(signerURI)
+-                                                           .withIsRedirect(true)
+-                                                           .build());
+-                } else if (signer == null) {
+-                    signerURI = request.getEndpoint();
+-                    signer = execContext
+-                            .getSigner(signerProviderContext.withUri(signerURI).build());
+-                }
+-            }
+-
+-            /**
+-             * @throws FakeIOException thrown only during test simulation
+-             */
+-            HttpRequestBase newApacheRequest(
+-                    final HttpRequestFactory httpRequestFactory,
+-                    final Request request,
+-                    final HttpClientSettings options) throws IOException {
+-
+-                apacheRequest = httpRequestFactory.create(request, options);
+-                if (redirectedURI != null) {
+-                    apacheRequest.setURI(redirectedURI);
+-                }
+-                return apacheRequest;
+-            }
+-
+-            void resetBeforeHttpRequest() {
+-                retriedException = null;
+-                authRetryParam = null;
+-                redirectedURI = null;
+-            }
+-
+-            private Integer getStatusCode() {
+-                if (apacheResponse == null || apacheResponse.getStatusLine() == null) {
+-                    return null;
+-                }
+-                return apacheResponse.getStatusLine().getStatusCode();
+-            }
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/apache/client/impl/ApacheConnectionManagerFactory.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/apache/client/impl/ApacheConnectionManagerFactory.java
+--- ./src/main/java/com/amazonaws/http/apache/client/impl/ApacheConnectionManagerFactory.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/apache/client/impl/ApacheConnectionManagerFactory.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,220 +0,0 @@
+-/*
+- * Copyright (c) 2016. Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.apache.client.impl;
+-
+-import com.amazonaws.SDKGlobalConfiguration;
+-import com.amazonaws.http.AmazonHttpClient;
+-import com.amazonaws.http.DelegatingDnsResolver;
+-import com.amazonaws.http.client.ConnectionManagerFactory;
+-import com.amazonaws.http.conn.ssl.SdkTLSSocketFactory;
+-import com.amazonaws.http.settings.HttpClientSettings;
+-import com.amazonaws.internal.SdkSSLContext;
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-import org.apache.http.HttpHost;
+-import org.apache.http.config.ConnectionConfig;
+-import org.apache.http.config.Registry;
+-import org.apache.http.config.RegistryBuilder;
+-import org.apache.http.config.SocketConfig;
+-import org.apache.http.conn.HttpClientConnectionManager;
+-import org.apache.http.conn.socket.ConnectionSocketFactory;
+-import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
+-import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+-import org.apache.http.impl.conn.DefaultSchemePortResolver;
+-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+-import org.apache.http.protocol.HttpContext;
+-
+-import javax.net.ssl.HostnameVerifier;
+-import javax.net.ssl.SSLContext;
+-import javax.net.ssl.SSLSocket;
+-import javax.net.ssl.TrustManager;
+-import javax.net.ssl.X509TrustManager;
+-import java.io.IOException;
+-import java.net.InetSocketAddress;
+-import java.net.Socket;
+-import java.net.UnknownHostException;
+-import java.security.cert.CertificateException;
+-import java.security.cert.X509Certificate;
+-import java.util.concurrent.TimeUnit;
+-
+-import static com.amazonaws.SDKGlobalConfiguration.DISABLE_CERT_CHECKING_SYSTEM_PROPERTY;
+-
+-/**
+- * Factory class to create connection manager used by the apache client.
+- */
+-public class ApacheConnectionManagerFactory implements
+-        ConnectionManagerFactory {
+-
+-    private final Log LOG = LogFactory.getLog(AmazonHttpClient.class);
+-
+-    @Override
+-    public HttpClientConnectionManager create(final HttpClientSettings settings) {
+-        ConnectionSocketFactory sslsf = getPreferredSocketFactory(settings);
+-
+-        final PoolingHttpClientConnectionManager cm = new
+-                PoolingHttpClientConnectionManager(
+-                createSocketFactoryRegistry(sslsf),
+-                null,
+-                DefaultSchemePortResolver.INSTANCE,
+-                new DelegatingDnsResolver(settings.getDnsResolver()),
+-                settings.getConnectionPoolTTL(),
+-                TimeUnit.MILLISECONDS);
+-
+-        cm.setValidateAfterInactivity(settings.getValidateAfterInactivityMillis());
+-        cm.setDefaultMaxPerRoute(settings.getMaxConnections());
+-        cm.setMaxTotal(settings.getMaxConnections());
+-        cm.setDefaultSocketConfig(buildSocketConfig(settings));
+-        cm.setDefaultConnectionConfig(buildConnectionConfig(settings));
+-
+-        return cm;
+-    }
+-
+-    private ConnectionSocketFactory getPreferredSocketFactory(HttpClientSettings settings) {
+-        ConnectionSocketFactory sslsf = settings.getApacheHttpClientConfig().getSslSocketFactory();
+-
+-        return sslsf != null
+-                ? sslsf
+-                : new SdkTLSSocketFactory(
+-                SdkSSLContext.getPreferredSSLContext(settings.getSecureRandom()),
+-                getHostNameVerifier(settings));
+-    }
+-
+-
+-    private SocketConfig buildSocketConfig(HttpClientSettings settings) {
+-        return SocketConfig.custom()
+-                .setSoKeepAlive(settings.useTcpKeepAlive())
+-                .setSoTimeout(settings.getSocketTimeout())
+-                .setTcpNoDelay(true)
+-                .build();
+-    }
+-
+-    private ConnectionConfig buildConnectionConfig(HttpClientSettings settings) {
+-
+-        int socketBufferSize = Math.max(settings.getSocketBufferSize()[0],
+-                settings.getSocketBufferSize()[1]);
+-
+-        return socketBufferSize <= 0
+-                ? null
+-                : ConnectionConfig.custom()
+-                .setBufferSize(socketBufferSize)
+-                .build();
+-    }
+-
+-    private HostnameVerifier getHostNameVerifier
+-            (HttpClientSettings options) {
+-        // TODO Need to find a better way to handle these deprecations.
+-        return options.useBrowserCompatibleHostNameVerifier()
+-                ? SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER
+-                : SSLConnectionSocketFactory.STRICT_HOSTNAME_VERIFIER;
+-    }
+-
+-    private Registry createSocketFactoryRegistry(ConnectionSocketFactory sslSocketFactory) {
+-
+-        /*
+-         * If SSL cert checking for endpoints has been explicitly disabled,
+-         * register a new scheme for HTTPS that won't cause self-signed certs to
+-         * error out.
+-         */
+-        if (SDKGlobalConfiguration.isCertCheckingDisabled()) {
+-            if (LOG.isWarnEnabled()) {
+-                LOG.warn("SSL Certificate checking for endpoints has been " +
+-                        "explicitly disabled.");
+-            }
+-            sslSocketFactory = new TrustingSocketFactory();
+-        }
+-
+-        return RegistryBuilder.create()
+-                .register("http", PlainConnectionSocketFactory.getSocketFactory())
+-                .register("https", sslSocketFactory)
+-                .build();
+-    }
+-
+-    /**
+-     * Simple implementation of SchemeSocketFactory (and
+-     * LayeredSchemeSocketFactory) that bypasses SSL certificate checks. This
+-     * class is only intended to be used for testing purposes.
+-     */
+-    private static class TrustingSocketFactory implements
+-            LayeredConnectionSocketFactory {
+-
+-        private SSLContext sslcontext = null;
+-
+-        private static SSLContext createSSLContext() throws IOException {
+-            try {
+-                SSLContext context = SSLContext.getInstance("TLS");
+-                context.init(null, new TrustManager[]{new TrustingX509TrustManager()}, null);
+-                return context;
+-            } catch (Exception e) {
+-                throw new IOException(e.getMessage(), e);
+-            }
+-        }
+-
+-        @Override
+-        public Socket createLayeredSocket(Socket socket, String target, int port, HttpContext context) throws IOException, UnknownHostException {
+-            return getSSLContext().getSocketFactory().createSocket(socket,
+-                    target, port, true);
+-        }
+-
+-        @Override
+-        public Socket createSocket(HttpContext context) throws IOException {
+-            return getSSLContext().getSocketFactory().createSocket();
+-        }
+-
+-        @Override
+-        public Socket connectSocket(int connectTimeout, Socket sock, HttpHost host, InetSocketAddress remoteAddress, InetSocketAddress localAddress, HttpContext context) throws IOException {
+-
+-            SSLSocket sslsock = (SSLSocket) ((sock != null) ? sock :
+-                    createSocket(context));
+-            if (localAddress != null) sslsock.bind(localAddress);
+-
+-
+-            sslsock.connect(remoteAddress, connectTimeout);
+-            // socket timeout is set internally by the
+-            // PoolingHttpClientConnectionManager.
+-            return sslsock;
+-        }
+-
+-        private SSLContext getSSLContext() throws IOException {
+-            if (this.sslcontext == null) this.sslcontext = createSSLContext();
+-            return this.sslcontext;
+-        }
+-    }
+-
+-    /**
+-     * Simple implementation of X509TrustManager that trusts all certificates.
+-     * This class is only intended to be used for testing purposes.
+-     */
+-    private static class TrustingX509TrustManager implements X509TrustManager {
+-        private static final X509Certificate[] X509_CERTIFICATES = new X509Certificate[0];
+-
+-        @Override
+-        public X509Certificate[] getAcceptedIssuers() {
+-            return X509_CERTIFICATES;
+-        }
+-
+-        @Override
+-        public void checkServerTrusted(X509Certificate[] chain, String authType)
+-                throws CertificateException {
+-            // No-op, to trust all certs
+-        }
+-
+-        @Override
+-        public void checkClientTrusted(X509Certificate[] chain, String authType)
+-                throws CertificateException {
+-            // No-op, to trust all certs
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/apache/client/impl/ApacheHttpClientFactory.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/apache/client/impl/ApacheHttpClientFactory.java
+--- ./src/main/java/com/amazonaws/http/apache/client/impl/ApacheHttpClientFactory.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/apache/client/impl/ApacheHttpClientFactory.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,107 +0,0 @@
+-/*
+- * Copyright (c) 2016. Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.apache.client.impl;
+-
+-import com.amazonaws.http.AmazonHttpClient;
+-import com.amazonaws.http.IdleConnectionReaper;
+-import com.amazonaws.http.apache.SdkProxyRoutePlanner;
+-import com.amazonaws.http.apache.utils.ApacheUtils;
+-import com.amazonaws.http.client.ConnectionManagerFactory;
+-import com.amazonaws.http.client.HttpClientFactory;
+-import com.amazonaws.http.conn.ClientConnectionManagerFactory;
+-import com.amazonaws.http.conn.SdkConnectionKeepAliveStrategy;
+-import com.amazonaws.http.protocol.SdkHttpRequestExecutor;
+-import com.amazonaws.http.settings.HttpClientSettings;
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-import org.apache.http.HttpResponseInterceptor;
+-import org.apache.http.conn.ConnectionKeepAliveStrategy;
+-import org.apache.http.conn.HttpClientConnectionManager;
+-import org.apache.http.impl.client.HttpClientBuilder;
+-import org.apache.http.impl.client.HttpClients;
+-
+-/**
+- * Factory class that builds the apache http client from the settings.
+- */
+-public class ApacheHttpClientFactory implements HttpClientFactory {
+-
+-    private static final Log LOG = LogFactory.getLog(AmazonHttpClient.class);
+-    private final ConnectionManagerFactory
+-            cmFactory = new ApacheConnectionManagerFactory();
+-
+-    @Override
+-    public ConnectionManagerAwareHttpClient create(HttpClientSettings settings) {
+-        final HttpClientBuilder builder = HttpClients.custom();
+-        // Note that it is important we register the original connection manager with the
+-        // IdleConnectionReaper as it's required for the successful deregistration of managers
+-        // from the reaper. See https://github.com/aws/aws-sdk-java/issues/722.
+-        final HttpClientConnectionManager cm = cmFactory.create(settings);
+-
+-        builder.setRequestExecutor(new SdkHttpRequestExecutor())
+-                .setKeepAliveStrategy(buildKeepAliveStrategy(settings))
+-                .disableRedirectHandling()
+-                .disableAutomaticRetries()
+-                .setConnectionManager(ClientConnectionManagerFactory.wrap(cm));
+-
+-        // By default http client enables Gzip compression. So we disable it
+-        // here.
+-        // Apache HTTP client removes Content-Length, Content-Encoding and
+-        // Content-MD5 headers when Gzip compression is enabled. Currently
+-        // this doesn't affect S3 or Glacier which exposes these headers.
+-        //
+-        if (!(settings.useGzip())) {
+-            builder.disableContentCompression();
+-        }
+-
+-        HttpResponseInterceptor itcp = new CRC32ChecksumResponseInterceptor();
+-        if (settings.calculateCRC32FromCompressedData()) {
+-            builder.addInterceptorFirst(itcp);
+-        } else {
+-            builder.addInterceptorLast(itcp);
+-        }
+-
+-        addProxyConfig(builder, settings);
+-
+-        final ConnectionManagerAwareHttpClient httpClient = new SdkHttpClient(builder.build(), cm);
+-
+-        if (settings.useReaper()) {
+-            IdleConnectionReaper.registerConnectionManager(cm, settings.getMaxIdleConnectionTime());
+-        }
+-
+-        return httpClient;
+-    }
+-
+-    private void addProxyConfig(HttpClientBuilder builder,
+-                                HttpClientSettings settings) {
+-        if (settings.isProxyEnabled()) {
+-
+-            LOG.info("Configuring Proxy. Proxy Host: " + settings.getProxyHost() + " " +
+-                    "Proxy Port: " + settings.getProxyPort());
+-
+-            builder.setRoutePlanner(new SdkProxyRoutePlanner(
+-                    settings.getProxyHost(), settings.getProxyPort(), settings.getNonProxyHosts()));
+-
+-            if (settings.isAuthenticatedProxy()) {
+-                builder.setDefaultCredentialsProvider(ApacheUtils.newProxyCredentialsProvider(settings));
+-            }
+-        }
+-    }
+-
+-    private ConnectionKeepAliveStrategy buildKeepAliveStrategy(HttpClientSettings settings) {
+-        return settings.getMaxIdleConnectionTime() > 0
+-                ? new SdkConnectionKeepAliveStrategy(settings.getMaxIdleConnectionTime())
+-                : null;
+-    }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/http/apache/client/impl/ConnectionManagerAwareHttpClient.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/apache/client/impl/ConnectionManagerAwareHttpClient.java
+--- ./src/main/java/com/amazonaws/http/apache/client/impl/ConnectionManagerAwareHttpClient.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/apache/client/impl/ConnectionManagerAwareHttpClient.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,31 +0,0 @@
+-/*
+- * Copyright (c) 2016. Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.apache.client.impl;
+-
+-import org.apache.http.client.HttpClient;
+-import org.apache.http.conn.HttpClientConnectionManager;
+-
+-/**
+- * An extension of Apache's HttpClient that expose the connection manager
+- * associated with the client.
+- */
+-public interface ConnectionManagerAwareHttpClient extends HttpClient {
+-
+-    /**
+-     * Returns the {@link HttpClientConnectionManager} associated with the
+-     * http client.
+-     */
+-    HttpClientConnectionManager getHttpClientConnectionManager();
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/apache/client/impl/CRC32ChecksumResponseInterceptor.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/apache/client/impl/CRC32ChecksumResponseInterceptor.java
+--- ./src/main/java/com/amazonaws/http/apache/client/impl/CRC32ChecksumResponseInterceptor.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/apache/client/impl/CRC32ChecksumResponseInterceptor.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,81 +0,0 @@
+-/*
+- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.apache.client.impl;
+-
+-import com.amazonaws.util.CRC32ChecksumCalculatingInputStream;
+-import com.amazonaws.util.IOUtils;
+-
+-import org.apache.http.Header;
+-import org.apache.http.HttpEntity;
+-import org.apache.http.HttpException;
+-import org.apache.http.HttpResponse;
+-import org.apache.http.HttpResponseInterceptor;
+-import org.apache.http.entity.HttpEntityWrapper;
+-import org.apache.http.protocol.HttpContext;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.io.OutputStream;
+-
+-public class CRC32ChecksumResponseInterceptor implements HttpResponseInterceptor {
+-
+-    @Override
+-    public void process(HttpResponse response, final HttpContext context)
+-            throws HttpException, IOException {
+-        final HttpEntity entity = response.getEntity();
+-
+-        // Only Json protocol has this header, we only wrap CRC32ChecksumCalculatingInputStream in json protocol clients.
+-        Header[] headers = response.getHeaders("x-amz-crc32");
+-        if (entity == null || headers == null || headers.length == 0) {
+-            return;
+-        }
+-        HttpEntity crc32ResponseEntity = new HttpEntityWrapper(entity) {
+-
+-            private final InputStream content = new CRC32ChecksumCalculatingInputStream(
+-                    wrappedEntity.getContent());
+-
+-            @Override
+-            public InputStream getContent() throws IOException {
+-                return content;
+-            }
+-
+-            /**
+-             * It's important to override writeTo. Some versions of Apache HTTP
+-             * client use writeTo for {@link org.apache.http.entity.BufferedHttpEntity}
+-             * and the default implementation just delegates to the wrapped entity
+-             * which completely bypasses our CRC32 calculating input stream. The
+-             * {@link org.apache.http.entity.BufferedHttpEntity} is used for the
+-             * request timeout and client execution timeout features.
+-             *
+-             * @see Issue #526
+-             *
+-             * @param outstream OutputStream to write contents to
+-             */
+-            @Override
+-            public void writeTo(OutputStream outstream) throws IOException {
+-                try {
+-                    IOUtils.copy(this.getContent(), outstream);
+-                } finally {
+-                    this.getContent().close();
+-                }
+-            }
+-        };
+-
+-        response.setEntity(crc32ResponseEntity);
+-        context.setAttribute(CRC32ChecksumCalculatingInputStream.class.getName(),
+-                             crc32ResponseEntity.getContent());
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/apache/client/impl/SdkHttpClient.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/apache/client/impl/SdkHttpClient.java
+--- ./src/main/java/com/amazonaws/http/apache/client/impl/SdkHttpClient.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/apache/client/impl/SdkHttpClient.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,109 +0,0 @@
+-/*
+- * Copyright (c) 2016. Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.apache.client.impl;
+-
+-import org.apache.http.HttpHost;
+-import org.apache.http.HttpRequest;
+-import org.apache.http.HttpResponse;
+-import org.apache.http.client.ClientProtocolException;
+-import org.apache.http.client.HttpClient;
+-import org.apache.http.client.ResponseHandler;
+-import org.apache.http.client.methods.HttpUriRequest;
+-import org.apache.http.conn.ClientConnectionManager;
+-import org.apache.http.conn.HttpClientConnectionManager;
+-import org.apache.http.params.HttpParams;
+-import org.apache.http.protocol.HttpContext;
+-
+-import java.io.IOException;
+-
+-/**
+- * An instance of {@link ConnectionManagerAwareHttpClient} that delegates all the requests to the given http client.
+- */
+-public class SdkHttpClient implements
+-        ConnectionManagerAwareHttpClient {
+-
+-    private final HttpClient delegate;
+-
+-    private final HttpClientConnectionManager cm;
+-
+-    public SdkHttpClient(final HttpClient delegate,
+-                         final HttpClientConnectionManager cm) {
+-        if (delegate == null) {
+-            throw new IllegalArgumentException("delegate " +
+-                    "cannot be null");
+-        }
+-        if (cm == null) {
+-            throw new IllegalArgumentException("connection manager " +
+-                    "cannot be null");
+-        }
+-        this.delegate = delegate;
+-        this.cm = cm;
+-    }
+-
+-    @Override
+-    public HttpParams getParams() {
+-        return delegate.getParams();
+-    }
+-
+-    @Override
+-    public ClientConnectionManager getConnectionManager() {
+-        return delegate.getConnectionManager();
+-    }
+-
+-    @Override
+-    public HttpResponse execute(HttpUriRequest request) throws IOException, ClientProtocolException {
+-        return delegate.execute(request);
+-    }
+-
+-    @Override
+-    public HttpResponse execute(HttpUriRequest request, HttpContext context) throws IOException, ClientProtocolException {
+-        return delegate.execute(request, context);
+-    }
+-
+-    @Override
+-    public HttpResponse execute(HttpHost target, HttpRequest request) throws IOException, ClientProtocolException {
+-        return delegate.execute(target, request);
+-    }
+-
+-    @Override
+-    public HttpResponse execute(HttpHost target, HttpRequest request, HttpContext context) throws IOException, ClientProtocolException {
+-        return delegate.execute(target, request, context);
+-    }
+-
+-    @Override
+-    public  T execute(HttpUriRequest request, ResponseHandler responseHandler) throws IOException, ClientProtocolException {
+-        return delegate.execute(request, responseHandler);
+-    }
+-
+-    @Override
+-    public  T execute(HttpUriRequest request, ResponseHandler responseHandler, HttpContext context) throws IOException, ClientProtocolException {
+-        return delegate.execute(request, responseHandler, context);
+-    }
+-
+-    @Override
+-    public  T execute(HttpHost target, HttpRequest request, ResponseHandler responseHandler) throws IOException, ClientProtocolException {
+-        return delegate.execute(target, request, responseHandler);
+-    }
+-
+-    @Override
+-    public  T execute(HttpHost target, HttpRequest request, ResponseHandler responseHandler, HttpContext context) throws IOException, ClientProtocolException {
+-        return delegate.execute(target, request, responseHandler, context);
+-    }
+-
+-    @Override
+-    public HttpClientConnectionManager getHttpClientConnectionManager() {
+-        return cm;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/apache/request/impl/ApacheHttpRequestFactory.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/apache/request/impl/ApacheHttpRequestFactory.java
+--- ./src/main/java/com/amazonaws/http/apache/request/impl/ApacheHttpRequestFactory.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/apache/request/impl/ApacheHttpRequestFactory.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,257 +0,0 @@
+-/*
+- * Copyright (c) 2016. Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.apache.request.impl;
+-
+-import com.amazonaws.ClientConfiguration;
+-import com.amazonaws.ProxyAuthenticationMethod;
+-import com.amazonaws.Request;
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.http.HttpMethodName;
+-import com.amazonaws.http.RepeatableInputStreamRequestEntity;
+-import com.amazonaws.http.apache.utils.ApacheUtils;
+-import com.amazonaws.http.request.HttpRequestFactory;
+-import com.amazonaws.http.settings.HttpClientSettings;
+-import com.amazonaws.util.FakeIOException;
+-import com.amazonaws.util.SdkHttpUtils;
+-import java.net.URI;
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.List;
+-import java.util.Map.Entry;
+-import org.apache.http.HttpEntity;
+-import org.apache.http.HttpHeaders;
+-import org.apache.http.client.config.AuthSchemes;
+-import org.apache.http.client.config.RequestConfig;
+-import org.apache.http.client.methods.HttpDelete;
+-import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
+-import org.apache.http.client.methods.HttpHead;
+-import org.apache.http.client.methods.HttpOptions;
+-import org.apache.http.client.methods.HttpPatch;
+-import org.apache.http.client.methods.HttpPost;
+-import org.apache.http.client.methods.HttpPut;
+-import org.apache.http.client.methods.HttpRequestBase;
+-
+-/**
+- * Responsible for creating Apache HttpClient 4 request objects.
+- */
+-public class ApacheHttpRequestFactory implements
+-        HttpRequestFactory {
+-
+-    private static final String DEFAULT_ENCODING = "UTF-8";
+-
+-    private static final List ignoreHeaders = Arrays.asList
+-            (HttpHeaders.CONTENT_LENGTH, HttpHeaders.HOST);
+-
+-    @Override
+-    public HttpRequestBase create(final Request request,
+-                                  final HttpClientSettings settings)
+-            throws
+-            FakeIOException {
+-        URI endpoint = request.getEndpoint();
+-
+-        /*
+-         * HttpClient cannot handle url in pattern of "http://host//path", so we
+-         * have to escape the double-slash between endpoint and resource-path
+-         * into "/%2F"
+-         */
+-        String uri = SdkHttpUtils.appendUri(endpoint.toString(), request
+-                .getResourcePath(), true);
+-        String encodedParams = SdkHttpUtils.encodeParameters(request);
+-
+-        /*
+-         * For all non-POST requests, and any POST requests that already have a
+-         * payload, we put the encoded params directly in the URI, otherwise,
+-         * we'll put them in the POST request's payload.
+-         */
+-        boolean requestHasNoPayload = request.getContent() != null;
+-        boolean requestIsPost = request.getHttpMethod() == HttpMethodName.POST;
+-        boolean putParamsInUri = !requestIsPost || requestHasNoPayload;
+-        if (encodedParams != null && putParamsInUri) {
+-            uri += "?" + encodedParams;
+-        }
+-
+-        final HttpRequestBase base = createApacheRequest(request, uri, encodedParams);
+-        addHeadersToRequest(base, request);
+-        addRequestConfig(base, request, settings);
+-
+-        return base;
+-    }
+-
+-    private void addRequestConfig(final HttpRequestBase base,
+-                                  final Request request,
+-                                  final HttpClientSettings settings) {
+-        final RequestConfig.Builder requestConfigBuilder = RequestConfig
+-                .custom()
+-                .setConnectionRequestTimeout(settings.getConnectionPoolRequestTimeout())
+-                .setConnectTimeout(settings.getConnectionTimeout())
+-                .setSocketTimeout(settings.getSocketTimeout())
+-                .setLocalAddress(settings.getLocalAddress());
+-
+-        /*
+-         * Enable 100-continue support for PUT operations, since this is
+-         * where we're potentially uploading large amounts of data and want
+-         * to find out as early as possible if an operation will fail. We
+-         * don't want to do this for all operations since it will cause
+-         * extra latency in the network interaction.
+-         */
+-        if (HttpMethodName.PUT == request.getHttpMethod() && settings.isUseExpectContinue()) {
+-            requestConfigBuilder.setExpectContinueEnabled(true);
+-        }
+-
+-        addProxyConfig(requestConfigBuilder, settings);
+-
+-        base.setConfig(requestConfigBuilder.build());
+-    }
+-
+-    private HttpRequestBase createApacheRequest(Request request, String uri, String encodedParams) throws FakeIOException {
+-        switch (request.getHttpMethod()) {
+-            case HEAD:
+-                return new HttpHead(uri);
+-            case GET:
+-                return wrapEntity(request, new HttpGetWithBody(uri), encodedParams);
+-            case DELETE:
+-                return new HttpDelete(uri);
+-            case OPTIONS:
+-                return new HttpOptions(uri);
+-            case PATCH:
+-                return wrapEntity(request, new HttpPatch(uri), encodedParams);
+-            case POST:
+-                return wrapEntity(request, new HttpPost(uri), encodedParams);
+-            case PUT:
+-                return wrapEntity(request, new HttpPut(uri), encodedParams);
+-            default:
+-                throw new SdkClientException("Unknown HTTP method name: " + request.getHttpMethod());
+-        }
+-    }
+-
+-    private HttpRequestBase wrapEntity(Request request,
+-                                       HttpEntityEnclosingRequestBase entityEnclosingRequest,
+-                                       String encodedParams) throws FakeIOException {
+-
+-        if (HttpMethodName.POST == request.getHttpMethod()) {
+-            /*
+-             * If there isn't any payload content to include in this request,
+-             * then try to include the POST parameters in the query body,
+-             * otherwise, just use the query string. For all AWS Query services,
+-             * the best behavior is putting the params in the request body for
+-             * POST requests, but we can't do that for S3.
+-             */
+-            if (request.getContent() == null && encodedParams != null) {
+-                entityEnclosingRequest.setEntity(ApacheUtils.newStringEntity(encodedParams));
+-            } else {
+-                entityEnclosingRequest.setEntity(new RepeatableInputStreamRequestEntity(request));
+-            }
+-        } else {
+-            /*
+-             * We should never reuse the entity of the previous request, since
+-             * reading from the buffered entity will bypass reading from the
+-             * original request content. And if the content contains InputStream
+-             * wrappers that were added for validation-purpose (e.g.
+-             * Md5DigestCalculationInputStream), these wrappers would never be
+-             * read and updated again after AmazonHttpClient resets it in
+-             * preparation for the retry. Eventually, these wrappers would
+-             * return incorrect validation result.
+-             */
+-            if (request.getContent() != null) {
+-                HttpEntity entity = new RepeatableInputStreamRequestEntity(request);
+-                if (request.getHeaders().get(HttpHeaders.CONTENT_LENGTH) == null) {
+-                    entity = ApacheUtils.newBufferedHttpEntity(entity);
+-                }
+-                entityEnclosingRequest.setEntity(entity);
+-            }
+-        }
+-        return entityEnclosingRequest;
+-    }
+-
+-    /**
+-     * Configures the headers in the specified Apache HTTP request.
+-     */
+-    private void addHeadersToRequest(HttpRequestBase httpRequest, Request request) {
+-
+-        httpRequest.addHeader(HttpHeaders.HOST, getHostHeaderValue(request.getEndpoint()));
+-
+-        // Copy over any other headers already in our request
+-        for (Entry entry : request.getHeaders().entrySet()) {
+-            /*
+-             * HttpClient4 fills in the Content-Length header and complains if
+-             * it's already present, so we skip it here. We also skip the Host
+-             * header to avoid sending it twice, which will interfere with some
+-             * signing schemes.
+-             */
+-            if (!(ignoreHeaders.contains(entry.getKey()))) {
+-                httpRequest.addHeader(entry.getKey(), entry.getValue());
+-            }
+-        }
+-
+-        /* Set content type and encoding */
+-        if (httpRequest.getHeaders(HttpHeaders.CONTENT_TYPE) == null || httpRequest
+-                .getHeaders
+-                        (HttpHeaders.CONTENT_TYPE).length == 0) {
+-            httpRequest.addHeader(HttpHeaders.CONTENT_TYPE,
+-                    "application/x-www-form-urlencoded; " +
+-                            "charset=" + DEFAULT_ENCODING.toLowerCase());
+-        }
+-    }
+-
+-    private String getHostHeaderValue(final URI endpoint) {
+-        /*
+-         * Apache HttpClient omits the port number in the Host header (even if
+-         * we explicitly specify it) if it's the default port for the protocol
+-         * in use. To ensure that we use the same Host header in the request and
+-         * in the calculated string to sign (even if Apache HttpClient changed
+-         * and started honoring our explicit host with endpoint), we follow this
+-         * same behavior here and in the QueryString signer.
+-         */
+-        return SdkHttpUtils.isUsingNonDefaultPort(endpoint)
+-                ? endpoint.getHost() + ":" + endpoint.getPort()
+-                : endpoint.getHost();
+-    }
+-
+-    /**
+-     * Update the provided request configuration builder to specify the proxy authentication schemes that should be used when
+-     * authenticating against the HTTP proxy.
+-     *
+-     * @see ClientConfiguration#setProxyAuthenticationMethods(List)
+-     */
+-    private void addProxyConfig(RequestConfig.Builder requestConfigBuilder, HttpClientSettings settings) {
+-        if (settings.isProxyEnabled() && settings.isAuthenticatedProxy() && settings.getProxyAuthenticationMethods() != null) {
+-            List apacheAuthenticationSchemes = new ArrayList();
+-
+-            for (ProxyAuthenticationMethod authenticationMethod : settings.getProxyAuthenticationMethods()) {
+-                apacheAuthenticationSchemes.add(toApacheAuthenticationScheme(authenticationMethod));
+-            }
+-
+-            requestConfigBuilder.setProxyPreferredAuthSchemes(apacheAuthenticationSchemes);
+-        }
+-    }
+-
+-    /**
+-     * Convert the customer-facing authentication method into an apache-specific authentication method.
+-     */
+-    private String toApacheAuthenticationScheme(ProxyAuthenticationMethod authenticationMethod) {
+-        if (authenticationMethod == null) {
+-            throw new IllegalStateException("The configured proxy authentication methods must not be null.");
+-        }
+-
+-        switch (authenticationMethod) {
+-            case NTLM: return AuthSchemes.NTLM;
+-            case BASIC: return AuthSchemes.BASIC;
+-            case DIGEST: return AuthSchemes.DIGEST;
+-            case SPNEGO: return AuthSchemes.SPNEGO;
+-            case KERBEROS: return AuthSchemes.KERBEROS;
+-            default: throw new IllegalStateException("Unknown authentication scheme: " + authenticationMethod);
+-        }
+-    }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/http/apache/request/impl/HttpGetWithBody.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/apache/request/impl/HttpGetWithBody.java
+--- ./src/main/java/com/amazonaws/http/apache/request/impl/HttpGetWithBody.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/apache/request/impl/HttpGetWithBody.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,36 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.http.apache.request.impl;
+-
+-import java.net.URI;
+-import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
+-import org.apache.http.client.methods.HttpGet;
+-
+-/**
+- * Allows sending a GET request with a request body.
+- */
+-public class HttpGetWithBody extends HttpEntityEnclosingRequestBase {
+-
+-    public HttpGetWithBody(String uri) {
+-        super();
+-        setURI(URI.create(uri));
+-    }
+-
+-    @Override
+-    public String getMethod() {
+-        return HttpGet.METHOD_NAME;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/apache/SdkProxyRoutePlanner.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/apache/SdkProxyRoutePlanner.java
+--- ./src/main/java/com/amazonaws/http/apache/SdkProxyRoutePlanner.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/apache/SdkProxyRoutePlanner.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,75 +0,0 @@
+-/*
+- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.apache;
+-
+-import org.apache.http.HttpException;
+-import org.apache.http.HttpHost;
+-import org.apache.http.HttpRequest;
+-import org.apache.http.impl.conn.DefaultRoutePlanner;
+-import org.apache.http.impl.conn.DefaultSchemePortResolver;
+-import org.apache.http.protocol.HttpContext;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.http.apache.client.impl.ApacheHttpClientFactory;
+-import com.amazonaws.util.StringUtils;
+-
+-/**
+- * SdkProxyRoutePlanner delegates a Proxy Route Planner from the settings instead of the
+- * system properties. It will use the proxy created from proxyHost and proxyPort and
+- * filter the hosts who matches nonProxyHosts pattern.
+- *
+- * @see ApacheHttpClientFactory#create(com.amazonaws.http.settings.HttpClientSettings)
+- */
+-@SdkInternalApi
+-public class SdkProxyRoutePlanner extends DefaultRoutePlanner {
+-    private HttpHost proxy;
+-    private String[] hostPatterns;
+-
+-    public SdkProxyRoutePlanner(String proxyHost, int proxyPort, String nonProxyHosts) {
+-        super(DefaultSchemePortResolver.INSTANCE);
+-        proxy = new HttpHost(proxyHost, proxyPort);
+-        parseNonProxyHosts(nonProxyHosts);
+-    }
+-
+-    private void parseNonProxyHosts(String nonProxyHosts) {
+-        if (!StringUtils.isNullOrEmpty(nonProxyHosts)) {
+-            String[] hosts = nonProxyHosts.split("\\|");
+-            hostPatterns = new String[hosts.length];
+-            for (int i = 0; i < hosts.length; ++i) {
+-                hostPatterns[i] = hosts[i].toLowerCase().replace("*", ".*?");
+-            }
+-        }
+-    }
+-
+-    boolean doesTargetMatchNonProxyHosts(HttpHost target) {
+-        if (hostPatterns == null) {
+-            return false;
+-        }
+-        String targetHost = target.getHostName().toLowerCase();
+-        for (String pattern : hostPatterns) {
+-            if (targetHost.matches(pattern)) return true;
+-        }
+-        return false;
+-    }
+-
+-    @Override
+-    protected HttpHost determineProxy(
+-        final HttpHost target,
+-        final HttpRequest request,
+-        final HttpContext context) throws HttpException {
+-
+-        return doesTargetMatchNonProxyHosts(target) ? null : proxy;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/apache/utils/ApacheUtils.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/apache/utils/ApacheUtils.java
+--- ./src/main/java/com/amazonaws/http/apache/utils/ApacheUtils.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/apache/utils/ApacheUtils.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,186 +0,0 @@
+-/*
+- * Copyright (c) 2016. Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.apache.utils;
+-
+-import com.amazonaws.Request;
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.http.HttpResponse;
+-import com.amazonaws.http.settings.HttpClientSettings;
+-import com.amazonaws.util.FakeIOException;
+-import org.apache.http.Header;
+-import org.apache.http.HttpEntity;
+-import org.apache.http.HttpHost;
+-import org.apache.http.HttpStatus;
+-import org.apache.http.auth.AuthScope;
+-import org.apache.http.auth.Credentials;
+-import org.apache.http.auth.NTCredentials;
+-import org.apache.http.client.AuthCache;
+-import org.apache.http.client.CredentialsProvider;
+-import org.apache.http.client.methods.HttpRequestBase;
+-import org.apache.http.client.protocol.HttpClientContext;
+-import org.apache.http.entity.BufferedHttpEntity;
+-import org.apache.http.entity.StringEntity;
+-import org.apache.http.impl.auth.BasicScheme;
+-import org.apache.http.impl.client.BasicAuthCache;
+-import org.apache.http.impl.client.BasicCredentialsProvider;
+-
+-import java.io.IOException;
+-import java.io.UnsupportedEncodingException;
+-import java.util.Map;
+-import org.apache.http.protocol.HttpContext;
+-
+-public class ApacheUtils {
+-
+-    /**
+-     * Checks if the request was successful or not based on the status code.
+-     *
+-     * @param response HTTP response
+-     * @return True if the request was successful (i.e. has a 2xx status code), false otherwise.
+-     */
+-    public static boolean isRequestSuccessful(org.apache.http.HttpResponse response) {
+-        int status = response.getStatusLine().getStatusCode();
+-        return status / 100 == HttpStatus.SC_OK / 100;
+-    }
+-
+-    /**
+-     * Creates and initializes an HttpResponse object suitable to be passed to an HTTP response
+-     * handler object.
+-     *
+-     * @param request Marshalled request object.
+-     * @param method  The HTTP method that was invoked to get the response.
+-     * @param context The HTTP context associated with the request and response.
+-     * @return The new, initialized HttpResponse object ready to be passed to an HTTP response
+-     * handler object.
+-     * @throws IOException If there were any problems getting any response information from the
+-     *                     HttpClient method object.
+-     */
+-    public static HttpResponse createResponse(Request request,
+-                                        HttpRequestBase method,
+-                                        org.apache.http.HttpResponse apacheHttpResponse,
+-                                        HttpContext context) throws IOException {
+-        HttpResponse httpResponse = new HttpResponse(request, method, context);
+-
+-        if (apacheHttpResponse.getEntity() != null) {
+-            httpResponse.setContent(apacheHttpResponse.getEntity().getContent());
+-        }
+-
+-        httpResponse.setStatusCode(apacheHttpResponse.getStatusLine().getStatusCode());
+-        httpResponse.setStatusText(apacheHttpResponse.getStatusLine().getReasonPhrase());
+-        for (Header header : apacheHttpResponse.getAllHeaders()) {
+-            httpResponse.addHeader(header.getName(), header.getValue());
+-        }
+-
+-        return httpResponse;
+-    }
+-
+-    /**
+-     * Utility function for creating a new StringEntity and wrapping any errors
+-     * as a SdkClientException.
+-     *
+-     * @param s The string contents of the returned HTTP entity.
+-     * @return A new StringEntity with the specified contents.
+-     */
+-    public static HttpEntity newStringEntity(String s) {
+-        try {
+-            return new StringEntity(s);
+-        } catch (UnsupportedEncodingException e) {
+-            throw new SdkClientException("Unable to create HTTP entity: " + e.getMessage(), e);
+-        }
+-    }
+-
+-    /**
+-     * Utility function for creating a new BufferedEntity and wrapping any errors
+-     * as a SdkClientException.
+-     *
+-     * @param entity The HTTP entity to wrap with a buffered HTTP entity.
+-     * @return A new BufferedHttpEntity wrapping the specified entity.
+-     * @throws FakeIOException only for test simulation
+-     */
+-    public static HttpEntity newBufferedHttpEntity(HttpEntity entity) throws
+-            FakeIOException {
+-        try {
+-            return new BufferedHttpEntity(entity);
+-        } catch (FakeIOException e) {
+-            // Only for test simulation.
+-            throw e;
+-        } catch (IOException e) {
+-            throw new SdkClientException("Unable to create HTTP entity: " + e.getMessage(), e);
+-        }
+-    }
+-
+-    /**
+-     * Returns a new HttpClientContext used for request execution.
+-     */
+-    public static HttpClientContext newClientContext(HttpClientSettings settings,
+-                                                     Map
+-                                                             attributes) {
+-        final HttpClientContext clientContext = new HttpClientContext();
+-
+-        if (attributes != null && !attributes.isEmpty()) {
+-            for (Map.Entry entry : attributes.entrySet()) {
+-                clientContext.setAttribute(entry.getKey(), entry.getValue());
+-            }
+-        }
+-
+-        addPreemptiveAuthenticationProxy(clientContext, settings);
+-        return clientContext;
+-
+-    }
+-
+-    /**
+-     * Returns a new Credentials Provider for use with proxy authentication.
+-     */
+-    public static CredentialsProvider newProxyCredentialsProvider
+-    (HttpClientSettings settings) {
+-        final CredentialsProvider provider = new BasicCredentialsProvider();
+-        provider.setCredentials(newAuthScope(settings), newNTCredentials(settings));
+-        return provider;
+-    }
+-
+-    /**
+-     * Returns a new instance of NTCredentials used for proxy authentication.
+-     */
+-    private static Credentials newNTCredentials(HttpClientSettings settings) {
+-        return new NTCredentials(settings.getProxyUsername(),
+-                settings.getProxyPassword(),
+-                settings.getProxyWorkstation(),
+-                settings.getProxyDomain());
+-    }
+-
+-    /**
+-     * Returns a new instance of AuthScope used for proxy authentication.
+-     */
+-    private static AuthScope newAuthScope(HttpClientSettings settings) {
+-        return new AuthScope(settings.getProxyHost(), settings.getProxyPort());
+-    }
+-
+-    private static void addPreemptiveAuthenticationProxy(HttpClientContext clientContext,
+-                                                         HttpClientSettings settings) {
+-
+-        if (settings.isPreemptiveBasicProxyAuth()) {
+-            HttpHost targetHost = new HttpHost(settings.getProxyHost(), settings
+-                    .getProxyPort());
+-            final CredentialsProvider credsProvider = newProxyCredentialsProvider(settings);
+-            // Create AuthCache instance
+-            AuthCache authCache = new BasicAuthCache();
+-            // Generate BASIC scheme object and add it to the local auth cache
+-            BasicScheme basicAuth = new BasicScheme();
+-            authCache.put(targetHost, basicAuth);
+-
+-            clientContext.setCredentialsProvider(credsProvider);
+-            clientContext.setAuthCache(authCache);
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/AwsErrorResponseHandler.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/AwsErrorResponseHandler.java
+--- ./src/main/java/com/amazonaws/http/AwsErrorResponseHandler.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/AwsErrorResponseHandler.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,79 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http;
+-
+-import com.amazonaws.AmazonServiceException;
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.util.AWSRequestMetrics;
+-
+-/**
+- * Wrapper around protocol specific error handler to deal with some default scenarios and fill in common information.
+- */
+-@SdkInternalApi
+-class AwsErrorResponseHandler implements HttpResponseHandler {
+-
+-    private final HttpResponseHandler delegate;
+-    private final AWSRequestMetrics awsRequestMetrics;
+-
+-    AwsErrorResponseHandler(HttpResponseHandler errorResponseHandler,
+-                            AWSRequestMetrics awsRequestMetrics) {
+-        this.delegate = errorResponseHandler;
+-        this.awsRequestMetrics = awsRequestMetrics;
+-    }
+-
+-    @Override
+-    public AmazonServiceException handle(HttpResponse response) throws Exception {
+-        final AmazonServiceException ase = handleAse(response);
+-        ase.setStatusCode(response.getStatusCode());
+-        ase.setServiceName(response.getRequest().getServiceName());
+-        awsRequestMetrics.addPropertyWith(AWSRequestMetrics.Field.AWSRequestID, ase.getRequestId())
+-                .addPropertyWith(AWSRequestMetrics.Field.AWSErrorCode, ase.getErrorCode())
+-                .addPropertyWith(AWSRequestMetrics.Field.StatusCode, ase.getStatusCode());
+-        return ase;
+-    }
+-
+-    private AmazonServiceException handleAse(HttpResponse response) throws Exception {
+-        final int statusCode = response.getStatusCode();
+-        try {
+-            return delegate.handle(response);
+-        } catch(InterruptedException e) {
+-            throw e;
+-        } catch (Exception e) {
+-            // If the errorResponseHandler doesn't work, then check for error responses that don't have any content
+-            if (statusCode == 413) {
+-                AmazonServiceException exception = new AmazonServiceException("Request entity too large");
+-                exception.setServiceName(response.getRequest().getServiceName());
+-                exception.setStatusCode(statusCode);
+-                exception.setErrorType(AmazonServiceException.ErrorType.Client);
+-                exception.setErrorCode("Request entity too large");
+-                return exception;
+-            } else if (statusCode >= 500 && statusCode < 600) {
+-                AmazonServiceException exception = new AmazonServiceException(response.getStatusText());
+-                exception.setServiceName(response.getRequest().getServiceName());
+-                exception.setStatusCode(statusCode);
+-                exception.setErrorType(AmazonServiceException.ErrorType.Service);
+-                exception.setErrorCode(response.getStatusText());
+-                return exception;
+-            } else {
+-                throw e;
+-            }
+-        }
+-    }
+-
+-    @Override
+-    public boolean needsConnectionLeftOpen() {
+-        return delegate.needsConnectionLeftOpen();
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/client/ConnectionManagerFactory.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/client/ConnectionManagerFactory.java
+--- ./src/main/java/com/amazonaws/http/client/ConnectionManagerFactory.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/client/ConnectionManagerFactory.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,29 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.client;
+-
+-import com.amazonaws.annotation.Beta;
+-import com.amazonaws.http.settings.HttpClientSettings;
+-
+-/**
+- * Factory interface that can be used for create ConnectionManager used by
+- * the underlying http client.
+- */
+-@Beta
+-public interface ConnectionManagerFactory {
+-
+-    T create(final HttpClientSettings settings);
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/client/HttpClientFactory.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/client/HttpClientFactory.java
+--- ./src/main/java/com/amazonaws/http/client/HttpClientFactory.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/client/HttpClientFactory.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,30 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.client;
+-
+-import com.amazonaws.annotation.Beta;
+-import com.amazonaws.http.settings.HttpClientSettings;
+-
+-
+-/**
+- * Factory interface that can be used for creating the underlying http client
+- * for request execution.
+- */
+-@Beta
+-public interface HttpClientFactory {
+-
+-    T create(HttpClientSettings settings);
+-
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/http/conn/ClientConnectionManagerFactory.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/conn/ClientConnectionManagerFactory.java
+--- ./src/main/java/com/amazonaws/http/conn/ClientConnectionManagerFactory.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/conn/ClientConnectionManagerFactory.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,87 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.conn;
+-
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-import org.apache.http.conn.ConnectionRequest;
+-import org.apache.http.conn.HttpClientConnectionManager;
+-import org.apache.http.pool.ConnPoolControl;
+-
+-import java.lang.reflect.InvocationHandler;
+-import java.lang.reflect.InvocationTargetException;
+-import java.lang.reflect.Method;
+-import java.lang.reflect.Proxy;
+-
+-public class ClientConnectionManagerFactory {
+-    private static final Log log = LogFactory.getLog(ClientConnectionManagerFactory.class);
+-
+-    /**
+-     * Returns a wrapped instance of {@link HttpClientConnectionManager}
+-     * to capture the necessary performance metrics.
+-     *
+-     * @param orig the target instance to be wrapped
+-     */
+-    public static HttpClientConnectionManager wrap
+-    (HttpClientConnectionManager orig) {
+-        if (orig instanceof Wrapped)
+-            throw new IllegalArgumentException();
+-        final Class[] interfaces;
+-        if (orig instanceof ConnPoolControl) {
+-            interfaces = new Class[]{
+-                    HttpClientConnectionManager.class,
+-                    ConnPoolControl.class,
+-                    Wrapped.class
+-            };
+-        } else {
+-            interfaces = new Class[]{
+-                    HttpClientConnectionManager.class,
+-                    Wrapped.class
+-            };
+-        }
+-        return (HttpClientConnectionManager) Proxy.newProxyInstance(
+-                // https://github.com/aws/aws-sdk-java/pull/48#issuecomment-29454423
+-                ClientConnectionManagerFactory.class.getClassLoader(),
+-                interfaces,
+-                new Handler(orig));
+-    }
+-
+-    /**
+-     * The handler behind the dynamic proxy for {@link HttpClientConnectionManager}
+-     * so that the any returned instance of {@link ConnectionRequest} can
+-     * further wrapped for capturing performance metrics.
+-     */
+-    private static class Handler implements InvocationHandler {
+-        private final HttpClientConnectionManager orig;
+-
+-        Handler(HttpClientConnectionManager real) {
+-            this.orig = real;
+-        }
+-
+-        @Override
+-        public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+-            try {
+-                Object ret = method.invoke(orig, args);
+-                return ret instanceof ConnectionRequest
+-                        ? ClientConnectionRequestFactory.wrap((ConnectionRequest) ret)
+-                        : ret
+-                        ;
+-            } catch (InvocationTargetException e) {
+-                log.debug("", e);
+-                throw e.getCause();
+-            }
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/conn/ClientConnectionRequestFactory.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/conn/ClientConnectionRequestFactory.java
+--- ./src/main/java/com/amazonaws/http/conn/ClientConnectionRequestFactory.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/conn/ClientConnectionRequestFactory.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,83 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.conn;
+-
+-import java.lang.reflect.InvocationHandler;
+-import java.lang.reflect.InvocationTargetException;
+-import java.lang.reflect.Method;
+-import java.lang.reflect.Proxy;
+-
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-import org.apache.http.conn.ConnectionRequest;
+-
+-import com.amazonaws.metrics.AwsSdkMetrics;
+-import com.amazonaws.metrics.ServiceLatencyProvider;
+-import com.amazonaws.util.AWSServiceMetrics;
+-
+-class ClientConnectionRequestFactory {
+-    private static final Log log = LogFactory.getLog(ClientConnectionRequestFactory.class);
+-    private static final Class[] interfaces = {
+-            ConnectionRequest.class,
+-        Wrapped.class
+-    };
+-
+-    /**
+-     * Returns a wrapped instance of {@link ConnectionRequest}
+-     * to capture the necessary performance metrics.
+-     * @param orig the target instance to be wrapped
+-     */
+-    static ConnectionRequest wrap(ConnectionRequest orig) {
+-        if (orig instanceof Wrapped)
+-            throw new IllegalArgumentException();
+-        return (ConnectionRequest) Proxy.newProxyInstance(
+-                // https://github.com/aws/aws-sdk-java/pull/48#issuecomment-29454423
+-                ClientConnectionRequestFactory.class.getClassLoader(),
+-                interfaces,
+-                new Handler(orig));
+-    }
+-
+-    /**
+-     * The handler behind the dynamic proxy for {@link ConnectionRequest}
+-     * so that the latency of the
+-     * {@link ConnectionRequest#get(long, java.util.concurrent.TimeUnit)}
+-     * can be captured.
+-     */
+-    private static class Handler implements InvocationHandler {
+-        private final ConnectionRequest orig;
+-        Handler(ConnectionRequest orig) {
+-            this.orig = orig;
+-        }
+-        @Override
+-        public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+-            try {
+-                if ("get".equals(method.getName())) {
+-                    ServiceLatencyProvider latencyProvider = new ServiceLatencyProvider(
+-                            AWSServiceMetrics.HttpClientGetConnectionTime);
+-                    try {
+-                        return method.invoke(orig, args);
+-                    } finally {
+-                        AwsSdkMetrics.getServiceMetricCollector()
+-                                .collectLatency(latencyProvider.endTiming());
+-                    }
+-                }
+-                return method.invoke(orig, args);
+-            } catch (InvocationTargetException e) {
+-                log.debug("", e);
+-                throw e.getCause();
+-            }
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/conn/SdkConnectionKeepAliveStrategy.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/conn/SdkConnectionKeepAliveStrategy.java
+--- ./src/main/java/com/amazonaws/http/conn/SdkConnectionKeepAliveStrategy.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/conn/SdkConnectionKeepAliveStrategy.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,57 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.conn;
+-
+-import org.apache.http.HttpResponse;
+-import org.apache.http.conn.ConnectionKeepAliveStrategy;
+-import org.apache.http.impl.client.DefaultConnectionKeepAliveStrategy;
+-import org.apache.http.protocol.HttpContext;
+-
+-/**
+- * The AWS SDK for Java's implementation of the
+- * {@code ConnectionKeepAliveStrategy} interface. Allows a user-configurable
+- * maximum idle time for connections.
+- */
+-public class SdkConnectionKeepAliveStrategy
+-        implements ConnectionKeepAliveStrategy {
+-
+-    private final long maxIdleTime;
+-
+-    /**
+-     * @param maxIdleTime the maximum time a connection may be idle
+-     */
+-    public SdkConnectionKeepAliveStrategy(long maxIdleTime) {
+-        this.maxIdleTime = maxIdleTime;
+-    }
+-
+-    @Override
+-    public long getKeepAliveDuration(
+-            HttpResponse response,
+-            HttpContext context) {
+-
+-        // If there's a Keep-Alive timeout directive in the response and it's
+-        // shorter than our configured max, honor that. Otherwise go with the
+-        // configured maximum.
+-
+-        long duration = DefaultConnectionKeepAliveStrategy.INSTANCE
+-                .getKeepAliveDuration(response, context);
+-
+-        if (0 < duration && duration < maxIdleTime) {
+-            return duration;
+-        }
+-
+-        return maxIdleTime;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/conn/ssl/MasterSecretValidators.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/conn/ssl/MasterSecretValidators.java
+--- ./src/main/java/com/amazonaws/http/conn/ssl/MasterSecretValidators.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/conn/ssl/MasterSecretValidators.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,98 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.conn.ssl;
+-
+-import java.net.Socket;
+-
+-import com.amazonaws.http.conn.ssl.privileged.PrivilegedMasterSecretValidator;
+-import com.amazonaws.util.JavaVersionParser;
+-import com.amazonaws.util.JavaVersionParser.JavaVersion;
+-
+-public class MasterSecretValidators {
+-
+-    // Versions that the SKIP-TLS bug has been fixed in for each affected major version
+-    private static final JavaVersion FIXED_JAVA_6 = new JavaVersion(1, 6, 0, 91);
+-    private static final JavaVersion FIXED_JAVA_7 = new JavaVersion(1, 7, 0, 51);
+-    private static final JavaVersion FIXED_JAVA_8 = new JavaVersion(1, 8, 0, 31);
+-
+-    /**
+-     * Interface to validate the master secret of a SSL session
+-     */
+-    public interface MasterSecretValidator {
+-        /**
+-         * @param socket
+-         *            SSLSocket containing master secret
+-         * @return True if master secret is considered valid, false otherwise
+-         */
+-        public boolean isMasterSecretValid(final Socket socket);
+-    }
+-
+-    /**
+-     * The implementation of {@link MasterSecretValidator} depends on the JVM version. Certain JVMs
+-     * are affected by a serious bug that could allow a malicious MITM to negotiate a null master
+-     * secret. Non-affected JVMs return a dummy implementation that always returns true
+-     * 
+-     * @see http://www.oracle.com/technetwork/topics/security/cpujan2015-1972971.html
+-     * @see https://access.redhat.com/security/cve/CVE-2014-6593
+-     * @return The correct implementation of {@link MasterSecretValidator}
+-     */
+-    public static MasterSecretValidator getMasterSecretValidator() {
+-        return getMasterSecretValidator(JavaVersionParser.getCurrentJavaVersion());
+-    }
+-
+-    /**
+-     * @param javaVersion
+-     *            Current Java version
+-     * @return An appropriate {@link MasterSecretValidator} per the Java version in use
+-     */
+-    public static MasterSecretValidator getMasterSecretValidator(JavaVersion javaVersion) {
+-        switch (javaVersion.getKnownVersion()) {
+-        case JAVA_6:
+-            if (javaVersion.compareTo(FIXED_JAVA_6) < 0) {
+-                return new PrivilegedMasterSecretValidator();
+-            }
+-            break;
+-        case JAVA_7:
+-            if (javaVersion.compareTo(FIXED_JAVA_7) < 0) {
+-                return new PrivilegedMasterSecretValidator();
+-            }
+-            break;
+-        case JAVA_8:
+-            if (javaVersion.compareTo(FIXED_JAVA_8) < 0) {
+-                return new PrivilegedMasterSecretValidator();
+-            }
+-            break;
+-        default:
+-            break;
+-
+-        }
+-        return new NoOpMasterSecretValidator();
+-
+-    }
+-
+-    /**
+-     * Dummy implementation of {@link MasterSecretValidator} that always returns true. For JVMs that
+-     * aren't affected by the SKIP-TLS bug
+-     */
+-    public static class NoOpMasterSecretValidator implements MasterSecretValidator {
+-
+-        @Override
+-        public boolean isMasterSecretValid(Socket socket) {
+-            return true;
+-        }
+-
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/conn/ssl/privileged/PrivilegedMasterSecretValidator.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/conn/ssl/privileged/PrivilegedMasterSecretValidator.java
+--- ./src/main/java/com/amazonaws/http/conn/ssl/privileged/PrivilegedMasterSecretValidator.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/conn/ssl/privileged/PrivilegedMasterSecretValidator.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,105 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.conn.ssl.privileged;
+-
+-import java.lang.reflect.Method;
+-import java.net.Socket;
+-import java.security.AccessController;
+-import java.security.PrivilegedAction;
+-
+-import javax.net.ssl.SSLSession;
+-import javax.net.ssl.SSLSocket;
+-
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-
+-import com.amazonaws.http.conn.ssl.MasterSecretValidators.MasterSecretValidator;
+-
+-/**
+- * Implementation of {@link MasterSecretValidator} that verifies the master secret is non null
+- * through use of Sun internal APIs. This validation is done only for JVMs affected by the SKIP-TLS
+- * bug. It is best effort and any exception encountered while trying to validate the master secret
+- * (including {@link SecurityException}) will be ignored
+- */
+-public class PrivilegedMasterSecretValidator implements MasterSecretValidator {
+-
+-    private static final Log LOG = LogFactory.getLog(PrivilegedMasterSecretValidator.class);
+-
+-    /**
+-     * Double check the master secret of an SSL session is not null
+-     * 
+-     * @param socket
+-     *            connected socket
+-     * @return True if master secret is valid (i.e. non-null) or master secret cannot be validated,
+-     *         false otherwise
+-     */
+-    public boolean isMasterSecretValid(final Socket socket) {
+-        return AccessController.doPrivileged(new PrivilegedAction() {
+-            @Override
+-            public Boolean run() {
+-                return privilegedIsMasterSecretValid(socket);
+-            }
+-        });
+-    }
+-
+-    /**
+-     * Checks the validity of an SSLSession's master secret. Should be run within a doPrivileged
+-     * block
+-     */
+-    private boolean privilegedIsMasterSecretValid(final Socket socket) {
+-        if (socket instanceof SSLSocket) {
+-            SSLSession session = getSslSession(socket);
+-            if (session != null) {
+-                String className = session.getClass().getName();
+-                if ("sun.security.ssl.SSLSessionImpl".equals(className)) {
+-                    try {
+-                        Object masterSecret = getMasterSecret(session, className);
+-                        if (masterSecret == null) {
+-                            session.invalidate();
+-                            if (LOG.isDebugEnabled()) {
+-                                LOG.debug("Invalidated session " + session);
+-                            }
+-                            return false;
+-                        }
+-                    } catch (Exception e) {
+-                        failedToVerifyMasterSecret(e);
+-                    }
+-                }
+-            }
+-        }
+-        return true;
+-
+-    }
+-
+-    /**
+-     * @return The active {@link SSLSession} for the Socket or null if there is none
+-     */
+-    private SSLSession getSslSession(final Socket socket) {
+-        return ((SSLSocket) socket).getSession();
+-    }
+-
+-    private Object getMasterSecret(SSLSession session, String className) throws Exception {
+-        Class clazz = Class.forName(className);
+-        Method method = clazz.getDeclaredMethod("getMasterSecret");
+-        method.setAccessible(true);
+-        return method.invoke(session);
+-    }
+-
+-    private void failedToVerifyMasterSecret(Throwable t) {
+-        if (LOG.isDebugEnabled()) {
+-            LOG.debug("Failed to verify the SSL master secret", t);
+-        }
+-    }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/http/conn/ssl/SdkTLSSocketFactory.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/conn/ssl/SdkTLSSocketFactory.java
+--- ./src/main/java/com/amazonaws/http/conn/ssl/SdkTLSSocketFactory.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/conn/ssl/SdkTLSSocketFactory.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,189 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon Technologies, Inc.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at:
+- *
+- *    http://aws.amazon.com/apache2.0
+- *
+- * This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+- * OR CONDITIONS OF ANY KIND, either express or implied. See the
+- * License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package com.amazonaws.http.conn.ssl;
+-
+-import com.amazonaws.annotation.ThreadSafe;
+-import com.amazonaws.internal.SdkMetricsSocket;
+-import com.amazonaws.internal.SdkSSLMetricsSocket;
+-import com.amazonaws.internal.SdkSSLSocket;
+-import com.amazonaws.internal.SdkSocket;
+-import com.amazonaws.metrics.AwsSdkMetrics;
+-import com.amazonaws.util.JavaVersionParser;
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-import org.apache.http.HttpHost;
+-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+-import org.apache.http.protocol.HttpContext;
+-
+-import javax.net.ssl.HostnameVerifier;
+-import javax.net.ssl.SSLContext;
+-import javax.net.ssl.SSLException;
+-import javax.net.ssl.SSLSession;
+-import javax.net.ssl.SSLSessionContext;
+-import javax.net.ssl.SSLSocket;
+-import java.io.IOException;
+-import java.net.InetSocketAddress;
+-import java.net.Socket;
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.Enumeration;
+-import java.util.List;
+-
+-/**
+- * Used to enforce the preferred TLS protocol during SSL handshake.
+- */
+-@ThreadSafe
+-public class SdkTLSSocketFactory extends SSLConnectionSocketFactory {
+-
+-    private static final Log LOG = LogFactory.getLog(SdkTLSSocketFactory.class);
+-    private final SSLContext sslContext;
+-    private final MasterSecretValidators.MasterSecretValidator masterSecretValidator;
+-    private final ShouldClearSslSessionPredicate shouldClearSslSessionsPredicate;
+-
+-    public SdkTLSSocketFactory(final SSLContext sslContext, final HostnameVerifier hostnameVerifier) {
+-        super(sslContext, hostnameVerifier);
+-        if (sslContext == null) {
+-            throw new IllegalArgumentException(
+-                    "sslContext must not be null. " + "Use SSLContext.getDefault() if you are unsure.");
+-        }
+-        this.sslContext = sslContext;
+-        this.masterSecretValidator = MasterSecretValidators.getMasterSecretValidator();
+-        this.shouldClearSslSessionsPredicate = new ShouldClearSslSessionPredicate(JavaVersionParser.getCurrentJavaVersion());
+-    }
+-
+-    /**
+-     * {@inheritDoc} Used to enforce the preferred TLS protocol during SSL handshake.
+-     */
+-    @Override
+-    protected final void prepareSocket(final SSLSocket socket) {
+-        String[] supported = socket.getSupportedProtocols();
+-        String[] enabled = socket.getEnabledProtocols();
+-        if (LOG.isDebugEnabled()) {
+-            LOG.debug("socket.getSupportedProtocols(): " + Arrays.toString(supported)
+-                    + ", socket.getEnabledProtocols(): " + Arrays.toString(enabled));
+-        }
+-        List target = new ArrayList();
+-        if (supported != null) {
+-            // Append the preferred protocols in descending order of preference
+-            // but only do so if the protocols are supported
+-            TLSProtocol[] values = TLSProtocol.values();
+-            for (int i = 0; i < values.length; i++) {
+-                final String pname = values[i].getProtocolName();
+-                if (existsIn(pname, supported)) {
+-                    target.add(pname);
+-                }
+-            }
+-        }
+-        if (enabled != null) {
+-            // Append the rest of the already enabled protocols to the end
+-            // if not already included in the list
+-            for (String pname : enabled) {
+-                if (!target.contains(pname)) {
+-                    target.add(pname);
+-                }
+-            }
+-        }
+-        if (target.size() > 0) {
+-            String[] enabling = target.toArray(new String[target.size()]);
+-            socket.setEnabledProtocols(enabling);
+-            if (LOG.isDebugEnabled()) {
+-                LOG.debug("TLS protocol enabled for SSL handshake: " + Arrays.toString(enabling));
+-            }
+-        }
+-    }
+-
+-    /**
+-     * Returns true if the given element exists in the given array; false otherwise.
+-     */
+-    private boolean existsIn(String element, String[] a) {
+-        for (String s : a) {
+-            if (element.equals(s)) {
+-                return true;
+-            }
+-        }
+-        return false;
+-    }
+-
+-    public Socket connectSocket(
+-            final int connectTimeout,
+-            final Socket socket,
+-            final HttpHost host,
+-            final InetSocketAddress remoteAddress,
+-            final InetSocketAddress localAddress,
+-            final HttpContext context) throws IOException {
+-        if (LOG.isDebugEnabled()) {
+-            LOG.debug("connecting to " + remoteAddress.getAddress() + ":" + remoteAddress.getPort());
+-        }
+-        Socket connectedSocket;
+-        try {
+-            connectedSocket = super.connectSocket
+-                    (connectTimeout, socket, host, remoteAddress, localAddress, context);
+-            if (!masterSecretValidator.isMasterSecretValid(connectedSocket)) {
+-                throw log(new IllegalStateException("Invalid SSL master secret"));
+-            }
+-        } catch (final SSLException sslEx) {
+-            if (shouldClearSslSessionsPredicate.test(sslEx)) {
+-                // clear any related sessions from our cache
+-                if (LOG.isDebugEnabled()) {
+-                    LOG.debug("connection failed due to SSL error, clearing TLS session cache", sslEx);
+-                }
+-                clearSessionCache(sslContext.getClientSessionContext(), remoteAddress);
+-            }
+-            throw sslEx;
+-        }
+-
+-        if (connectedSocket instanceof SSLSocket) {
+-            SdkSSLSocket sslSocket = new SdkSSLSocket((SSLSocket) connectedSocket);
+-            return AwsSdkMetrics.isHttpSocketReadMetricEnabled() ? new SdkSSLMetricsSocket(sslSocket) : sslSocket;
+-        }
+-        SdkSocket sdkSocket = new SdkSocket(connectedSocket);
+-        return AwsSdkMetrics.isHttpSocketReadMetricEnabled() ? new SdkMetricsSocket(sdkSocket) : sdkSocket;
+-    }
+-
+-    /**
+-     * Invalidates all SSL/TLS sessions in {@code sessionContext} associated with {@code remoteAddress}.
+-     *
+-     * @param sessionContext collection of SSL/TLS sessions to be (potentially) invalidated
+-     * @param remoteAddress  associated with sessions to invalidate
+-     */
+-    private void clearSessionCache(final SSLSessionContext sessionContext, final InetSocketAddress remoteAddress) {
+-        final String hostName = remoteAddress.getHostName();
+-        final int port = remoteAddress.getPort();
+-        final Enumeration ids = sessionContext.getIds();
+-
+-        if (ids == null) {
+-            return;
+-        }
+-
+-        while (ids.hasMoreElements()) {
+-            final byte[] id = ids.nextElement();
+-            final SSLSession session = sessionContext.getSession(id);
+-            if (session != null && session.getPeerHost() != null && session.getPeerHost().equalsIgnoreCase(hostName)
+-                    && session.getPeerPort() == port) {
+-                session.invalidate();
+-                if (LOG.isDebugEnabled()) {
+-                    LOG.debug("Invalidated session " + session);
+-                }
+-            }
+-        }
+-    }
+-
+-    private  T log(T t) {
+-        if (LOG.isDebugEnabled()) {
+-            LOG.debug("", t);
+-        }
+-        return t;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/conn/ssl/ShouldClearSslSessionPredicate.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/conn/ssl/ShouldClearSslSessionPredicate.java
+--- ./src/main/java/com/amazonaws/http/conn/ssl/ShouldClearSslSessionPredicate.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/conn/ssl/ShouldClearSslSessionPredicate.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,113 +0,0 @@
+-/*
+- * Copyright (c) 2016. Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.http.conn.ssl;
+-
+-import com.amazonaws.internal.SdkPredicate;
+-import com.amazonaws.util.JavaVersionParser.JavaVersion;
+-
+-import javax.net.ssl.SSLException;
+-import java.util.Arrays;
+-import java.util.List;
+-
+-/**
+- * Determines whether we should apply the workaround to bug that causes the SSL session cache to be
+- * stuck in a bad state for either 24 hours or the next JVM restart. The workaround is to clear out
+- * SSL sessions upon receiving an SSL exception. Whether we apply the workaround depends on the type
+- * of SSL exception thrown and the JVM version in use.
+- * 
+- * @see http://tiny/1jjdylxma/wamazindeJava
+- */
+-public class ShouldClearSslSessionPredicate extends SdkPredicate {
+-
+-    /**
+-     * Fixed per http://bugs.java.com/view_bug.do?bug_id=8075750
+-     */
+-    public static final JavaVersion FIXED_JAVA_7 = new JavaVersion(1, 7, 0, 85);
+-
+-    /**
+-     * Fixed per http://bugs.java.com/view_bug.do?bug_id=8074944
+-     */
+-    public static final JavaVersion FIXED_JAVA_8 = new JavaVersion(1, 8, 0, 60);
+-
+-    /**
+-     * Message that may indicate the SSL session cache is in a bad state and needs to be cleared.
+-     */
+-    private static List EXCEPTION_MESSAGE_WHITELIST = Arrays.asList("server certificate change is restricted",
+-            "peer not authenticated");
+-
+-    private final JavaVersion javaVersion;
+-
+-    /**
+-     * @param javaVersion
+-     *            Current JVM version
+-     */
+-    public ShouldClearSslSessionPredicate(JavaVersion javaVersion) {
+-        this.javaVersion = javaVersion;
+-    }
+-
+-    /**
+-     * @param sslEx
+-     *            SSLException thrown during connect
+-     * @return True is the SSL session cache should be cleared, false otherwise.
+-     */
+-    @Override
+-    public boolean test(SSLException sslEx) {
+-        return isExceptionAffected(sslEx.getMessage()) && isJvmAffected();
+-    }
+-
+-    /**
+-     * @return True if the current JVM version is subject to the bug described above, false
+-     *         otherwise.
+-     */
+-    private boolean isJvmAffected() {
+-        switch (javaVersion.getKnownVersion()) {
+-        case JAVA_6:
+-            // Java 6 was not and will not be patched for this bug
+-            return true;
+-        case JAVA_7:
+-            return javaVersion.compareTo(FIXED_JAVA_7) < 0;
+-        case JAVA_8:
+-            return javaVersion.compareTo(FIXED_JAVA_8) < 0;
+-        case JAVA_9:
+-            // No Java 9 version is affected
+-            return false;
+-        case UNKNOWN:
+-            // If we can't determine the Java version err on the side of caution and apply the fix
+-            return true;
+-        }
+-        return true;
+-    }
+-
+-    /**
+-     * Restrict the workaround to only certain types of SSLExceptions that indicate the bug may have
+-     * been encountered.
+-     * 
+-     * @param exceptionMessage
+-     *            Message of the {@link SSLException}
+-     * @return True if message indicates the bug may have been encountered, false otherwise
+-     */
+-    private boolean isExceptionAffected(final String exceptionMessage) {
+-        if (exceptionMessage != null) {
+-            for (String affectedMessage : EXCEPTION_MESSAGE_WHITELIST) {
+-                if (exceptionMessage.contains(affectedMessage)) {
+-                    return true;
+-                }
+-            }
+-        }
+-        return false;
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/conn/ssl/TLSProtocol.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/conn/ssl/TLSProtocol.java
+--- ./src/main/java/com/amazonaws/http/conn/ssl/TLSProtocol.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/conn/ssl/TLSProtocol.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,43 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon Technologies, Inc.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at:
+- *
+- *    http://aws.amazon.com/apache2.0
+- *
+- * This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+- * OR CONDITIONS OF ANY KIND, either express or implied. See the
+- * License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package com.amazonaws.http.conn.ssl;
+-
+-/**
+- * TLS protocols arranged in descending order of security preference in terms of
+- * their ordinal numbers. See JSSE Standard Names.
+- */
+-enum TLSProtocol {
+-    TLSv1_2("TLSv1.2"), // most secure/preferred
+-    TLSv1_1("TLSv1.1"),
+-    TLSv1("TLSv1"),
+-    TLS("TLS"),         // least secure/preferred, but acceptable
+-    ;
+-    private final String protocolName;
+-
+-    private TLSProtocol(String protocolName) {
+-        this.protocolName = protocolName;
+-    }
+-
+-    /**
+-     * Returns the corresponding TLS protocol name as per the JSSE Standard Names
+-     */
+-    String getProtocolName() {
+-        return protocolName;
+-    }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/http/conn/Wrapped.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/conn/Wrapped.java
+--- ./src/main/java/com/amazonaws/http/conn/Wrapped.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/conn/Wrapped.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,20 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.conn;
+-
+-/**
+- * An internal marker interface to defend against accidental recursive wrappings.
+- */
+-interface Wrapped {}
+diff -Nau8r ./src/main/java/com/amazonaws/http/DefaultErrorResponseHandler.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/DefaultErrorResponseHandler.java
+--- ./src/main/java/com/amazonaws/http/DefaultErrorResponseHandler.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/DefaultErrorResponseHandler.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,159 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http;
+-
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.AmazonServiceException;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.transform.Unmarshaller;
+-import com.amazonaws.util.IOUtils;
+-import com.amazonaws.util.StringUtils;
+-import com.amazonaws.util.XpathUtils;
+-
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-import org.w3c.dom.Document;
+-import org.w3c.dom.Node;
+-import org.xml.sax.SAXException;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.util.List;
+-
+-import javax.xml.parsers.ParserConfigurationException;
+-
+-import static com.amazonaws.http.AmazonHttpClient.HEADER_SDK_TRANSACTION_ID;
+-
+-/**
+- * Implementation of HttpResponseHandler that handles only error responses from Amazon Web Services.
+- * A list of unmarshallers is passed into the constructor, and while handling a response, each
+- * unmarshaller is tried, in order, until one is found that can successfully unmarshall the error
+- * response.  If no unmarshaller is found that can unmarshall the error response, a generic
+- * AmazonServiceException is created and populated with the AWS error response information (error
+- * message, AWS error code, AWS request ID, etc).
+- */
+-@SdkProtectedApi
+-public class DefaultErrorResponseHandler implements HttpResponseHandler {
+-    private static final Log log = LogFactory.getLog(DefaultErrorResponseHandler.class);
+-
+-    /**
+-     * The list of error response unmarshallers to try to apply to error responses.
+-     */
+-    private List> unmarshallerList;
+-
+-    /**
+-     * Constructs a new DefaultErrorResponseHandler that will handle error responses from Amazon
+-     * services using the specified list of unmarshallers. Each unmarshaller will be tried, in
+-     * order, until one is found that can unmarshall the error response.
+-     *
+-     * @param unmarshallerList The list of unmarshallers to try using when handling an error
+-     *                         response.
+-     */
+-    public DefaultErrorResponseHandler(
+-            List> unmarshallerList) {
+-        this.unmarshallerList = unmarshallerList;
+-    }
+-
+-    @Override
+-    public AmazonServiceException handle(HttpResponse errorResponse) throws Exception {
+-        AmazonServiceException ase = createAse(errorResponse);
+-        if (ase == null) {
+-            throw new SdkClientException("Unable to unmarshall error response from service");
+-        }
+-        ase.setHttpHeaders(errorResponse.getHeaders());
+-        if (StringUtils.isNullOrEmpty(ase.getErrorCode())) {
+-            ase.setErrorCode(errorResponse.getStatusCode() + " " + errorResponse.getStatusText());
+-        }
+-        return ase;
+-    }
+-
+-    private AmazonServiceException createAse(HttpResponse errorResponse) throws Exception {
+-        // Try to parse the error response as XML
+-        final Document document = documentFromContent(errorResponse.getContent(), idString(errorResponse));
+-
+-        /*
+-         * We need to select which exception unmarshaller is the correct one to
+-         * use from all the possible exceptions this operation can throw.
+-         * Currently we rely on the unmarshallers to return null if they can't
+-         * unmarshall the response, but we might need something a little more
+-         * sophisticated in the future.
+-         */
+-        for (Unmarshaller unmarshaller : unmarshallerList) {
+-            AmazonServiceException ase = unmarshaller.unmarshall(document);
+-            if (ase != null) {
+-                ase.setStatusCode(errorResponse.getStatusCode());
+-                return ase;
+-            }
+-        }
+-        return null;
+-    }
+-
+-    private Document documentFromContent(InputStream content, String idString) throws ParserConfigurationException, SAXException, IOException {
+-        try {
+-            return parseXml(contentToString(content, idString), idString);
+-        } catch (Exception e) {
+-            // Generate an empty document to make the unmarshallers happy. Ultimately the default
+-            // unmarshaller will be called to unmarshall into the service base exception.
+-            return XpathUtils.documentFrom("");
+-        }
+-    }
+-
+-    private String contentToString(InputStream content, String idString) throws Exception {
+-        try {
+-            return IOUtils.toString(content);
+-        } catch (Exception e) {
+-            log.debug(String.format("Unable to read input stream to string (%s)", idString), e);
+-            throw e;
+-        }
+-    }
+-
+-    private Document parseXml(String xml, String idString) throws Exception {
+-        try {
+-            return XpathUtils.documentFrom(xml);
+-        } catch (Exception e) {
+-            log.debug(String.format("Unable to parse HTTP response (%s) content to XML document '%s' ", idString, xml), e);
+-            throw e;
+-        }
+-    }
+-
+-    private String idString(HttpResponse errorResponse) {
+-        StringBuilder idString = new StringBuilder();
+-        try {
+-            if (errorResponse.getRequest().getHeaders().containsKey(HEADER_SDK_TRANSACTION_ID)) {
+-                idString.append("Invocation Id:").append(errorResponse.getRequest().getHeaders().get(HEADER_SDK_TRANSACTION_ID));
+-            }
+-            if (errorResponse.getHeaders().containsKey(X_AMZN_REQUEST_ID_HEADER)) {
+-                if (idString.length() > 0) {
+-                    idString.append(", ");
+-                }
+-                idString.append("Request Id:").append(errorResponse.getHeaders().get(X_AMZN_REQUEST_ID_HEADER));
+-            }
+-        } catch (NullPointerException npe){
+-            log.debug("Error getting Request or Invocation ID from response", npe);
+-        }
+-        return idString.length() > 0 ? idString.toString() : "Unknown";
+-    }
+-
+-    /**
+-     * Since this response handler completely consumes all the data from the underlying HTTP
+-     * connection during the handle method, we don't need to keep the HTTP connection open.
+-     *
+-     * @see com.amazonaws.http.HttpResponseHandler#needsConnectionLeftOpen()
+-     */
+-    public boolean needsConnectionLeftOpen() {
+-        return false;
+-    }
+-
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/http/DelegatingDnsResolver.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/DelegatingDnsResolver.java
+--- ./src/main/java/com/amazonaws/http/DelegatingDnsResolver.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/DelegatingDnsResolver.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,40 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http;
+-
+-import java.net.InetAddress;
+-import java.net.UnknownHostException;
+-
+-import org.apache.http.conn.DnsResolver;
+-
+-/**
+- * Implements the {@link org.apache.http.conn.DnsResolver} interface,
+- * taking in a {@link com.amazonaws.DnsResolver} implementation and executing its
+- * {@link com.amazonaws.DnsResolver#resolve(String)} method to perform the
+- * actual DNS resolution.
+- */
+-public class DelegatingDnsResolver implements DnsResolver {
+-
+-    private final com.amazonaws.DnsResolver delegate;
+-
+-    public DelegatingDnsResolver(com.amazonaws.DnsResolver delegate) {
+-        this.delegate = delegate;
+-    }
+-
+-    @Override
+-    public InetAddress[] resolve(String host) throws UnknownHostException {
+-        return delegate.resolve(host);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/exception/HttpRequestTimeoutException.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/exception/HttpRequestTimeoutException.java
+--- ./src/main/java/com/amazonaws/http/exception/HttpRequestTimeoutException.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/exception/HttpRequestTimeoutException.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,37 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.exception;
+-
+-import java.io.IOException;
+-
+-/**
+- * Signals that the http request could not complete within the specified timeout.
+- */
+-public class HttpRequestTimeoutException extends IOException {
+-
+-    private static final long serialVersionUID = -2588353895012259837L;
+-
+-    public HttpRequestTimeoutException(String message) {
+-        super(message);
+-    }
+-
+-    public HttpRequestTimeoutException(Throwable throwable) {
+-        this("Request did not complete before the request timeout configuration.", throwable);
+-    }
+-
+-    public HttpRequestTimeoutException(String message, Throwable throwable) {
+-        super(message, throwable);
+-    }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/http/ExecutionContext.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/ExecutionContext.java
+--- ./src/main/java/com/amazonaws/http/ExecutionContext.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/ExecutionContext.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,267 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http;
+-
+-import com.amazonaws.AmazonWebServiceClient;
+-import com.amazonaws.annotation.NotThreadSafe;
+-import com.amazonaws.auth.AWSCredentials;
+-import com.amazonaws.auth.AWSCredentialsProvider;
+-import com.amazonaws.auth.Signer;
+-import com.amazonaws.handlers.RequestHandler2;
+-import com.amazonaws.http.timers.client.ClientExecutionAbortTrackerTask;
+-import com.amazonaws.internal.auth.NoOpSignerProvider;
+-import com.amazonaws.internal.auth.SignerProviderContext;
+-import com.amazonaws.internal.auth.SignerProvider;
+-import com.amazonaws.retry.internal.AuthErrorRetryStrategy;
+-import com.amazonaws.util.AWSRequestMetrics;
+-import com.amazonaws.util.AWSRequestMetricsFullSupport;
+-
+-import java.net.URI;
+-import java.util.List;
+-
+-/**
+- * @NotThreadSafe This class should only be accessed by a single thread and be used throughout
+- *                a single request lifecycle.
+- */
+-@NotThreadSafe
+-public class ExecutionContext {
+-    private final AWSRequestMetrics awsRequestMetrics;
+-    private final List requestHandler2s;
+-    private final AmazonWebServiceClient awsClient;
+-    private final SignerProvider signerProvider;
+-
+-    private boolean retryCapacityConsumed;
+-
+-    /**
+-     * Optional credentials to enable the runtime layer to handle signing requests (and resigning on
+-     * retries).
+-     */
+-    private AWSCredentialsProvider credentialsProvider;
+-
+-    /**
+-     * An internal retry strategy for auth errors. This is currently only used by the S3 client for
+-     * auto-resolving V4-required regions.
+-     */
+-    private AuthErrorRetryStrategy authErrorRetryStrategy;
+-
+-    private ClientExecutionAbortTrackerTask clientExecutionTrackerTask;
+-
+-    /** For testing purposes. */
+-    public ExecutionContext(boolean isMetricEnabled) {
+-        this(builder().withUseRequestMetrics(isMetricEnabled).withSignerProvider(new NoOpSignerProvider()));
+-    }
+-
+-    /** For testing purposes. */
+-    public ExecutionContext() {
+-        this(builder().withSignerProvider(new NoOpSignerProvider()));
+-    }
+-
+-    @Deprecated
+-    public ExecutionContext(List requestHandler2s, boolean isMetricEnabled,
+-            AmazonWebServiceClient awsClient) {
+-        this.requestHandler2s = requestHandler2s;
+-        awsRequestMetrics = isMetricEnabled ? new AWSRequestMetricsFullSupport() : new AWSRequestMetrics();
+-        this.awsClient = awsClient;
+-        this.signerProvider = new SignerProvider() {
+-            @Override
+-            public Signer getSigner(SignerProviderContext context) {
+-                return getSignerByURI(context.getUri());
+-            }
+-        };
+-    }
+-
+-    private ExecutionContext(final Builder builder) {
+-        this.requestHandler2s = builder.requestHandler2s;
+-        this.awsRequestMetrics = builder.useRequestMetrics ? new AWSRequestMetricsFullSupport() : new AWSRequestMetrics();
+-        this.awsClient = builder.awsClient;
+-        this.signerProvider = builder.signerProvider;
+-    }
+-
+-    public List getRequestHandler2s() {
+-        return requestHandler2s;
+-    }
+-
+-    public AWSRequestMetrics getAwsRequestMetrics() {
+-        return awsRequestMetrics;
+-    }
+-
+-    protected AmazonWebServiceClient getAwsClient() {
+-        return awsClient;
+-    }
+-
+-    /**
+-     * There is in general no need to set the signer in the execution context, since the signer for
+-     * each request may differ depending on the URI of the request. The exception is S3 where the
+-     * signer is currently determined only when the S3 client is constructed. Hence the need for
+-     * this method. We may consider supporting a per request level signer determination for S3 later
+-     * on.
+-     */
+-    @Deprecated
+-    public void setSigner(Signer signer) {
+-    }
+-
+-    /**
+-     * Returns whether retry capacity was consumed during this request lifecycle.
+-     * This can be inspected to determine whether capacity should be released if a retry succeeds.
+-     *
+-     * @return true if retry capacity was consumed
+-     */
+-    public boolean retryCapacityConsumed() { return retryCapacityConsumed; }
+-
+-    /**
+-     * Marks that a retry during this request lifecycle has consumed retry capacity.  This is inspected
+-     * when determining if capacity should be released if a retry succeeds.
+-     */
+-    public void markRetryCapacityConsumed() {
+-        this.retryCapacityConsumed = true;
+-    }
+-
+-    /**
+-     * Passes in the provided {@link SignerProviderContext} into a {@link SignerProvider} and returns
+-     * a {@link Signer} instance.
+-     */
+-    public Signer getSigner(SignerProviderContext context) { return signerProvider.getSigner(context); }
+-
+-    /**
+-     * Returns the signer for the given uri. Note S3 in particular overrides this method.
+-     */
+-    @Deprecated
+-    public Signer getSignerByURI(URI uri) {
+-        return awsClient == null ? null : awsClient.getSignerByURI(uri);
+-    }
+-
+-    /**
+-     * Sets the credentials provider used for fetching the credentials. The credentials fetched is
+-     * used for signing the request. If there is no credential provider, then the runtime will not
+-     * attempt to sign (or resign on retries) requests.
+-     *
+-     * @param credentialsProvider
+-     *            the credentials provider to fetch {@link AWSCredentials}
+-     */
+-    public void setCredentialsProvider(AWSCredentialsProvider credentialsProvider) {
+-        this.credentialsProvider = credentialsProvider;
+-    }
+-
+-    /**
+-     * Returns the credentials provider used for fetching the credentials. The credentials fetched
+-     * is used for signing the request. If there is no credential provider, then the runtime will
+-     * not attempt to sign (or resign on retries) requests.
+-     *
+-     * @return the credentials provider to fetch {@link AWSCredentials}
+-     */
+-    public AWSCredentialsProvider getCredentialsProvider() {
+-        return this.credentialsProvider;
+-    }
+-
+-    /**
+-     * Returns the retry strategy for auth errors. This is currently only used by the S3 client for
+-     * auto-resolving sigv4-required regions.
+-     * 

+-     * Note that this will be checked BEFORE the HTTP client consults the user-specified
+-     * RetryPolicy. i.e. if the configured AuthErrorRetryStrategy says the request should be
+-     * retried, the retry will be performed internally and the effect is transparent to the user's
+-     * RetryPolicy.
+-     */
+-    public AuthErrorRetryStrategy getAuthErrorRetryStrategy() {
+-        return authErrorRetryStrategy;
+-    }
+-
+-    /**
+-     * Sets the optional auth error retry strategy for this request execution.
+-     *
+-     * @see #getAuthErrorRetryStrategy()
+-     */
+-    public void setAuthErrorRetryStrategy(AuthErrorRetryStrategy authErrorRetryStrategy) {
+-        this.authErrorRetryStrategy = authErrorRetryStrategy;
+-    }
+-
+-    public ClientExecutionAbortTrackerTask getClientExecutionTrackerTask() {
+-        return clientExecutionTrackerTask;
+-    }
+-
+-    public void setClientExecutionTrackerTask(ClientExecutionAbortTrackerTask clientExecutionTrackerTask) {
+-        this.clientExecutionTrackerTask = clientExecutionTrackerTask;
+-    }
+-
+-    public static ExecutionContext.Builder builder() { return new ExecutionContext.Builder(); }
+-
+-    public static class Builder {
+-
+-        private boolean useRequestMetrics;
+-        private List requestHandler2s;
+-        private AmazonWebServiceClient awsClient;
+-        private SignerProvider signerProvider = new NoOpSignerProvider();
+-
+-        private Builder() {}
+-
+-        public boolean useRequestMetrics() {
+-            return useRequestMetrics;
+-        }
+-
+-        public void setUseRequestMetrics(final boolean useRequestMetrics) {
+-            this.useRequestMetrics = useRequestMetrics;
+-        }
+-
+-        public Builder withUseRequestMetrics(final boolean withUseRequestMetrics) {
+-            setUseRequestMetrics(withUseRequestMetrics);
+-            return this;
+-        }
+-
+-        public List getRequestHandler2s() {
+-            return requestHandler2s;
+-        }
+-
+-        public void setRequestHandler2s(final List requestHandler2s) {
+-            this.requestHandler2s = requestHandler2s;
+-        }
+-
+-        public Builder withRequestHandler2s(final List requestHandler2s) {
+-            setRequestHandler2s(requestHandler2s);
+-            return this;
+-        }
+-
+-        public AmazonWebServiceClient getAwsClient() {
+-            return awsClient;
+-        }
+-
+-        public void setAwsClient(final AmazonWebServiceClient awsClient) {
+-            this.awsClient = awsClient;
+-        }
+-
+-        public Builder withAwsClient(final AmazonWebServiceClient awsClient) {
+-            setAwsClient(awsClient);
+-            return this;
+-        }
+-
+-        public SignerProvider getSignerProvider() {
+-            return signerProvider;
+-        }
+-
+-        public void setSignerProvider(final SignerProvider signerProvider) {
+-            this.signerProvider = signerProvider;
+-        }
+-
+-        public Builder withSignerProvider(final SignerProvider signerProvider) {
+-            setSignerProvider(signerProvider);
+-            return this;
+-        }
+-
+-        public ExecutionContext build() {
+-            return new ExecutionContext(this);
+-        }
+-
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/HttpMethodName.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/HttpMethodName.java
+--- ./src/main/java/com/amazonaws/http/HttpMethodName.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/HttpMethodName.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,49 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- * 
+- *  http://aws.amazon.com/apache2.0
+- * 
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http;
+-
+-import com.amazonaws.util.StringUtils;
+-
+-public enum HttpMethodName {
+-
+-    GET,
+-    POST,
+-    PUT,
+-    DELETE,
+-    HEAD,
+-    PATCH,
+-    OPTIONS,
+-    ;
+-
+-    /**
+-     * @param value Raw string representing value of enum
+-     * @return HttpMethodName enum or null if value is not present.
+-     * @throws IllegalArgumentException If value does not represent a known enum value.
+-     */
+-    public static HttpMethodName fromValue(String value) {
+-        if (StringUtils.isNullOrEmpty(value)) {
+-            return null;
+-        }
+-
+-        final String upperCaseValue = StringUtils.upperCase(value);
+-        for (HttpMethodName httpMethodName : values()) {
+-            if (httpMethodName.name().equals(upperCaseValue)) {
+-                return httpMethodName;
+-            }
+-        }
+-        throw new IllegalArgumentException("Unsupported HTTP method name " + value);
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/HttpResponseHandler.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/HttpResponseHandler.java
+--- ./src/main/java/com/amazonaws/http/HttpResponseHandler.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/HttpResponseHandler.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,66 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http;
+-
+-/**
+- * Responsible for handling an HTTP response and returning an object of type T.
+- * For example, a typical response handler might accept a response, and
+- * translate it into a concrete typed object.
+- *
+- * @param 
+- *            The output of this response handler.
+- */
+-public interface HttpResponseHandler {
+-
+-    String X_AMZN_REQUEST_ID_HEADER = "x-amzn-RequestId";
+-
+-    /**
+-     * Accepts an HTTP response object, and returns an object of type T.
+-     * Individual implementations may choose to handle the response however they
+-     * need to, and return any type that they need to.
+-     *
+-     * @param response
+-     *            The HTTP response to handle, as received from an AWS service.
+-     *
+-     * @return An object of type T, as defined by individual implementations.
+-     *
+-     * @throws Exception
+-     *             If any problems are encountered handling the response.
+-     */
+-    T handle(HttpResponse response) throws Exception;
+-
+-    /**
+-     * Indicates if this response handler requires that the underlying HTTP
+-     * connection not be closed automatically after the response is
+-     * handled.
+-     * 

+-     * For example, if the object returned by this response handler manually
+-     * manages the stream of data from the HTTP connection, and doesn't read all
+-     * the data from the connection in the {@link #handle(HttpResponse)} method,
+-     * this method can be used to prevent the underlying connection from being
+-     * prematurely closed.
+-     * 

+-     * Response handlers should use this option very carefully, since it means
+-     * that resource cleanup is no longer handled automatically, and if
+-     * neglected, can result in the client runtime running out of resources for
+-     * new HTTP connections.
+-     *
+-     * @return True if this response handler requires that the underlying HTTP
+-     *         connection be left open, and not automatically closed, otherwise
+-     *         false.
+-     */
+-    boolean needsConnectionLeftOpen();
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/HttpResponse.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/HttpResponse.java
+--- ./src/main/java/com/amazonaws/http/HttpResponse.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/HttpResponse.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,185 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http;
+-
+-import com.amazonaws.Request;
+-import com.amazonaws.util.CRC32ChecksumCalculatingInputStream;
+-
+-import org.apache.http.client.methods.HttpRequestBase;
+-import org.apache.http.protocol.HttpContext;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.util.Map;
+-import java.util.TreeMap;
+-
+-/**
+- * Represents an HTTP response returned by an AWS service in response to a
+- * service request.
+- */
+-public class HttpResponse {
+-
+-    private final Request request;
+-    private final HttpRequestBase httpRequest;
+-
+-    private String statusText;
+-    private int statusCode;
+-    private InputStream content;
+-    private Map headers = new TreeMap(String.CASE_INSENSITIVE_ORDER);
+-    private HttpContext context;
+-
+-    /**
+-     * Constructs a new HttpResponse associated with the specified request.
+-     *
+-     * @param request
+-     *            The associated request that generated this response.
+-     * @param httpRequest
+-     *            The underlying http request that generated this response.
+-     * @throws IOException
+-     */
+-    public HttpResponse(Request request, HttpRequestBase httpRequest) {
+-        this(request, httpRequest, null);
+-    }
+-
+-    public HttpResponse(Request request, HttpRequestBase httpRequest, HttpContext context) {
+-        this.request = request;
+-        this.httpRequest = httpRequest;
+-        this.context = context;
+-    }
+-
+-    /**
+-     * Returns the original request associated with this response.
+-     *
+-     * @return The original request associated with this response.
+-     */
+-    public Request getRequest() {
+-        return request;
+-    }
+-
+-    /**
+-     * Returns the original http request associated with this response.
+-     *
+-     * @return The original http request associated with this response.
+-     */
+-    public HttpRequestBase getHttpRequest() {
+-        return httpRequest;
+-    }
+-
+-    /**
+-     * Returns the HTTP headers returned with this response.
+-     *
+-     * @return The set of HTTP headers returned with this HTTP response.
+-     */
+-    public Map getHeaders() {
+-        return headers;
+-    }
+-
+-    /**
+-     * Looks up a header by name and returns its value. Does case insensitive comparison.
+-     *
+-     * @param headerName Name of header to get value for.
+-     * @return The header value of the given header. Null if header is not present.
+-     */
+-    public String getHeader(String headerName) {
+-        return headers.get(headerName);
+-    }
+-
+-    /**
+-     * Adds an HTTP header to the set associated with this response.
+-     *
+-     * @param name
+-     *            The name of the HTTP header.
+-     * @param value
+-     *            The value of the HTTP header.
+-     */
+-    public void addHeader(String name, String value) {
+-        headers.put(name, value);
+-    }
+-
+-    /**
+-     * Sets the input stream containing the response content.
+-     *
+-     * @param content
+-     *            The input stream containing the response content.
+-     */
+-    public void setContent(InputStream content) {
+-        this.content = content;
+-    }
+-
+-    /**
+-     * Returns the input stream containing the response content.
+-     *
+-     * @return The input stream containing the response content.
+-     */
+-    public InputStream getContent() {
+-        return content;
+-    }
+-
+-    /**
+-     * Sets the HTTP status text returned with this response.
+-     *
+-     * @param statusText
+-     *            The HTTP status text (ex: "Not found") returned with this
+-     *            response.
+-     */
+-    public void setStatusText(String statusText) {
+-        this.statusText = statusText;
+-    }
+-
+-    /**
+-     * Returns the HTTP status text associated with this response.
+-     *
+-     * @return The HTTP status text associated with this response.
+-     */
+-    public String getStatusText() {
+-        return statusText;
+-    }
+-
+-    /**
+-     * Sets the HTTP status code that was returned with this response.
+-     *
+-     * @param statusCode
+-     *            The HTTP status code (ex: 200, 404, etc) associated with this
+-     *            response.
+-     */
+-    public void setStatusCode(int statusCode) {
+-        this.statusCode = statusCode;
+-    }
+-
+-    /**
+-     * Returns the HTTP status code (ex: 200, 404, etc) associated with this
+-     * response.
+-     *
+-     * @return The HTTP status code associated with this response.
+-     */
+-    public int getStatusCode() {
+-        return statusCode;
+-    }
+-
+-    /**
+-     * Returns the CRC32 checksum calculated by the underlying CRC32ChecksumCalculatingInputStream.
+-     *
+-     * @return The CRC32 checksum.
+-     */
+-    public long getCRC32Checksum() {
+-        if (context == null) {
+-            return 0L;
+-        }
+-        CRC32ChecksumCalculatingInputStream crc32ChecksumInputStream =
+-                (CRC32ChecksumCalculatingInputStream)context.getAttribute(CRC32ChecksumCalculatingInputStream.class.getName());
+-        return crc32ChecksumInputStream == null ? 0L : crc32ChecksumInputStream.getCRC32Checksum();
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/IdleConnectionReaper.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/IdleConnectionReaper.java
+--- ./src/main/java/com/amazonaws/http/IdleConnectionReaper.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/IdleConnectionReaper.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,198 +0,0 @@
+-/*
+- * Copyright 2012-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.annotation.SdkTestInternalApi;
+-
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-import org.apache.http.conn.HttpClientConnectionManager;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.concurrent.ConcurrentHashMap;
+-import java.util.concurrent.TimeUnit;
+-
+-/**
+- * Daemon thread to periodically check connection pools for idle connections.
+- * 

+- * Connections sitting around idle in the HTTP connection pool for too long will
+- * eventually be terminated by the AWS end of the connection, and will go into
+- * CLOSE_WAIT. If this happens, sockets will sit around in CLOSE_WAIT, still
+- * using resources on the client side to manage that socket. Many sockets stuck
+- * in CLOSE_WAIT can prevent the OS from creating new connections.
+- * 

+- * This class closes idle connections before they can move into the CLOSE_WAIT
+- * state.
+- * 

+- * This thread is important because by default, we disable Apache HttpClient's
+- * stale connection checking, so without this thread running in the background,
+- * cleaning up old/inactive HTTP connections, we'd see more IO exceptions when
+- * stale connections (i.e. closed on the AWS side) are left in the connection
+- * pool, and requests grab one of them to begin executing a request.
+- */
+-@SdkInternalApi
+-public final class IdleConnectionReaper extends Thread {
+-
+-    /**
+-     * Shared log for any errors during connection reaping.
+-     */
+-    private static final Log LOG = LogFactory.getLog(IdleConnectionReaper.class);
+-    /**
+-     * The period between invocations of the idle connection reaper.
+-     */
+-    private static final int PERIOD_MILLISECONDS = 1000 * 60;
+-
+-    /**
+-     * Legacy constant used when {@link #registerConnectionManager(HttpClientConnectionManager)} is called. New code paths should
+-     * use {@link #registerConnectionManager(HttpClientConnectionManager, long)} and provide the max idle timeout for that
+-     * particular connection manager.
+-     */
+-    @Deprecated
+-    private static final int DEFAULT_MAX_IDLE_MILLIS = 1000 * 60;
+-
+-    private static final Map connectionManagers = new ConcurrentHashMap();
+-    /**
+-     * Singleton instance of the connection reaper.
+-     */
+-    private static volatile IdleConnectionReaper instance;
+-    /**
+-     * Set to true when shutting down the reaper;  Once set to true, this
+-     * flag is never set back to false.
+-     */
+-    private volatile boolean shuttingDown;
+-
+-    /**
+-     * Private constructor - singleton pattern.
+-     */
+-    private IdleConnectionReaper() {
+-        super("java-sdk-http-connection-reaper");
+-        setDaemon(true);
+-    }
+-
+-    /**
+-     * Registers the given connection manager with this reaper.
+-     *
+-     * @return true if the connection manager has been successfully registered; false otherwise.
+-     * @deprecated By {@link #registerConnectionManager(HttpClientConnectionManager, long)}.
+-     */
+-    @Deprecated
+-    public static boolean registerConnectionManager(HttpClientConnectionManager connectionManager) {
+-        return registerConnectionManager(connectionManager, DEFAULT_MAX_IDLE_MILLIS);
+-    }
+-
+-    /**
+-     * Registers the given connection manager with this reaper;
+-     *
+-     * @param connectionManager Connection manager to register
+-     * @param maxIdleInMs       Max idle connection timeout in milliseconds for this connection manager.
+-     * @return true if the connection manager has been successfully registered; false otherwise.
+-     */
+-    public static boolean registerConnectionManager(HttpClientConnectionManager connectionManager, long maxIdleInMs) {
+-        if (instance == null) {
+-            synchronized (IdleConnectionReaper.class) {
+-                if (instance == null) {
+-                    instance = new IdleConnectionReaper();
+-                    instance.start();
+-                }
+-            }
+-        }
+-        return connectionManagers.put(connectionManager, maxIdleInMs) == null;
+-    }
+-
+-    /**
+-     * Removes the given connection manager from this reaper,
+-     * and shutting down the reaper if there is zero connection manager left.
+-     *
+-     * @return true if the connection manager has been successfully removed;
+-     * false otherwise.
+-     */
+-    public static boolean removeConnectionManager(HttpClientConnectionManager connectionManager) {
+-        boolean wasRemoved = connectionManagers.remove(connectionManager) != null;
+-        if (connectionManagers.isEmpty()) {
+-            shutdown();
+-        }
+-        return wasRemoved;
+-    }
+-
+-    @SdkTestInternalApi
+-    public static List getRegisteredConnectionManagers() {
+-        return new ArrayList(connectionManagers.keySet());
+-    }
+-
+-    /**
+-     * Shuts down the thread, allowing the class and instance to be collected.
+-     * 

+-     * Since this is a daemon thread, its running will not prevent JVM shutdown.
+-     * It will, however, prevent this class from being unloaded or garbage
+-     * collected, in the context of a long-running application, until it is
+-     * interrupted. This method will stop the thread's execution and clear its
+-     * state. Any use of a service client will cause the thread to be restarted.
+-     *
+-     * @return true if an actual shutdown has been made; false otherwise.
+-     */
+-    public static synchronized boolean shutdown() {
+-        if (instance != null) {
+-            instance.markShuttingDown();
+-            instance.interrupt();
+-            connectionManagers.clear();
+-            instance = null;
+-            return true;
+-        }
+-        return false;
+-    }
+-
+-    /**
+-     * For testing purposes.
+-     * Returns the number of connection managers currently monitored by this
+-     * reaper.
+-     */
+-    static int size() {
+-        return connectionManagers.size();
+-    }
+-
+-    private void markShuttingDown() {
+-        shuttingDown = true;
+-    }
+-
+-    @SuppressWarnings("unchecked")
+-    @Override
+-    public void run() {
+-        while (true) {
+-            if (shuttingDown) {
+-                LOG.debug("Shutting down reaper thread.");
+-                return;
+-            }
+-            try {
+-                Thread.sleep(PERIOD_MILLISECONDS);
+-
+-                for (Map.Entry entry : connectionManagers.entrySet()) {
+-                    // When we release connections, the connection manager leaves them
+-                    // open so they can be reused.  We want to close out any idle
+-                    // connections so that they don't sit around in CLOSE_WAIT.
+-                    try {
+-                        entry.getKey().closeIdleConnections(entry.getValue(), TimeUnit.MILLISECONDS);
+-                    } catch (Exception t) {
+-                        LOG.warn("Unable to close idle connections", t);
+-                    }
+-                }
+-            } catch (Throwable t) {
+-                LOG.debug("Reaper thread: ", t);
+-            }
+-        }
+-    }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/http/impl/client/HttpRequestNoRetryHandler.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/impl/client/HttpRequestNoRetryHandler.java
+--- ./src/main/java/com/amazonaws/http/impl/client/HttpRequestNoRetryHandler.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/impl/client/HttpRequestNoRetryHandler.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,35 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.impl.client;
+-
+-import com.amazonaws.annotation.ThreadSafe;
+-
+-import java.io.IOException;
+-
+-import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
+-import org.apache.http.protocol.HttpContext;
+-
+-@ThreadSafe
+-public class HttpRequestNoRetryHandler extends DefaultHttpRequestRetryHandler {
+-    public static final HttpRequestNoRetryHandler Singleton = new HttpRequestNoRetryHandler();
+-    private HttpRequestNoRetryHandler() {}
+-
+-    @Override public boolean retryRequest(
+-            final IOException exception,
+-            int executionCount,
+-            final HttpContext context) {
+-        return false;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/impl/client/SdkHttpRequestRetryHandler.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/impl/client/SdkHttpRequestRetryHandler.java
+--- ./src/main/java/com/amazonaws/http/impl/client/SdkHttpRequestRetryHandler.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/impl/client/SdkHttpRequestRetryHandler.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,45 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.impl.client;
+-
+-import java.io.IOException;
+-
+-import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
+-import org.apache.http.protocol.HttpContext;
+-
+-import com.amazonaws.annotation.ThreadSafe;
+-import com.amazonaws.util.AWSRequestMetrics;
+-import com.amazonaws.util.AWSRequestMetrics.Field;
+-
+-@ThreadSafe
+-public class SdkHttpRequestRetryHandler extends DefaultHttpRequestRetryHandler {
+-    public static final SdkHttpRequestRetryHandler Singleton = new SdkHttpRequestRetryHandler();
+-    private SdkHttpRequestRetryHandler() {}
+-
+-    @Override public boolean retryRequest(
+-            final IOException exception,
+-            int executionCount,
+-            final HttpContext context) {
+-        boolean retry = super.retryRequest(exception, executionCount, context);
+-        if (retry) {
+-            AWSRequestMetrics awsRequestMetrics = (AWSRequestMetrics) context
+-                    .getAttribute(AWSRequestMetrics.SIMPLE_NAME);
+-            if (awsRequestMetrics != null) {
+-                awsRequestMetrics.incrementCounter(Field.HttpClientRetryCount);
+-            }
+-        }
+-        return retry;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/JsonErrorResponseHandler.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/JsonErrorResponseHandler.java
+--- ./src/main/java/com/amazonaws/http/JsonErrorResponseHandler.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/JsonErrorResponseHandler.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,131 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http;
+-
+-import com.amazonaws.AmazonServiceException;
+-import com.amazonaws.AmazonServiceException.ErrorType;
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.internal.http.ErrorCodeParser;
+-import com.amazonaws.internal.http.JsonErrorMessageParser;
+-import com.amazonaws.protocol.json.JsonContent;
+-import com.amazonaws.transform.JsonErrorUnmarshaller;
+-import com.fasterxml.jackson.core.JsonFactory;
+-
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Map.Entry;
+-
+-@SdkInternalApi
+-public class JsonErrorResponseHandler implements HttpResponseHandler {
+-
+-    private static final Log LOG = LogFactory.getLog(JsonErrorResponseHandler.class);
+-
+-    private final List unmarshallers;
+-    private final ErrorCodeParser errorCodeParser;
+-    private final JsonErrorMessageParser errorMessageParser;
+-    private final JsonFactory jsonFactory;
+-
+-    public JsonErrorResponseHandler(
+-            List errorUnmarshallers,
+-            ErrorCodeParser errorCodeParser,
+-            JsonErrorMessageParser errorMessageParser,
+-            JsonFactory jsonFactory) {
+-        this.unmarshallers = errorUnmarshallers;
+-        this.errorCodeParser = errorCodeParser;
+-        this.errorMessageParser = errorMessageParser;
+-        this.jsonFactory = jsonFactory;
+-    }
+-
+-    @Override
+-    public boolean needsConnectionLeftOpen() {
+-        return false;
+-    }
+-
+-    @Override
+-    public AmazonServiceException handle(HttpResponse response) throws Exception {
+-        JsonContent jsonContent = JsonContent.createJsonContent(response, jsonFactory);
+-        String errorCode = errorCodeParser.parseErrorCode(response, jsonContent);
+-        AmazonServiceException ase = createException(errorCode, jsonContent);
+-
+-        // Jackson has special-casing for 'message' values when deserializing
+-        // Throwables, but sometimes the service passes the error message in
+-        // other JSON fields - handle it here.
+-        if (ase.getErrorMessage() == null) {
+-            ase.setErrorMessage(errorMessageParser.parseErrorMessage(response, jsonContent.getJsonNode()));
+-        }
+-
+-        ase.setErrorCode(errorCode);
+-        ase.setServiceName(response.getRequest().getServiceName());
+-        ase.setStatusCode(response.getStatusCode());
+-        ase.setErrorType(getErrorTypeFromStatusCode(response.getStatusCode()));
+-        ase.setRawResponse(jsonContent.getRawContent());
+-        String requestId = getRequestIdFromHeaders(response.getHeaders());
+-        if (requestId != null) {
+-            ase.setRequestId(requestId);
+-        }
+-        ase.setHttpHeaders(response.getHeaders());
+-        return ase;
+-    }
+-
+-    /**
+-     * Create an AmazonServiceException using the chain of unmarshallers. This method will never
+-     * return null, it will always return a valid AmazonServiceException
+-     *
+-     * @param errorCode
+-     *            Error code to find an appropriate unmarshaller
+-     * @param jsonContent
+-     *            JsonContent of HTTP response
+-     * @return AmazonServiceException
+-     */
+-    private AmazonServiceException createException(String errorCode, JsonContent jsonContent) {
+-        AmazonServiceException ase = unmarshallException(errorCode, jsonContent);
+-        if (ase == null) {
+-            ase = new AmazonServiceException(
+-                    "Unable to unmarshall exception response with the unmarshallers provided");
+-        }
+-        return ase;
+-    }
+-
+-    private AmazonServiceException unmarshallException(String errorCode, JsonContent jsonContent) {
+-        for (JsonErrorUnmarshaller unmarshaller : unmarshallers) {
+-            if (unmarshaller.matchErrorCode(errorCode)) {
+-                try {
+-                    return unmarshaller.unmarshall(jsonContent.getJsonNode());
+-                } catch (Exception e) {
+-                    LOG.info("Unable to unmarshall exception content", e);
+-                    return null;
+-                }
+-            }
+-        }
+-        return null;
+-    }
+-
+-    private ErrorType getErrorTypeFromStatusCode(int statusCode) {
+-        return statusCode < 500 ? ErrorType.Client : ErrorType.Service;
+-    }
+-
+-    private String getRequestIdFromHeaders(Map headers) {
+-        for (Entry headerEntry : headers.entrySet()) {
+-            if (headerEntry.getKey().equalsIgnoreCase(X_AMZN_REQUEST_ID_HEADER)) {
+-                return headerEntry.getValue();
+-            }
+-        }
+-        return null;
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/JsonResponseHandler.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/JsonResponseHandler.java
+--- ./src/main/java/com/amazonaws/http/JsonResponseHandler.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/JsonResponseHandler.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,178 +0,0 @@
+-/*
+- *
+- * Copyright (c) 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- *
+- */
+-package com.amazonaws.http;
+-
+-import com.amazonaws.AmazonWebServiceResponse;
+-import com.amazonaws.ResponseMetadata;
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.internal.CRC32MismatchException;
+-import com.amazonaws.transform.JsonUnmarshallerContext;
+-import com.amazonaws.transform.JsonUnmarshallerContext.UnmarshallerType;
+-import com.amazonaws.transform.JsonUnmarshallerContextImpl;
+-import com.amazonaws.transform.Unmarshaller;
+-import com.amazonaws.transform.VoidJsonUnmarshaller;
+-import com.amazonaws.util.IOUtils;
+-import com.amazonaws.util.ValidationUtils;
+-import com.fasterxml.jackson.core.JsonFactory;
+-import com.fasterxml.jackson.core.JsonParser;
+-import java.io.IOException;
+-import java.util.Map;
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-
+-/**
+- * Default implementation of HttpResponseHandler that handles a successful response from an AWS
+- * service and unmarshalls the result using a JSON unmarshaller.
+- *
+- * @param  Indicates the type being unmarshalled by this response handler.
+- */
+-@SdkInternalApi
+-public class JsonResponseHandler implements HttpResponseHandler> {
+-
+-    /**
+-     * The JSON unmarshaller to use when handling the response
+-     */
+-    private Unmarshaller responseUnmarshaller;
+-
+-    /**
+-     * Shared logger for profiling information
+-     */
+-    private static final Log log = LogFactory.getLog("com.amazonaws.request");
+-
+-    private final JsonFactory jsonFactory;
+-
+-    private final boolean needsConnectionLeftOpen;
+-
+-    private final boolean isPayloadJson;
+-
+-    private final Map, Unmarshaller> simpleTypeUnmarshallers;
+-    private final Map> customTypeMarshallers;
+-
+-    /**
+-     * Constructs a new response handler that will use the specified JSON unmarshaller to unmarshall
+-     * the service response and uses the specified response element path to find the root of the
+-     * business data in the service's response.
+-     * @param responseUnmarshaller    The JSON unmarshaller to use on the response.
+-     * @param simpleTypeUnmarshallers List of unmarshallers to be used for scalar types.
+-     * @param customTypeMarshallers   List of custom unmarshallers to be used for special types.
+-     * @param jsonFactory             the json factory to be used for parsing the response.
+-     */
+-    public JsonResponseHandler(Unmarshaller responseUnmarshaller,
+-                               Map, Unmarshaller> simpleTypeUnmarshallers,
+-                               Map> customTypeMarshallers,
+-                               JsonFactory jsonFactory, boolean needsConnectionLeftOpen,
+-                               boolean isPayloadJson) {
+-        /*
+-         * Even if the invoked operation just returns null, we still need an
+-         * unmarshaller to run so we can pull out response metadata.
+-         *
+-         * We might want to pass this in through the client class so that we
+-         * don't have to do this check here.
+-         */
+-        this.responseUnmarshaller =
+-                responseUnmarshaller != null ? responseUnmarshaller : new VoidJsonUnmarshaller();
+-
+-        this.needsConnectionLeftOpen = needsConnectionLeftOpen;
+-        this.isPayloadJson = isPayloadJson;
+-
+-        this.simpleTypeUnmarshallers = ValidationUtils.assertNotNull(simpleTypeUnmarshallers, "simple type unmarshallers");
+-        this.customTypeMarshallers = ValidationUtils.assertNotNull(customTypeMarshallers, "custom type marshallers");
+-        this.jsonFactory = ValidationUtils.assertNotNull(jsonFactory, "JSONFactory");
+-    }
+-
+-
+-    /**
+-     * @see HttpResponseHandler#handle(HttpResponse)
+-     */
+-    public AmazonWebServiceResponse handle(HttpResponse response) throws Exception {
+-        log.trace("Parsing service response JSON");
+-
+-        String CRC32Checksum = response.getHeaders().get("x-amz-crc32");
+-
+-        JsonParser jsonParser = null;
+-
+-        if (shouldParsePayloadAsJson()) {
+-            jsonParser = jsonFactory.createParser(response.getContent());
+-        }
+-
+-        try {
+-            AmazonWebServiceResponse awsResponse = new AmazonWebServiceResponse();
+-            JsonUnmarshallerContext unmarshallerContext = new JsonUnmarshallerContextImpl(
+-                    jsonParser, simpleTypeUnmarshallers, customTypeMarshallers, response);
+-            registerAdditionalMetadataExpressions(unmarshallerContext);
+-
+-            T result = responseUnmarshaller.unmarshall(unmarshallerContext);
+-
+-            // Make sure we read all the data to get an accurate CRC32 calculation.
+-            // See https://github.com/aws/aws-sdk-java/issues/1018
+-            if (shouldParsePayloadAsJson() && response.getContent() != null) {
+-                IOUtils.drainInputStream(response.getContent());
+-            }
+-
+-            if (CRC32Checksum != null) {
+-                long serverSideCRC = Long.parseLong(CRC32Checksum);
+-                long clientSideCRC = response.getCRC32Checksum();
+-                if (clientSideCRC != serverSideCRC) {
+-                    throw new CRC32MismatchException(
+-                            "Client calculated crc32 checksum didn't match that calculated by server side");
+-                }
+-            }
+-
+-            awsResponse.setResult(result);
+-
+-            Map metadata = unmarshallerContext.getMetadata();
+-            metadata.put(ResponseMetadata.AWS_REQUEST_ID,
+-                         response.getHeaders().get(X_AMZN_REQUEST_ID_HEADER));
+-            awsResponse.setResponseMetadata(new ResponseMetadata(metadata));
+-
+-            log.trace("Done parsing service response");
+-            return awsResponse;
+-        } finally {
+-            if (shouldParsePayloadAsJson()) {
+-                try {
+-                    jsonParser.close();
+-                } catch (IOException e) {
+-                    log.warn("Error closing json parser", e);
+-                }
+-            }
+-        }
+-    }
+-
+-    /**
+-     * Hook for subclasses to override in order to collect additional metadata from service
+-     * responses.
+-     *
+-     * @param unmarshallerContext
+-     *            The unmarshaller context used to configure a service's response
+-     *            data.
+-     */
+-    protected void registerAdditionalMetadataExpressions(
+-            JsonUnmarshallerContext unmarshallerContext) {
+-    }
+-
+-    public boolean needsConnectionLeftOpen() {
+-        return needsConnectionLeftOpen;
+-    }
+-
+-    /**
+-     * @return True if the payload will be parsed as JSON, false otherwise.
+-     */
+-    private boolean shouldParsePayloadAsJson() {
+-        return !needsConnectionLeftOpen && isPayloadJson;
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/protocol/SdkHttpRequestExecutor.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/protocol/SdkHttpRequestExecutor.java
+--- ./src/main/java/com/amazonaws/http/protocol/SdkHttpRequestExecutor.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/protocol/SdkHttpRequestExecutor.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,87 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.protocol;
+-
+-import java.io.IOException;
+-import java.net.Socket;
+-
+-import org.apache.http.HttpClientConnection;
+-import org.apache.http.HttpException;
+-import org.apache.http.HttpRequest;
+-import org.apache.http.HttpResponse;
+-import org.apache.http.conn.ManagedHttpClientConnection;
+-import org.apache.http.protocol.HttpContext;
+-import org.apache.http.protocol.HttpRequestExecutor;
+-
+-import com.amazonaws.internal.SdkMetricsSocket;
+-import com.amazonaws.internal.SdkSSLMetricsSocket;
+-import com.amazonaws.util.AWSRequestMetrics;
+-import com.amazonaws.util.AWSRequestMetrics.Field;
+-
+-/**
+- * Used to capture the http send-request and receive-response latency metrics
+- * of the http client library, with no retries involved.
+- */
+-public class SdkHttpRequestExecutor extends HttpRequestExecutor {
+-    @Override
+-    protected HttpResponse doSendRequest(
+-        final HttpRequest request,
+-        final HttpClientConnection conn,
+-        final HttpContext context)
+-        throws IOException, HttpException {
+-        AWSRequestMetrics awsRequestMetrics = (AWSRequestMetrics) context
+-            .getAttribute(AWSRequestMetrics.SIMPLE_NAME);
+-
+-        if (awsRequestMetrics == null) {
+-            return super.doSendRequest(request, conn, context);
+-        }
+-        if (conn instanceof ManagedHttpClientConnection) {
+-            ManagedHttpClientConnection managedConn = (ManagedHttpClientConnection)conn;
+-            Socket sock = managedConn.getSocket();
+-            if (sock instanceof SdkMetricsSocket) {
+-                SdkMetricsSocket sdkMetricsSocket = (SdkMetricsSocket)sock;
+-                sdkMetricsSocket.setMetrics(awsRequestMetrics);
+-            } else if (sock instanceof SdkSSLMetricsSocket) {
+-                SdkSSLMetricsSocket sdkSSLMetricsSocket = (SdkSSLMetricsSocket)sock;
+-                sdkSSLMetricsSocket.setMetrics(awsRequestMetrics);
+-            }
+-        }
+-        awsRequestMetrics.startEvent(Field.HttpClientSendRequestTime);
+-        try {
+-            return super.doSendRequest(request, conn, context);
+-        } finally {
+-            awsRequestMetrics.endEvent(Field.HttpClientSendRequestTime);
+-        }
+-    }
+-
+-    @Override
+-    protected HttpResponse doReceiveResponse(
+-        final HttpRequest          request,
+-        final HttpClientConnection conn,
+-        final HttpContext          context)
+-        throws HttpException, IOException {
+-        AWSRequestMetrics awsRequestMetrics = (AWSRequestMetrics) context
+-            .getAttribute(AWSRequestMetrics.SIMPLE_NAME);
+-        if (awsRequestMetrics == null) {
+-            return super.doReceiveResponse(request, conn, context);
+-        }
+-        awsRequestMetrics.startEvent(Field.HttpClientReceiveResponseTime);
+-        try {
+-            return super.doReceiveResponse(request, conn, context);
+-        } finally {
+-            awsRequestMetrics.endEvent(Field.HttpClientReceiveResponseTime);
+-        }
+-    }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/http/RepeatableInputStreamRequestEntity.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/RepeatableInputStreamRequestEntity.java
+--- ./src/main/java/com/amazonaws/http/RepeatableInputStreamRequestEntity.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/RepeatableInputStreamRequestEntity.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,167 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http;
+-
+-import com.amazonaws.Request;
+-import com.amazonaws.metrics.MetricInputStreamEntity;
+-import com.amazonaws.metrics.ServiceMetricType;
+-import com.amazonaws.metrics.ThroughputMetricType;
+-import com.amazonaws.metrics.internal.ServiceMetricTypeGuesser;
+-
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-import org.apache.http.entity.BasicHttpEntity;
+-import org.apache.http.entity.InputStreamEntity;
+-
+-import java.io.ByteArrayInputStream;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.io.OutputStream;
+-
+-/**
+- * Custom implementation of {@link RequestEntity} that delegates to an
+- * {@link RepeatableInputStreamRequestEntity}, with the one notable difference, that if
+- * the underlying InputStream supports being reset, this RequestEntity will
+- * report that it is repeatable and will reset the stream on all subsequent
+- * attempts to write out the request.
+- *
+- * TODO : Move this to apache specific package.
+- */
+-public class RepeatableInputStreamRequestEntity extends BasicHttpEntity {
+-
+-    /** True if the request entity hasn't been written out yet */
+-    private boolean firstAttempt = true;
+-
+-    /** The underlying InputStreamEntity being delegated to */
+-    private InputStreamEntity inputStreamRequestEntity;
+-
+-    /** The InputStream containing the content to write out */
+-    private InputStream content;
+-
+-    private static final Log log = LogFactory
+-            .getLog(RepeatableInputStreamRequestEntity.class);
+-
+-    /**
+-     * Record the original exception if we do attempt a retry, so that if the
+-     * retry fails, we can report the original exception. Otherwise, we're most
+-     * likely masking the real exception with an error about not being able to
+-     * reset far enough back in the input stream.
+-     */
+-    private IOException originalException;
+-
+-
+-    /**
+-     * Creates a new RepeatableInputStreamRequestEntity using the information
+-     * from the specified request. If the input stream containing the request's
+-     * contents is repeatable, then this RequestEntity will report as being
+-     * repeatable.
+-     *
+-     * @param request
+-     *            The details of the request being written out (content type,
+-     *            content length, and content).
+-     */
+-    public RepeatableInputStreamRequestEntity(final Request request) {
+-        setChunked(false);
+-
+-        /*
+-         * If we don't specify a content length when we instantiate our
+-         * InputStreamRequestEntity, then HttpClient will attempt to
+-         * buffer the entire stream contents into memory to determine
+-         * the content length.
+-         *
+-         * TODO: It'd be nice to have easier access to content length and
+-         *       content type from the request, instead of having to look
+-         *       directly into the headers.
+-         */
+-        long contentLength = -1;
+-        try {
+-            String contentLengthString = request.getHeaders().get("Content-Length");
+-            if (contentLengthString != null) {
+-                contentLength = Long.parseLong(contentLengthString);
+-            }
+-        } catch (NumberFormatException nfe) {
+-            log.warn("Unable to parse content length from request.  " +
+-                    "Buffering contents in memory.");
+-        }
+-
+-        String contentType = request.getHeaders().get("Content-Type");
+-        ThroughputMetricType type = ServiceMetricTypeGuesser
+-                .guessThroughputMetricType(request,
+-                        ServiceMetricType.UPLOAD_THROUGHPUT_NAME_SUFFIX,
+-                        ServiceMetricType.UPLOAD_BYTE_COUNT_NAME_SUFFIX);
+-
+-        content = getContent(request);
+-        inputStreamRequestEntity = (type == null) ? new InputStreamEntity(content, contentLength) :
+-                new MetricInputStreamEntity(type, content, contentLength);
+-        inputStreamRequestEntity.setContentType(contentType);
+-
+-        setContent(content);
+-        setContentType(contentType);
+-        setContentLength(contentLength);
+-    }
+-
+-    /**
+-     * @return The request content input stream or an empty input stream if there is no content.
+-     */
+-    private InputStream getContent(Request request) {
+-        return (request.getContent() == null) ? new ByteArrayInputStream(new byte[0]) :
+-                request.getContent();
+-    }
+-
+-    @Override
+-    public boolean isChunked() {
+-        return false;
+-    }
+-
+-    /**
+-     * Returns true if the underlying InputStream supports marking/reseting or
+-     * if the underlying InputStreamRequestEntity is repeatable (i.e. its
+-     * content length has been set to
+-     * {@link InputStreamRequestEntity#CONTENT_LENGTH_AUTO} and therefore its
+-     * entire contents will be buffered in memory and can be repeated).
+-     *
+-     * @see org.apache.commons.httpclient.methods.RequestEntity#isRepeatable()
+-     */
+-    @Override
+-    public boolean isRepeatable() {
+-        return content.markSupported() || inputStreamRequestEntity.isRepeatable();
+-    }
+-
+-    /**
+-     * Resets the underlying InputStream if this isn't the first attempt to
+-     * write out the request, otherwise simply delegates to
+-     * InputStreamRequestEntity to write out the data.
+-     * 

+-     * If an error is encountered the first time we try to write the request
+-     * entity, we remember the original exception, and report that as the root
+-     * cause if we continue to encounter errors, rather than masking the
+-     * original error.
+-     *
+-     * @see org.apache.commons.httpclient.methods.RequestEntity#writeRequest(java.io.OutputStream)
+-     */
+-    @Override
+-    public void writeTo(OutputStream output) throws IOException {
+-        try {
+-            if (!firstAttempt && isRepeatable()) content.reset();
+-
+-            firstAttempt = false;
+-            inputStreamRequestEntity.writeTo(output);
+-        } catch (IOException ioe) {
+-            if (originalException == null) originalException = ioe;
+-            throw originalException;
+-        }
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/request/HttpRequestFactory.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/request/HttpRequestFactory.java
+--- ./src/main/java/com/amazonaws/http/request/HttpRequestFactory.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/request/HttpRequestFactory.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,42 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.request;
+-
+-import com.amazonaws.Request;
+-import com.amazonaws.annotation.Beta;
+-import com.amazonaws.http.settings.HttpClientSettings;
+-
+-import java.io.IOException;
+-
+-/**
+- * An interface that can be used to create the http requests that is
+- * understood by the http client.
+- *
+- * @param  Request class that is accepted by the underlying http client.
+- */
+-@Beta
+-public interface HttpRequestFactory {
+-
+-    /**
+-     * A factory method for creating http requests accepted by the underlying
+-     * http client from the sdk request objects.
+-     *
+-     * @param request sdk request object.
+-     * @param settings configuration to be set for the http request.
+-     * @return an instance of request that is accepted by the underlying
+-     * http client that SDK uses.
+-     */
+-    T create(Request request, HttpClientSettings settings) throws IOException;
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/response/AwsResponseHandlerAdapter.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/response/AwsResponseHandlerAdapter.java
+--- ./src/main/java/com/amazonaws/http/response/AwsResponseHandlerAdapter.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/response/AwsResponseHandlerAdapter.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,162 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.response;
+-
+-import com.amazonaws.AmazonWebServiceRequest;
+-import com.amazonaws.AmazonWebServiceResponse;
+-import com.amazonaws.AmazonWebServiceResult;
+-import com.amazonaws.Request;
+-import com.amazonaws.http.AmazonHttpClient;
+-import com.amazonaws.http.HttpResponse;
+-import com.amazonaws.http.HttpResponseHandler;
+-import com.amazonaws.http.SdkHttpMetadata;
+-import com.amazonaws.util.AWSRequestMetrics;
+-import com.amazonaws.util.MetadataCache;
+-
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-
+-/**
+- * Adapts an {@link HttpResponseHandler < AmazonWebServiceResponse >} to an {@link
+- * HttpResponseHandler} (unwrapped result) with proper handling and logging of response
+- * metadata.
+- *
+- * @param  Unmarshalled result type
+- */
+-public class AwsResponseHandlerAdapter implements HttpResponseHandler {
+-
+-    /**
+-     * Logger used for the purpose of logging the AWS request id extracted either from the
+-     * httpClientSettings header response or from the response body.
+-     */
+-    private static final Log requestIdLog = LogFactory.getLog("com.amazonaws.requestId");
+-
+-    private static final Log requestLog = AmazonHttpClient.requestLog;
+-
+-    private final HttpResponseHandler> delegate;
+-    private final Request request;
+-    private final AWSRequestMetrics awsRequestMetrics;
+-    private final MetadataCache responseMetadataCache;
+-
+-    /**
+-     * @param delegate          Response handler to delegate to and unwrap
+-     * @param request           Marshalled request
+-     * @param awsRequestMetrics Request metrics
+-     */
+-    public AwsResponseHandlerAdapter(HttpResponseHandler> delegate,
+-                                     Request request,
+-                                     AWSRequestMetrics awsRequestMetrics,
+-                                     MetadataCache responseMetadataCache) {
+-        this.delegate = delegate;
+-        this.request = request;
+-        this.awsRequestMetrics = awsRequestMetrics;
+-        this.responseMetadataCache = responseMetadataCache;
+-    }
+-
+-    @Override
+-    public T handle(HttpResponse response) throws Exception {
+-        final AmazonWebServiceResponse awsResponse = delegate.handle(response);
+-
+-        if (awsResponse == null) {
+-            throw new RuntimeException("Unable to unmarshall response metadata. Response Code: "
+-                                       + response.getStatusCode() + ", Response Text: " +
+-                                       response.getStatusText());
+-        }
+-
+-        AmazonWebServiceRequest userRequest = request.getOriginalRequest();
+-        if (userRequest.getCloneRoot() != null) {
+-            userRequest = userRequest.getCloneRoot();
+-        }
+-        responseMetadataCache.add(userRequest, awsResponse.getResponseMetadata());
+-        final String awsRequestId = awsResponse.getRequestId();
+-
+-        if (requestLog.isDebugEnabled()) {
+-            requestLog
+-                    .debug("Received successful response: " + response.getStatusCode() +
+-                           ", AWS Request ID: " + awsRequestId);
+-        }
+-
+-        if (!logHeaderRequestId(response)) {
+-            // Logs the AWS request ID extracted from the payload if
+-            // it is not available from the response header.
+-            logResponseRequestId(awsRequestId);
+-        }
+-        awsRequestMetrics.addProperty(AWSRequestMetrics.Field.AWSRequestID, awsRequestId);
+-        return fillInResponseMetadata(awsResponse, response);
+-    }
+-
+-    @SuppressWarnings("unchecked")
+-    private  T fillInResponseMetadata(AmazonWebServiceResponse awsResponse,
+-                                         HttpResponse httpResponse) {
+-        final T result = awsResponse.getResult();
+-        if (result instanceof AmazonWebServiceResult) {
+-            ((AmazonWebServiceResult) result)
+-                    .setSdkResponseMetadata(awsResponse.getResponseMetadata())
+-                    .setSdkHttpMetadata(SdkHttpMetadata.from(httpResponse));
+-        }
+-        return result;
+-    }
+-
+-    @Override
+-    public boolean needsConnectionLeftOpen() {
+-        return delegate.needsConnectionLeftOpen();
+-    }
+-
+-    /**
+-     * Used to log the "x-amzn-RequestId" header at DEBUG level, if any, from the response. This
+-     * method assumes the apache httpClientSettings request/response has just been successfully
+-     * executed. The request id is logged using the "com.amazonaws.requestId" logger if it was
+-     * enabled at DEBUG level; otherwise, it is logged at DEBUG level using the
+-     * "com.amazonaws.request" logger.
+-     *
+-     * @return true if the AWS request id is available from the httpClientSettings header; false
+-     * otherwise.
+-     */
+-    private boolean logHeaderRequestId(final HttpResponse response) {
+-        final String reqIdHeader = response.getHeaders()
+-                .get(HttpResponseHandler.X_AMZN_REQUEST_ID_HEADER);
+-        final boolean isHeaderReqIdAvail = reqIdHeader != null;
+-
+-        if (requestIdLog.isDebugEnabled() || requestLog.isDebugEnabled()) {
+-            final String msg = HttpResponseHandler.X_AMZN_REQUEST_ID_HEADER + ": "
+-                               + (isHeaderReqIdAvail ? reqIdHeader : "not available");
+-            if (requestIdLog.isDebugEnabled()) {
+-                requestIdLog.debug(msg);
+-            } else {
+-                requestLog.debug(msg);
+-            }
+-        }
+-        return isHeaderReqIdAvail;
+-    }
+-
+-    /**
+-     * Used to log the request id (extracted from the response) at DEBUG level. This method is
+-     * called only if there is no request id present in the httpClientSettings response header. The
+-     * request id is logged using the "com.amazonaws.requestId" logger if it was enabled at DEBUG
+-     * level; otherwise, it is logged using at DEBUG level using the "com.amazonaws.request"
+-     * logger.
+-     */
+-    private void logResponseRequestId(final String awsRequestId) {
+-        if (requestIdLog.isDebugEnabled() || requestLog.isDebugEnabled()) {
+-            final String msg = "AWS Request ID: " +
+-                               (awsRequestId == null ? "not available" : awsRequestId);
+-            if (requestIdLog.isDebugEnabled()) {
+-                requestIdLog.debug(msg);
+-            } else {
+-                requestLog.debug(msg);
+-            }
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/SdkHttpMetadata.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/SdkHttpMetadata.java
+--- ./src/main/java/com/amazonaws/http/SdkHttpMetadata.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/SdkHttpMetadata.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,59 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http;
+-
+-import com.amazonaws.annotation.Immutable;
+-
+-import java.util.Collections;
+-import java.util.Map;
+-
+-/**
+- * Metadata about the HTTP response.
+- */
+-@Immutable
+-public class SdkHttpMetadata {
+-
+-    private final Map httpHeaders;
+-
+-    private final int httpStatusCode;
+-
+-    private SdkHttpMetadata(Map httpHeaders, int httpStatusCode) {
+-        this.httpHeaders = Collections.unmodifiableMap(httpHeaders);
+-        this.httpStatusCode = httpStatusCode;
+-    }
+-
+-    /**
+-     * @return All HTTP headers in response.
+-     */
+-    public Map getHttpHeaders() {
+-        return httpHeaders;
+-    }
+-
+-    /**
+-     * @return HTTP status code of response.
+-     */
+-    public int getHttpStatusCode() {
+-        return httpStatusCode;
+-    }
+-
+-    /**
+-     * Static factory to create an {@link SdkHttpMetadata} from the details in a {@link
+-     * HttpResponse}.
+-     */
+-    public static SdkHttpMetadata from(HttpResponse httpResponse) {
+-        return new SdkHttpMetadata(httpResponse.getHeaders(), httpResponse.getStatusCode());
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/settings/HttpClientSettings.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/settings/HttpClientSettings.java
+--- ./src/main/java/com/amazonaws/http/settings/HttpClientSettings.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/settings/HttpClientSettings.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,179 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.settings;
+-
+-import com.amazonaws.ProxyAuthenticationMethod;
+-import java.net.InetAddress;
+-import java.security.SecureRandom;
+-
+-import com.amazonaws.ApacheHttpClientConfig;
+-import com.amazonaws.ClientConfiguration;
+-import com.amazonaws.DnsResolver;
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.util.ValidationUtils;
+-import java.util.List;
+-
+-/**
+- * A convienient class that expose all settings in {@link ClientConfiguration} and other internal settings to the
+- * underlying http client.
+- */
+-@SdkInternalApi
+-public class HttpClientSettings {
+-
+-    private final ClientConfiguration config;
+-
+-    private final boolean useBrowserCompatibleHostNameVerifier;
+-
+-    private final boolean calculateCRC32FromCompressedData;
+-
+-    HttpClientSettings(final ClientConfiguration config,
+-                       final boolean useBrowserCompatibleHostNameVerifier,
+-                       final boolean calculateCRC32FromCompressedData) {
+-        this.config = ValidationUtils.assertNotNull(config, "client configuration");
+-        this.useBrowserCompatibleHostNameVerifier = useBrowserCompatibleHostNameVerifier;
+-        this.calculateCRC32FromCompressedData = calculateCRC32FromCompressedData;
+-    }
+-
+-    public static HttpClientSettings adapt(final ClientConfiguration config,
+-            final boolean useBrowserCompatibleHostNameVerifier,
+-            final boolean calculateCRC32FromCompressedData) {
+-        return new HttpClientSettings(config, useBrowserCompatibleHostNameVerifier, calculateCRC32FromCompressedData);
+-    }
+-
+-    public static HttpClientSettings adapt(final ClientConfiguration config,
+-                                           final boolean useBrowserCompatibleHostNameVerifier) {
+-        return adapt(config, useBrowserCompatibleHostNameVerifier, false);
+-    }
+-
+-    public static HttpClientSettings adapt(final ClientConfiguration config) {
+-        return adapt(config, false);
+-    }
+-
+-    public boolean useBrowserCompatibleHostNameVerifier() {
+-        return useBrowserCompatibleHostNameVerifier;
+-    }
+-
+-    public boolean calculateCRC32FromCompressedData() {
+-        return calculateCRC32FromCompressedData;
+-    }
+-
+-    public int getMaxConnections() {
+-        return config.getMaxConnections();
+-    }
+-
+-    public InetAddress getLocalAddress() {
+-        return config.getLocalAddress();
+-    }
+-
+-    public String getProxyHost() {
+-        return config.getProxyHost();
+-    }
+-
+-    public int getProxyPort() {
+-        return config.getProxyPort();
+-    }
+-
+-    public String getProxyUsername() {
+-        return config.getProxyUsername();
+-    }
+-
+-    public String getProxyPassword() {
+-        return config.getProxyPassword();
+-    }
+-
+-    public String getNonProxyHosts() {
+-        return config.getNonProxyHosts();
+-    }
+-
+-    public List getProxyAuthenticationMethods() {
+-        return config.getProxyAuthenticationMethods();
+-    }
+-
+-    public boolean useReaper() {
+-        return config.useReaper();
+-    }
+-
+-    public boolean useGzip() {
+-        return config.useGzip();
+-    }
+-
+-    public DnsResolver getDnsResolver() {
+-        return config.getDnsResolver();
+-    }
+-
+-    public ApacheHttpClientConfig getApacheHttpClientConfig() {
+-        return config.getApacheHttpClientConfig();
+-    }
+-
+-    public int getSocketTimeout() {
+-        return config.getSocketTimeout();
+-    }
+-
+-    public int[] getSocketBufferSize() {
+-        return config.getSocketBufferSizeHints();
+-    }
+-
+-    public boolean useTcpKeepAlive() {
+-        return config.useTcpKeepAlive();
+-    }
+-
+-    public SecureRandom getSecureRandom() {
+-        return config.getSecureRandom();
+-    }
+-
+-    public int getConnectionTimeout() {
+-        return config.getConnectionTimeout();
+-    }
+-
+-    public int getConnectionPoolRequestTimeout() {
+-        return config.getConnectionTimeout();
+-    }
+-
+-    public long getConnectionPoolTTL() {
+-        return config.getConnectionTTL();
+-    }
+-
+-    public long getMaxIdleConnectionTime() {
+-        return config.getConnectionMaxIdleMillis();
+-    }
+-
+-    public int getValidateAfterInactivityMillis() {
+-        return config.getValidateAfterInactivityMillis();
+-    }
+-
+-    public String getProxyWorkstation() {
+-        return config.getProxyWorkstation();
+-    }
+-
+-    public String getProxyDomain() {
+-        return config.getProxyDomain();
+-    }
+-
+-    public boolean isPreemptiveBasicProxyAuth() {
+-        return config.isPreemptiveBasicProxyAuth();
+-    }
+-
+-    public boolean isUseExpectContinue() {
+-        return config.isUseExpectContinue();
+-    }
+-
+-    public boolean isProxyEnabled() {
+-        return getProxyHost() != null && getProxyPort() > 0;
+-    }
+-
+-    public boolean isAuthenticatedProxy() {
+-        return getProxyUsername() != null && getProxyPassword() != null;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/StaxResponseHandler.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/StaxResponseHandler.java
+--- ./src/main/java/com/amazonaws/http/StaxResponseHandler.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/StaxResponseHandler.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,166 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http;
+-
+-import com.amazonaws.AmazonWebServiceResponse;
+-import com.amazonaws.ResponseMetadata;
+-import com.amazonaws.transform.StaxUnmarshallerContext;
+-import com.amazonaws.transform.Unmarshaller;
+-import com.amazonaws.transform.VoidStaxUnmarshaller;
+-import com.amazonaws.util.StringUtils;
+-import com.amazonaws.util.XmlUtils;
+-import java.io.ByteArrayInputStream;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.util.Map;
+-import javax.xml.stream.XMLEventReader;
+-import javax.xml.stream.XMLStreamException;
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-
+-/**
+- * Default implementation of HttpResponseHandler that handles a successful
+- * response from an AWS service and unmarshalls the result using a StAX
+- * unmarshaller.
+- *
+- * @param  Indicates the type being unmarshalled by this response handler.
+- */
+-public class StaxResponseHandler implements HttpResponseHandler> {
+-
+-    /**
+-     * The StAX unmarshaller to use when handling the response
+-     */
+-    private Unmarshaller responseUnmarshaller;
+-
+-    /**
+-     * Shared logger for profiling information
+-     */
+-    private static final Log log = LogFactory.getLog("com.amazonaws.request");
+-
+-    /**
+-     * Constructs a new response handler that will use the specified StAX
+-     * unmarshaller to unmarshall the service response and uses the specified
+-     * response element path to find the root of the business data in the
+-     * service's response.
+-     *
+-     * @param responseUnmarshaller The StAX unmarshaller to use on the response.
+-     */
+-    public StaxResponseHandler(Unmarshaller responseUnmarshaller) {
+-        this.responseUnmarshaller = responseUnmarshaller;
+-
+-        /*
+-         * Even if the invoked operation just returns null, we still need an
+-         * unmarshaller to run so we can pull out response metadata.
+-         *
+-         * We might want to pass this in through the client class so that we
+-         * don't have to do this check here.
+-         */
+-        if (this.responseUnmarshaller == null) {
+-            this.responseUnmarshaller = new VoidStaxUnmarshaller();
+-        }
+-    }
+-
+-
+-    /**
+-     * @see HttpResponseHandler#handle(HttpResponse)
+-     */
+-    public AmazonWebServiceResponse handle(HttpResponse response) throws Exception {
+-        log.trace("Parsing service response XML");
+-        InputStream content = response.getContent();
+-        if (content == null) {
+-            content = new ByteArrayInputStream("".getBytes(StringUtils.UTF8));
+-        }
+-
+-        XMLEventReader eventReader;
+-        try {
+-            eventReader = XmlUtils.getXmlInputFactory().createXMLEventReader(content);
+-        } catch (XMLStreamException e) {
+-            throw handleXmlStreamException(e);
+-        }
+-
+-        try {
+-            AmazonWebServiceResponse awsResponse = new AmazonWebServiceResponse();
+-            StaxUnmarshallerContext unmarshallerContext = new StaxUnmarshallerContext(eventReader, response.getHeaders());
+-            unmarshallerContext.registerMetadataExpression("ResponseMetadata/RequestId", 2, ResponseMetadata.AWS_REQUEST_ID);
+-            unmarshallerContext.registerMetadataExpression("requestId", 2, ResponseMetadata.AWS_REQUEST_ID);
+-            registerAdditionalMetadataExpressions(unmarshallerContext);
+-
+-            T result = responseUnmarshaller.unmarshall(unmarshallerContext);
+-            awsResponse.setResult(result);
+-
+-            Map metadata = unmarshallerContext.getMetadata();
+-            Map responseHeaders = response.getHeaders();
+-            if (responseHeaders != null) {
+-                if (responseHeaders.get(X_AMZN_REQUEST_ID_HEADER) != null) {
+-                    metadata.put(ResponseMetadata.AWS_REQUEST_ID,
+-                                 responseHeaders.get(X_AMZN_REQUEST_ID_HEADER));
+-                }
+-            }
+-            awsResponse.setResponseMetadata(getResponseMetadata(metadata));
+-
+-            log.trace("Done parsing service response");
+-            return awsResponse;
+-        } catch (XMLStreamException e) {
+-            throw handleXmlStreamException(e);
+-        } finally {
+-            try {
+-                eventReader.close();
+-            } catch (XMLStreamException e) {
+-                log.warn("Error closing xml parser", e);
+-            }
+-        }
+-    }
+-
+-    /**
+-     * If the exception was caused by an {@link IOException}, wrap it an another IOE so
+-     * that it will be exposed to the RetryPolicy.
+-     */
+-    private Exception handleXmlStreamException(XMLStreamException e) throws Exception {
+-        if (e.getNestedException() instanceof IOException) {
+-            return new IOException(e);
+-        }
+-        return e;
+-    }
+-
+-    /**
+-     * Create the default {@link ResponseMetadata}. Subclasses may override this to create a
+-     * subclass of {@link ResponseMetadata}. Currently only SimpleDB does this.
+-     */
+-    protected ResponseMetadata getResponseMetadata(Map metadata) {
+-        return new ResponseMetadata(metadata);
+-    }
+-
+-    /**
+-     * Hook for subclasses to override in order to collect additional metadata
+-     * from service responses.
+-     *
+-     * @param unmarshallerContext The unmarshaller context used to configure a service's response
+-     *                            data.
+-     */
+-    protected void registerAdditionalMetadataExpressions(StaxUnmarshallerContext unmarshallerContext) {
+-    }
+-
+-    /**
+-     * Since this response handler completely consumes all the data from the
+-     * underlying HTTP connection during the handle method, we don't need to
+-     * keep the HTTP connection open.
+-     *
+-     * @see com.amazonaws.http.HttpResponseHandler#needsConnectionLeftOpen()
+-     */
+-    public boolean needsConnectionLeftOpen() {
+-        return false;
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/timers/client/ClientExecutionAbortTaskImpl.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/client/ClientExecutionAbortTaskImpl.java
+--- ./src/main/java/com/amazonaws/http/timers/client/ClientExecutionAbortTaskImpl.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/client/ClientExecutionAbortTaskImpl.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,60 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.timers.client;
+-
+-import org.apache.http.client.methods.HttpRequestBase;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-
+-/**
+- * Implementation of {@link ClientExecutionAbortTask} that interrupts the caller thread and aborts
+- * any HTTP request when triggered
+- */
+-@SdkInternalApi
+-public class ClientExecutionAbortTaskImpl implements ClientExecutionAbortTask {
+-
+-    private volatile boolean hasTaskExecuted;
+-    private HttpRequestBase currentHttpRequest;
+-    private final Thread thread;
+-
+-    public ClientExecutionAbortTaskImpl(Thread thread) {
+-        this.thread = thread;
+-    }
+-
+-    @Override
+-    public void run() {
+-        hasTaskExecuted = true;
+-        if (!thread.isInterrupted()) {
+-            thread.interrupt();
+-        }
+-        if (!currentHttpRequest.isAborted()) {
+-            currentHttpRequest.abort();
+-        }
+-    }
+-
+-    public void setCurrentHttpRequest(HttpRequestBase newRequest) {
+-        this.currentHttpRequest = newRequest;
+-    }
+-
+-    public boolean hasClientExecutionAborted() {
+-        return hasTaskExecuted;
+-    }
+-
+-    @Override
+-    public boolean isEnabled() {
+-        return true;
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/timers/client/ClientExecutionAbortTask.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/client/ClientExecutionAbortTask.java
+--- ./src/main/java/com/amazonaws/http/timers/client/ClientExecutionAbortTask.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/client/ClientExecutionAbortTask.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,44 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.timers.client;
+-
+-import org.apache.http.client.methods.HttpRequestBase;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-
+-/**
+- * Task to be scheduled by {@link ClientExecutionTimer}
+- */
+-@SdkInternalApi
+-public interface ClientExecutionAbortTask extends Runnable {
+-
+-    /**
+-     * Client Execution timer task needs to abort the current running HTTP request when executed.
+-     * 
+-     * @param newRequest
+-     */
+-    public void setCurrentHttpRequest(HttpRequestBase newRequest);
+-
+-    /**
+-     * @return True if client execution has been aborted by the timer task. False otherwise
+-     */
+-    public boolean hasClientExecutionAborted();
+-
+-    /**
+-     * @return True if the timer task has been scheduled. False if client execution timeout is
+-     *         disabled for this request
+-     */
+-    public boolean isEnabled();
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/http/timers/client/ClientExecutionAbortTrackerTaskImpl.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/client/ClientExecutionAbortTrackerTaskImpl.java
+--- ./src/main/java/com/amazonaws/http/timers/client/ClientExecutionAbortTrackerTaskImpl.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/client/ClientExecutionAbortTrackerTaskImpl.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,59 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.timers.client;
+-
+-import java.util.concurrent.ScheduledFuture;
+-
+-import org.apache.http.client.methods.HttpRequestBase;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.util.ValidationUtils;
+-
+-/**
+- * Keeps track of the scheduled {@link ClientExecutionAbortTask} and the associated {@link Future}
+- */
+-@SdkInternalApi
+-public class ClientExecutionAbortTrackerTaskImpl implements ClientExecutionAbortTrackerTask {
+-
+-    private final ClientExecutionAbortTask task;
+-    private final ScheduledFuture future;
+-
+-    public ClientExecutionAbortTrackerTaskImpl(final ClientExecutionAbortTask task, final ScheduledFuture future) {
+-        this.task = ValidationUtils.assertNotNull(task, "task");
+-        this.future = ValidationUtils.assertNotNull(future, "future");
+-    }
+-
+-    @Override
+-    public void setCurrentHttpRequest(HttpRequestBase newRequest) {
+-        task.setCurrentHttpRequest(newRequest);
+-    }
+-
+-    @Override
+-    public boolean hasTimeoutExpired() {
+-        return task.hasClientExecutionAborted();
+-    }
+-
+-    @Override
+-    public boolean isEnabled() {
+-        return task.isEnabled();
+-    }
+-
+-    @Override
+-    public void cancelTask() {
+-        // Ensure task is canceled even if it's running as we don't want the Thread to be
+-        // interrupted in the caller's code
+-        future.cancel(false);
+-    }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/http/timers/client/ClientExecutionAbortTrackerTask.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/client/ClientExecutionAbortTrackerTask.java
+--- ./src/main/java/com/amazonaws/http/timers/client/ClientExecutionAbortTrackerTask.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/client/ClientExecutionAbortTrackerTask.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,44 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.timers.client;
+-
+-import org.apache.http.client.methods.HttpRequestBase;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-
+-@SdkInternalApi
+-public interface ClientExecutionAbortTrackerTask {
+-
+-    /**
+-     * Client execution timer task needs to abort the current running HTTP request when executed.
+-     * 
+-     * @param newRequest
+-     */
+-    void setCurrentHttpRequest(HttpRequestBase newRequest);
+-
+-    /**
+-     * @return True if client execution has been aborted by the timer task. False otherwise
+-     */
+-    boolean hasTimeoutExpired();
+-
+-    /**
+-     * @return True if the timer task has been scheduled. False if the client execution timeout is
+-     *         disabled for this request
+-     */
+-    boolean isEnabled();
+-
+-    void cancelTask();
+-
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/http/timers/client/ClientExecutionTimeoutException.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/client/ClientExecutionTimeoutException.java
+--- ./src/main/java/com/amazonaws/http/timers/client/ClientExecutionTimeoutException.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/client/ClientExecutionTimeoutException.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,31 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.timers.client;
+-
+-import com.amazonaws.SdkClientException;
+-
+-public class ClientExecutionTimeoutException extends SdkClientException {
+-
+-    public ClientExecutionTimeoutException() {
+-        this("Client execution did not complete before the specified timeout configuration.");
+-    }
+-
+-    public ClientExecutionTimeoutException(String message) {
+-        super(message);
+-    }
+-
+-    private static final long serialVersionUID = 4861767589924758934L;
+-
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/http/timers/client/ClientExecutionTimer.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/client/ClientExecutionTimer.java
+--- ./src/main/java/com/amazonaws/http/timers/client/ClientExecutionTimer.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/client/ClientExecutionTimer.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,102 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.timers.client;
+-
+-import java.util.concurrent.ScheduledFuture;
+-import java.util.concurrent.ScheduledThreadPoolExecutor;
+-import java.util.concurrent.TimeUnit;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.annotation.SdkTestInternalApi;
+-import com.amazonaws.annotation.ThreadSafe;
+-import com.amazonaws.http.AmazonHttpClient;
+-import com.amazonaws.http.timers.TimeoutThreadPoolBuilder;
+-
+-/**
+- * Represents a timer to enforce a timeout on the total client execution time. That is the time
+- * spent executing request handlers, any HTTP request including retries, unmarshalling, etc.
+- * Essentially all the time spent in {@link AmazonHttpClient}
+- */
+-// DO NOT override finalize(). The shutdown() method is called from AmazonHttpClient#shutdown()
+-// which is called from it's finalize() method.  Since finalize methods can be be called in any
+-// order and even concurrently, we need to rely on AmazonHttpClient to call our shutdown() method.
+-@SdkInternalApi
+-@ThreadSafe
+-public class ClientExecutionTimer {
+-
+-    private static final String threadNamePrefix = "AwsSdkClientExecutionTimerThread";
+-
+-    private volatile ScheduledThreadPoolExecutor executor;
+-
+-    /**
+-     * Start the timer with the specified timeout and return a object that can be used to track the
+-     * state of the timer and cancel it if need be.
+-     * 
+-     * @param clientExecutionTimeoutMillis
+-     *            A positive value here enables the timer, a non-positive value disables it and
+-     *            returns a dummy tracker task
+-     * @return Implementation of {@link ClientExecutionAbortTrackerTaskImpl} to query the state of
+-     *         the task, provide it with up to date context, and cancel it if appropriate
+-     */
+-    public ClientExecutionAbortTrackerTask startTimer(int clientExecutionTimeoutMillis) {
+-        if (isTimeoutDisabled(clientExecutionTimeoutMillis)) {
+-            return NoOpClientExecutionAbortTrackerTask.INSTANCE;
+-        } else if (executor == null) {
+-            initializeExecutor();
+-        }
+-        return scheduleTimerTask(clientExecutionTimeoutMillis);
+-    }
+-
+-    /**
+-     * Executor is lazily initialized as it's not compatible with Java 6
+-     */
+-    private synchronized void initializeExecutor() {
+-        if (executor == null) {
+-            executor = TimeoutThreadPoolBuilder.buildDefaultTimeoutThreadPool(threadNamePrefix);
+-        }
+-    }
+-
+-    /**
+-     * This method is current exposed for testing purposes
+-     * 
+-     * @return The underlying {@link ScheduledThreadPoolExecutor}
+-     */
+-    @SdkTestInternalApi
+-    public ScheduledThreadPoolExecutor getExecutor() {
+-        return this.executor;
+-    }
+-
+-    /**
+-     * Shutdown the underlying {@link ScheduledThreadPoolExecutor}. Should be invoked when
+-     * {@link AmazonHttpClient} is shutdown
+-     */
+-    public synchronized void shutdown() {
+-        if (executor != null) {
+-            executor.shutdown();
+-        }
+-    }
+-
+-    private ClientExecutionAbortTrackerTask scheduleTimerTask(int clientExecutionTimeoutMillis) {
+-        ClientExecutionAbortTask timerTask = new ClientExecutionAbortTaskImpl(Thread.currentThread());
+-        ScheduledFuture timerTaskFuture = executor.schedule(timerTask, clientExecutionTimeoutMillis,
+-                TimeUnit.MILLISECONDS);
+-        return new ClientExecutionAbortTrackerTaskImpl(timerTask, timerTaskFuture);
+-    }
+-
+-    private boolean isTimeoutDisabled(int clientExecutionTimeoutMillis) {
+-        return clientExecutionTimeoutMillis <= 0;
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/timers/client/NoOpClientExecutionAbortTrackerTask.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/client/NoOpClientExecutionAbortTrackerTask.java
+--- ./src/main/java/com/amazonaws/http/timers/client/NoOpClientExecutionAbortTrackerTask.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/client/NoOpClientExecutionAbortTrackerTask.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,49 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.timers.client;
+-
+-import org.apache.http.client.methods.HttpRequestBase;
+-
+-/**
+- * Dummy implementation of {@link ClientExecutionAbortTrackerTask} used when the timer is disabled
+- * for a request
+- */
+-public class NoOpClientExecutionAbortTrackerTask implements ClientExecutionAbortTrackerTask {
+-
+-    public static final NoOpClientExecutionAbortTrackerTask INSTANCE = new NoOpClientExecutionAbortTrackerTask();
+-
+-    // Singleton
+-    private NoOpClientExecutionAbortTrackerTask() {
+-    }
+-
+-    @Override
+-    public void setCurrentHttpRequest(HttpRequestBase newRequest) {
+-    }
+-
+-    @Override
+-    public boolean hasTimeoutExpired() {
+-        return false;
+-    }
+-
+-    @Override
+-    public boolean isEnabled() {
+-        return false;
+-    }
+-
+-    @Override
+-    public void cancelTask() {
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/timers/client/SdkInterruptedException.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/client/SdkInterruptedException.java
+--- ./src/main/java/com/amazonaws/http/timers/client/SdkInterruptedException.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/client/SdkInterruptedException.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,32 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.timers.client;
+-
+-import com.amazonaws.Response;
+-
+-public class SdkInterruptedException extends InterruptedException {
+-
+-    private static final long serialVersionUID = 8194951388566545094L;
+-
+-    private final transient Response response;
+-
+-    public SdkInterruptedException(Response response) {
+-        this.response = response;
+-    }
+-
+-    public Response getResponse() {
+-        return response;
+-    }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/http/timers/package-info.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/package-info.java
+--- ./src/main/java/com/amazonaws/http/timers/package-info.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/package-info.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,23 +0,0 @@
+-/*
+- * Copyright (c) 2016. Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-/**
+- * Classes for the request timeout and client execution timeout features. See
+- * {@link com.amazonaws.ClientConfiguration} and {@link com.amazonaws.AmazonWebServiceRequest} for
+- * more information on enabling these features. All classes within this package are internal and
+- * should not be used outside the SDK.
+- */
+-@com.amazonaws.annotation.SdkInternalApi
+-package com.amazonaws.http.timers;
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/http/timers/request/HttpRequestAbortTaskImpl.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/request/HttpRequestAbortTaskImpl.java
+--- ./src/main/java/com/amazonaws/http/timers/request/HttpRequestAbortTaskImpl.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/request/HttpRequestAbortTaskImpl.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,52 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.timers.request;
+-
+-import org.apache.http.client.methods.HttpRequestBase;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-
+-/**
+- * Implementation of {@link HttpRequestAbortTask} that aborts the tracking {@link HttpRequestBase}
+- * when triggered
+- */
+-@SdkInternalApi
+-public class HttpRequestAbortTaskImpl implements HttpRequestAbortTask {
+-
+-    private final HttpRequestBase httpRequest;
+-    private volatile boolean httpRequestAborted;
+-
+-    public HttpRequestAbortTaskImpl(final HttpRequestBase httpRequest) {
+-        this.httpRequest = httpRequest;
+-    }
+-
+-    @Override
+-    public void run() {
+-        if (!httpRequest.isAborted()) {
+-            httpRequestAborted = true;
+-            httpRequest.abort();
+-        }
+-    }
+-
+-    public boolean httpRequestAborted() {
+-        return httpRequestAborted;
+-    }
+-
+-    @Override
+-    public boolean isEnabled() {
+-        return true;
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/timers/request/HttpRequestAbortTask.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/request/HttpRequestAbortTask.java
+--- ./src/main/java/com/amazonaws/http/timers/request/HttpRequestAbortTask.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/request/HttpRequestAbortTask.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,28 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.timers.request;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-
+-/**
+- * Task to be scheduled by {@link HttpRequestTimer}
+- */
+-@SdkInternalApi
+-public interface HttpRequestAbortTask extends Runnable {
+-
+-    public boolean httpRequestAborted();
+-
+-    public boolean isEnabled();
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/timers/request/HttpRequestAbortTaskTrackerImpl.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/request/HttpRequestAbortTaskTrackerImpl.java
+--- ./src/main/java/com/amazonaws/http/timers/request/HttpRequestAbortTaskTrackerImpl.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/request/HttpRequestAbortTaskTrackerImpl.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,52 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.timers.request;
+-
+-import java.util.concurrent.Future;
+-import java.util.concurrent.ScheduledFuture;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.util.ValidationUtils;
+-
+-/**
+- * Keeps track of the scheduled {@link HttpRequestAbortTask} and the associated {@link Future}
+- */
+-@SdkInternalApi
+-public class HttpRequestAbortTaskTrackerImpl implements HttpRequestAbortTaskTracker {
+-
+-    private final HttpRequestAbortTask task;
+-    private final ScheduledFuture future;
+-
+-    public HttpRequestAbortTaskTrackerImpl(final HttpRequestAbortTask task, final ScheduledFuture future) {
+-        this.task = ValidationUtils.assertNotNull(task, "task");
+-        this.future = ValidationUtils.assertNotNull(future, "future");
+-    }
+-
+-    @Override
+-    public boolean httpRequestAborted() {
+-        return task.httpRequestAborted();
+-    }
+-
+-    @Override
+-    public boolean isEnabled() {
+-        return task.isEnabled();
+-    }
+-
+-    @Override
+-    public void cancelTask() {
+-        future.cancel(false);
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/timers/request/HttpRequestAbortTaskTracker.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/request/HttpRequestAbortTaskTracker.java
+--- ./src/main/java/com/amazonaws/http/timers/request/HttpRequestAbortTaskTracker.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/request/HttpRequestAbortTaskTracker.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,42 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.timers.request;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-
+-/**
+- * Returned by {@link HttpRequestTimer} to track a scheduled timer task.
+- */
+-@SdkInternalApi
+-public interface HttpRequestAbortTaskTracker {
+-
+-    /**
+-     * @return True if the HTTP request the scheduled task is tracking has been aborted by the task.
+-     *         False otherwise
+-     */
+-    boolean httpRequestAborted();
+-
+-    /**
+-     * @return True if the timer is enabled for this request. False otherwise
+-     */
+-    boolean isEnabled();
+-
+-    /**
+-     * Cancel the timer task. This should be called when the request completes within the timeout
+-     * otherwise the task will wake up and abort the HTTP request
+-     */
+-    void cancelTask();
+-
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/http/timers/request/HttpRequestTimer.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/request/HttpRequestTimer.java
+--- ./src/main/java/com/amazonaws/http/timers/request/HttpRequestTimer.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/request/HttpRequestTimer.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,98 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.timers.request;
+-
+-import java.util.concurrent.ScheduledFuture;
+-import java.util.concurrent.ScheduledThreadPoolExecutor;
+-import java.util.concurrent.TimeUnit;
+-
+-import org.apache.http.client.methods.HttpRequestBase;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.annotation.SdkTestInternalApi;
+-import com.amazonaws.annotation.ThreadSafe;
+-import com.amazonaws.http.timers.TimeoutThreadPoolBuilder;
+-
+-/**
+- * Represents a timer class to enforce HTTP request timeouts.
+- */
+-// DO NOT override finalize(). The shutdown() method is called from AmazonHttpClient#shutdown()
+-// which is called from it's finalize() method. Since finalize methods can be be called in any order
+-// and even concurrently, we need to rely on AmazonHttpClient to call our shutdown() method.
+-@ThreadSafe
+-@SdkInternalApi
+-public class HttpRequestTimer {
+-
+-    private static final String threadNamePrefix = "AwsSdkRequestTimerThread";
+-
+-    private volatile ScheduledThreadPoolExecutor executor;
+-
+-    /**
+-     * Start the timer with the specified timeout and return a object that can be used to track the
+-     * state of the timer and cancel it if need be.
+-     *
+-     * @param apacheRequest
+-     *            HTTP request this timer will abort if triggered.
+-     * @param requestTimeoutMillis
+-     *            A positive value here enables the timer, a non-positive value disables it and
+-     *            returns a dummy tracker task
+-     * @return Implementation of {@link HttpRequestAbortTaskTrackerImpl} to query the state of the
+-     *         task and cancel it if appropriate
+-     */
+-    public HttpRequestAbortTaskTracker startTimer(final HttpRequestBase apacheRequest, final int requestTimeoutMillis) {
+-        if (isTimeoutDisabled(requestTimeoutMillis)) {
+-            return NoOpHttpRequestAbortTaskTracker.INSTANCE;
+-        } else if (executor == null) {
+-            initializeExecutor();
+-        }
+-        HttpRequestAbortTaskImpl timerTask = new HttpRequestAbortTaskImpl(apacheRequest);
+-        ScheduledFuture timerTaskFuture = executor.schedule(timerTask, requestTimeoutMillis, TimeUnit.MILLISECONDS);
+-        return new HttpRequestAbortTaskTrackerImpl(timerTask, timerTaskFuture);
+-    }
+-
+-    private boolean isTimeoutDisabled(final int requestTimeoutMillis) {
+-        return requestTimeoutMillis <= 0;
+-    }
+-
+-    /**
+-     * Executor is lazily initialized as it's not compatible with Java 6
+-     */
+-    private synchronized void initializeExecutor() {
+-        if (executor == null) {
+-            executor = TimeoutThreadPoolBuilder.buildDefaultTimeoutThreadPool(threadNamePrefix);
+-        }
+-    }
+-
+-    /**
+-     * Shutdown the underlying {@link ScheduledThreadPoolExecutor}. Should be invoked when
+-     * {@link com.amazonaws.http.AmazonHttpClient} is shutdown
+-     */
+-    public synchronized void shutdown() {
+-        if (executor != null) {
+-            executor.shutdown();
+-        }
+-    }
+-
+-    /**
+-     * This method is current exposed for testing purposes
+-     * 
+-     * @return The underlying {@link ScheduledThreadPoolExecutor}
+-     */
+-    @SdkTestInternalApi
+-    public ScheduledThreadPoolExecutor getExecutor() {
+-        return executor;
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/timers/request/NoOpHttpRequestAbortTaskTracker.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/request/NoOpHttpRequestAbortTaskTracker.java
+--- ./src/main/java/com/amazonaws/http/timers/request/NoOpHttpRequestAbortTaskTracker.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/request/NoOpHttpRequestAbortTaskTracker.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,43 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.timers.request;
+-
+-/**
+- * Dummy implementation of {@link HttpRequestAbortTaskTracker} used when the timer is disabled for a
+- * request
+- */
+-public class NoOpHttpRequestAbortTaskTracker implements HttpRequestAbortTaskTracker {
+-
+-    public static final NoOpHttpRequestAbortTaskTracker INSTANCE = new NoOpHttpRequestAbortTaskTracker();
+-
+-    // Singleton
+-    private NoOpHttpRequestAbortTaskTracker() {
+-    }
+-
+-    @Override
+-    public boolean httpRequestAborted() {
+-        return false;
+-    }
+-
+-    @Override
+-    public boolean isEnabled() {
+-        return false;
+-    }
+-
+-    @Override
+-    public void cancelTask() {
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/timers/TimeoutThreadPoolBuilder.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/TimeoutThreadPoolBuilder.java
+--- ./src/main/java/com/amazonaws/http/timers/TimeoutThreadPoolBuilder.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/timers/TimeoutThreadPoolBuilder.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,93 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http.timers;
+-
+-import java.lang.reflect.InvocationTargetException;
+-import java.util.concurrent.ScheduledThreadPoolExecutor;
+-import java.util.concurrent.ThreadFactory;
+-import java.util.concurrent.TimeUnit;
+-
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.annotation.SdkInternalApi;
+-
+-/**
+- * Utility class to build the {@link ScheduledThreadPoolExecutor} for the request timeout and client
+- * execution timeout features
+- */
+-@SdkInternalApi
+-public class TimeoutThreadPoolBuilder {
+-    
+-    /**
+-     * Creates a {@link ScheduledThreadPoolExecutor} with custom name for the threads.
+-     *
+-     * @param name the prefix to add to the thread name in ThreadFactory.
+-     * @return The default thread pool for request timeout and client execution timeout features.
+-     */
+-    public static ScheduledThreadPoolExecutor buildDefaultTimeoutThreadPool(final String name) {
+-        ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(5, getThreadFactory(name));
+-        safeSetRemoveOnCancel(executor);
+-        executor.setKeepAliveTime(5, TimeUnit.SECONDS);
+-        executor.allowCoreThreadTimeOut(true);
+-
+-        return executor;
+-    }
+-
+-    private static ThreadFactory getThreadFactory(final String name) {
+-        return new ThreadFactory() {
+-            private int threadCount = 1;
+-
+-            public Thread newThread(Runnable r) {
+-                Thread thread = new Thread(r);
+-                if (name != null) {
+-                    thread.setName(name + "-" + threadCount++);
+-                }
+-                thread.setPriority(Thread.MAX_PRIORITY);
+-                return thread;
+-            }
+-        };
+-    }
+-
+-    /**
+-     * {@link ScheduledThreadPoolExecutor#setRemoveOnCancelPolicy(boolean)} is not available in Java
+-     * 6 so we invoke it with reflection to be able to compile against Java 6.
+-     * 
+-     * @param executor
+-     */
+-    private static void safeSetRemoveOnCancel(ScheduledThreadPoolExecutor executor) {
+-        try {
+-            executor.getClass().getMethod("setRemoveOnCancelPolicy", boolean.class).invoke(executor, Boolean.TRUE);
+-        } catch (IllegalAccessException e) {
+-            throwSetRemoveOnCancelException(e);
+-        } catch (IllegalArgumentException e) {
+-            throwSetRemoveOnCancelException(e);
+-        } catch (InvocationTargetException e) {
+-            throwSetRemoveOnCancelException(e.getCause());
+-        } catch (NoSuchMethodException e) {
+-            throw new SdkClientException("The request timeout feature is only available for Java 1.7 and above.");
+-        } catch (SecurityException e) {
+-            throw new SdkClientException("The request timeout feature needs additional permissions to function.", e);
+-        }
+-    }
+-
+-    /**
+-     * Wrap exception caused by calling setRemoveOnCancel in a {@link SdkClientException}.
+-     * 
+-     * @param cause
+-     *            Root cause of exception
+-     */
+-    private static void throwSetRemoveOnCancelException(Throwable cause) {
+-        throw new SdkClientException("Unable to setRemoveOnCancelPolicy for request timeout thread pool", cause);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/http/UnreliableTestConfig.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/UnreliableTestConfig.java
+--- ./src/main/java/com/amazonaws/http/UnreliableTestConfig.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/http/UnreliableTestConfig.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,71 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.http;
+-
+-/**
+- * Used to configure the conditions for injecting content input stream failures
+- * for testing purposes.
+- */
+-class UnreliableTestConfig {
+-    private int maxNumErrors = 1;
+-    private int bytesReadBeforeException = 100;
+-    private boolean isFakeIOException;
+-    private int resetIntervalBeforeException = 2;
+-
+-    int getMaxNumErrors() {
+-        return maxNumErrors;
+-    }
+-
+-    int getBytesReadBeforeException() {
+-        return bytesReadBeforeException;
+-    }
+-
+-    boolean isFakeIOException() {
+-        return isFakeIOException;
+-    }
+-
+-    int getResetIntervalBeforeException() {
+-        return resetIntervalBeforeException;
+-    }
+-
+-    UnreliableTestConfig withMaxNumErrors(int maxNumErrors) {
+-        this.maxNumErrors = maxNumErrors;
+-        return this;
+-    }
+-
+-    UnreliableTestConfig withBytesReadBeforeException(
+-            int bytesReadBeforeException) {
+-        this.bytesReadBeforeException = bytesReadBeforeException;
+-        return this;
+-    }
+-
+-    UnreliableTestConfig withFakeIOException(boolean isFakeIOException) {
+-        this.isFakeIOException = isFakeIOException;
+-        return this;
+-    }
+-
+-    /**
+-     * Used to control whether an exception would be thrown based on the reset
+-     * recurrence; not applicable if set to zero. For example, if
+-     * resetIntervalBeforeException == n, the exception can only be thrown
+-     * before the n_th reset (or after the n_th minus 1 reset), 2n_th reset (or
+-     * after the 2n_th minus 1) reset), etc.
+-     */
+-    UnreliableTestConfig withResetIntervalBeforeException(
+-            int resetIntervalBeforeException) {
+-        this.resetIntervalBeforeException = resetIntervalBeforeException;
+-        return this;
+-    }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/HttpMethod.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/HttpMethod.java
+--- ./src/main/java/com/amazonaws/HttpMethod.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/HttpMethod.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,24 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws;
+-
+-/**
+- * Enumeration of valid HTTP methods.
+- */
+-public enum HttpMethod {
+-
+-    GET, POST, PUT, DELETE, HEAD, PATCH;
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/ImmutableRequest.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/ImmutableRequest.java
+--- ./src/main/java/com/amazonaws/ImmutableRequest.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/ImmutableRequest.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,114 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *   http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- *
+- */
+-
+-package com.amazonaws;
+-
+-import com.amazonaws.http.HttpMethodName;
+-
+-import java.io.InputStream;
+-import java.net.URI;
+-import java.util.List;
+-import java.util.Map;
+-
+-/**
+- * Represents a request being sent to an Amazon Web Service, including the
+- * parameters being sent as part of the request, the endpoint to which the
+- * request should be sent, etc.
+- * Members of this class should be considered read-only and not mutated
+- *
+- * @param  The type of original, user facing request represented by this
+- *            request.
+- */
+-public interface ImmutableRequest {
+-    /**
+-     * Returns a map of all the headers included in this request.
+-     *
+-     * @return A map of all the headers included in this request.
+-     */
+-    Map getHeaders();
+-
+-    /**
+-     * Returns the path to the resource being requested.
+-     *
+-     * @return The path to the resource being requested.
+-     */
+-    String getResourcePath();
+-
+-    /**
+-     * Returns a map of all parameters in this request.
+-     *
+-     * @return A map of all parameters in this request.
+-     */
+-    Map> getParameters();
+-
+-    /**
+-     * Returns the service endpoint (ex: "https://ec2.amazonaws.com") to which
+-     * this request should be sent.
+-     *
+-     * @return The service endpoint to which this request should be sent.
+-     */
+-    URI getEndpoint();
+-
+-    /**
+-     * Returns the HTTP method (GET, POST, etc) to use when sending this
+-     * request.
+-     *
+-     * @return The HTTP method to use when sending this request.
+-     */
+-    HttpMethodName getHttpMethod();
+-
+-    /**
+-     * Returns the optional value for time offset for this request.  This
+-     * will be used by the signer to adjust for potential clock skew.
+-     * Value is in seconds, positive values imply the current clock is "fast",
+-     * negative values imply clock is slow.
+-     *
+-     * @return The optional value for time offset (in seconds) for this request.
+-     */
+-    int getTimeOffset();
+-
+-    /**
+-     * Returns the optional stream containing the payload data to include for
+-     * this request. Not all requests will contain payload data.
+-     *
+-     * @return The optional stream containing the payload data to include for
+-     *         this request.
+-     */
+-    InputStream getContent();
+-
+-    /**
+-     * Returns the optional raw stream containing the payload data to include
+-     * for this request, with all progress stream wrappers. Not all requests
+-     * contain payload data.
+-     *
+-     * @return The optional raw stream containing the payload data to include
+-     *         for this request, with all progress stream wrappers removed.
+-     */
+-    InputStream getContentUnwrapped();
+-
+-    /**
+-     * Returns the read limit info about the original request.
+-     */
+-    ReadLimitInfo getReadLimitInfo();
+-
+-    /**
+-     * Returns the original, user facing request object which this internal
+-     * request object is representing.
+-     *
+-     * @return an instance of request as an Object.
+-     */
+-    Object getOriginalRequestObject();
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/AmazonWebServiceRequestAdapter.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/AmazonWebServiceRequestAdapter.java
+--- ./src/main/java/com/amazonaws/internal/AmazonWebServiceRequestAdapter.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/AmazonWebServiceRequestAdapter.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,92 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-import com.amazonaws.AmazonWebServiceRequest;
+-import com.amazonaws.RequestClientOptions;
+-import com.amazonaws.RequestConfig;
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.auth.AWSCredentialsProvider;
+-import com.amazonaws.event.ProgressListener;
+-import com.amazonaws.metrics.RequestMetricCollector;
+-
+-import java.util.Collections;
+-import java.util.List;
+-import java.util.Map;
+-
+-/**
+- * Adapts the configuration present in {@link AmazonWebServiceRequest} to {@link RequestConfig}.
+- */
+-@SdkInternalApi
+-public final class AmazonWebServiceRequestAdapter extends RequestConfig {
+-
+-    private final AmazonWebServiceRequest request;
+-
+-    public AmazonWebServiceRequestAdapter(AmazonWebServiceRequest request) {
+-        this.request = request;
+-    }
+-
+-    @Override
+-    public ProgressListener getProgressListener() {
+-        return request.getGeneralProgressListener();
+-    }
+-
+-    @Override
+-    public RequestMetricCollector getRequestMetricsCollector() {
+-        return request.getRequestMetricCollector();
+-    }
+-
+-    @Override
+-    public AWSCredentialsProvider getCredentialsProvider() {
+-        return request.getRequestCredentialsProvider();
+-    }
+-
+-    @Override
+-    public Map getCustomRequestHeaders() {
+-        return (request.getCustomRequestHeaders() == null) ? Collections.emptyMap() :
+-                request.getCustomRequestHeaders();
+-    }
+-
+-    @Override
+-    public Map> getCustomQueryParameters() {
+-        return (request.getCustomQueryParameters() == null) ? Collections.>emptyMap() :
+-                request.getCustomQueryParameters();
+-    }
+-
+-    @Override
+-    public Integer getRequestTimeout() {
+-        return request.getSdkRequestTimeout();
+-    }
+-
+-    @Override
+-    public Integer getClientExecutionTimeout() {
+-        return request.getSdkClientExecutionTimeout();
+-    }
+-
+-    @Override
+-    public RequestClientOptions getRequestClientOptions() {
+-        return request.getRequestClientOptions();
+-    }
+-
+-    @Override
+-    public String getRequestType() {
+-        return request.getClass().getSimpleName();
+-    }
+-
+-    @Override
+-    public Object getOriginalRequest() {
+-        return request;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/auth/DefaultSignerProvider.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/auth/DefaultSignerProvider.java
+--- ./src/main/java/com/amazonaws/internal/auth/DefaultSignerProvider.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/auth/DefaultSignerProvider.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,70 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights
+- * Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal.auth;
+-
+-import com.amazonaws.AmazonWebServiceClient;
+-import com.amazonaws.AmazonWebServiceRequest;
+-import com.amazonaws.Request;
+-import com.amazonaws.auth.SignerFactory;
+-import com.amazonaws.auth.SignerTypeAware;
+-import com.amazonaws.auth.Signer;
+-import com.amazonaws.auth.SignerParams;
+-import com.amazonaws.util.AwsHostNameUtils;
+-
+-import java.net.URI;
+-
+-public class DefaultSignerProvider extends SignerProvider {
+-
+-    private final AmazonWebServiceClient awsClient;
+-    private final Signer defaultSigner;
+-
+-    public DefaultSignerProvider(final AmazonWebServiceClient awsClient,
+-                                 final Signer defaultSigner) {
+-        this.awsClient = awsClient;
+-        this.defaultSigner = defaultSigner;
+-    }
+-
+-    @Override
+-    public Signer getSigner(SignerProviderContext context) {
+-    Request request = context.getRequest();
+-        if (request == null || shouldUseDefaultSigner(request.getOriginalRequest())) {
+-            if (context.isRedirect()) {
+-                return awsClient.getSignerByURI(context.getUri());
+-            }
+-            return defaultSigner;
+-        }
+-
+-        SignerTypeAware signerTypeAware = (SignerTypeAware) request.getOriginalRequest();
+-        SignerParams params = new SignerParams(awsClient.getServiceName(), getSigningRegionForRequestURI(request.getEndpoint()));
+-        return SignerFactory.createSigner(signerTypeAware.getSignerType(), params);
+-    }
+-
+-    private boolean shouldUseDefaultSigner(AmazonWebServiceRequest originalRequest) {
+-        return !(originalRequest instanceof SignerTypeAware) || isSignerOverridden();
+-    }
+-
+-    private boolean isSignerOverridden() {
+-        return awsClient.getSignerOverride() != null;
+-    }
+-
+-    private String getSigningRegionForRequestURI(URI uri) {
+-        String regionName = awsClient.getSignerRegionOverride();
+-        if (regionName == null) {
+-            regionName = AwsHostNameUtils.parseRegion(uri.getHost(), awsClient.getEndpointPrefix());
+-        }
+-        return regionName;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/auth/NoOpSignerProvider.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/auth/NoOpSignerProvider.java
+--- ./src/main/java/com/amazonaws/internal/auth/NoOpSignerProvider.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/auth/NoOpSignerProvider.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,36 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights
+- * Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal.auth;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.auth.NoOpSigner;
+-import com.amazonaws.auth.Signer;
+-
+-@SdkInternalApi
+-public class NoOpSignerProvider extends SignerProvider {
+-
+-    private Signer signer;
+-
+-    public NoOpSignerProvider() {
+-        this.signer = new NoOpSigner();
+-    }
+-
+-    @Override
+-    public Signer getSigner(SignerProviderContext context) {
+-        return signer;
+-    }
+-
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/internal/auth/SignerProviderContext.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/auth/SignerProviderContext.java
+--- ./src/main/java/com/amazonaws/internal/auth/SignerProviderContext.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/auth/SignerProviderContext.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,92 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights
+- * Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal.auth;
+-
+-import com.amazonaws.Request;
+-import com.amazonaws.RequestConfig;
+-
+-import java.net.URI;
+-
+-public class SignerProviderContext {
+-
+-    private final URI uri;
+-    private final boolean isRedirect;
+-    private final Request request;
+-    private final RequestConfig requestConfig;
+-
+-    private SignerProviderContext(Builder builder) {
+-        this.uri = builder.uri;
+-        this.isRedirect = builder.isRedirect;
+-        this.request = builder.request;
+-        this.requestConfig = builder.requestConfig;
+-    }
+-
+-    public URI getUri() {
+-        return uri;
+-    }
+-
+-    public boolean isRedirect() {
+-        return isRedirect;
+-    }
+-
+-    public Request getRequest() {
+-        return request;
+-    }
+-
+-    public RequestConfig getRequestConfig() {
+-        return requestConfig;
+-    }
+-
+-    public static Builder builder() {
+-        return new Builder();
+-    }
+-
+-    public static class Builder {
+-
+-        private Builder() {
+-        }
+-
+-        private URI uri;
+-        private boolean isRedirect;
+-        private Request request;
+-        private RequestConfig requestConfig;
+-
+-        public Builder withUri(final URI uri) {
+-            this.uri = uri;
+-            return this;
+-        }
+-
+-        public Builder withIsRedirect(final boolean withIsRedirect) {
+-            this.isRedirect = withIsRedirect;
+-            return this;
+-        }
+-
+-        public Builder withRequest(final Request request) {
+-            this.request = request;
+-            return this;
+-        }
+-
+-        public Builder withRequestConfig(final RequestConfig requestConfig) {
+-            this.requestConfig = requestConfig;
+-            return this;
+-        }
+-
+-        public SignerProviderContext build() {
+-            return new SignerProviderContext(this);
+-        }
+-
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/auth/SignerProvider.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/auth/SignerProvider.java
+--- ./src/main/java/com/amazonaws/internal/auth/SignerProvider.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/auth/SignerProvider.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,23 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights
+- * Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal.auth;
+-
+-import com.amazonaws.auth.Signer;
+-
+-public abstract class SignerProvider {
+-
+-    public abstract Signer getSigner(SignerProviderContext context);
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/internal/BoundedLinkedHashMap.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/BoundedLinkedHashMap.java
+--- ./src/main/java/com/amazonaws/internal/BoundedLinkedHashMap.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/BoundedLinkedHashMap.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,48 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-import java.util.LinkedHashMap;
+-import java.util.Map;
+-
+-/**
+- * A bounded linked hash map that would remove the eldest entry when the map
+- * size exceeds a configurable maximum.
+- */
+-final class BoundedLinkedHashMap extends LinkedHashMap {
+-    private static final long serialVersionUID = 1L;
+-    private final int maxSize;
+-    BoundedLinkedHashMap(int maxSize) {
+-        this.maxSize = maxSize;
+-    }
+-
+-    /**
+-     * {@inheritDoc}
+-     * 
+-     * Returns true if the size of this map exceeds the maximum.
+-     */
+-    @Override
+-    protected boolean removeEldestEntry(Map.Entry eldest) {
+-        return size() > maxSize;
+-    }
+-
+-    /**
+-     * Returns the maximum size of this map beyond which the eldest entry
+-     * will get removed.
+-     */
+-    int getMaxSize() {
+-        return maxSize;
+-    }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/internal/config/awssdk_config_default.json /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/config/awssdk_config_default.json
+--- ./src/main/java/com/amazonaws/internal/config/awssdk_config_default.json	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/config/awssdk_config_default.json	1969-12-31 16:00:00.000000000 -0800
+@@ -1,156 +0,0 @@
+-{ // AWS Java SDK internal configuration
+-  "defaultSigner" : {
+-    "signerType" : "AWS4SignerType"
+-  },
+-  // "regionSigners" configuration takes precedence over
+-  // the "serviceSigners" configuration,
+-  // but not the "serviceRegionSigners" configuration
+-  "serviceSigners" : [ {
+-    "key" : "importexport",
+-    "config" : {
+-      "signerType" : "QueryStringSignerType"
+-    }
+-  }, {
+-    "key" : "s3",
+-    "config" : {
+-      "signerType" : "AWSS3V4SignerType"
+-    }
+-  } ],
+-  "regionSigners" : [ ],
+-  "serviceRegionSigners" : [ {
+-    "key" : "sdb/us-east-1",
+-    "config" : {
+-      "signerType" : "QueryStringSignerType"
+-    }
+-  }, {
+-    "key" : "sdb/us-west-1",
+-    "config" : {
+-      "signerType" : "QueryStringSignerType"
+-    }
+-  }, {
+-    "key" : "sdb/us-west-2",
+-    "config" : {
+-      "signerType" : "QueryStringSignerType"
+-    }
+-  }, {
+-    "key" : "sdb/eu-west-1",
+-    "config" : {
+-      "signerType" : "QueryStringSignerType"
+-    }
+-  }, {
+-    "key" : "sdb/ap-southeast-1",
+-    "config" : {
+-      "signerType" : "QueryStringSignerType"
+-    }
+-  }, {
+-    "key" : "sdb/ap-southeast-2",
+-    "config" : {
+-      "signerType" : "QueryStringSignerType"
+-    }
+-  }, {
+-    "key" : "sdb/ap-northeast-1",
+-    "config" : {
+-      "signerType" : "QueryStringSignerType"
+-    }
+-  }, {
+-    "key" : "sdb/sa-east-1",
+-    "config" : {
+-      "signerType" : "QueryStringSignerType"
+-    }
+-  }, {
+-    "key" : "sdb/us-gov-west-1",
+-    "config" : {
+-      "signerType" : "QueryStringSignerType"
+-    }
+-  } ],
+-  // AWS http client internal configuration.
+-  // Currently, only those http client with class name not following the usual
+-  // convention of (Amazon|AWS).*(JavaClient|Client)
+-  // needs to be explicitly configured.  Otherwise, the service name of an
+-  // http client not explicitly configured will be derived automatically from
+-  // the class name by removing the prefix and suffix as necessary.
+-  "httpClients" : [ {
+-    "key" : "AmazonSimpleWorkflowClient",
+-    "config" : {
+-      "serviceName" : "swf"
+-    }
+-  }, {
+-    "key" : "AmazonCloudWatchClient",
+-    "config" : {
+-      "serviceName" : "monitoring"
+-    }
+-  }, {
+-    "key" : "DataPipelineClient",
+-    "config" : {
+-      "serviceName" : "datapipeline"
+-    }
+-  }, {
+-    "key" : "AmazonIdentityManagementClient",
+-    "config" : {
+-      "serviceName" : "iam"
+-    }
+-  }, {
+-    "key" : "AmazonSimpleDBClient",
+-    "config" : {
+-      "serviceName" : "sdb"
+-    }
+-  }, {
+-    "key" : "AmazonSimpleEmailServiceClient",
+-    "config" : {
+-      "serviceName" : "email",
+-      "regionMetadataServiceName": "email" // for region metadata
+-    }
+-  }, {
+-    "key" : "AWSSecurityTokenServiceClient",
+-    "config" : {
+-      "serviceName" : "sts"
+-    }
+-  }, {
+-    "key" : "AmazonCognitoIdentityClient",
+-    "config" : {
+-      "serviceName" : "cognito-identity"
+-    }
+-  }, {
+-    "key" : "AmazonCognitoSyncClient",
+-    "config" : {
+-      "serviceName" : "cognito-sync"
+-    }
+-  }, {
+-    "key": "AmazonCloudSearchDomainClient",
+-    "config" : {
+-      "serviceName": "cloudsearch"
+-    }
+-  }, {
+-    "key": "AWSSimpleSystemsManagementClient",
+-    "config" : {
+-      "serviceName": "ssm"
+-    }
+-  }, {
+-    "key": "AWSDirectoryServiceClient",
+-    "config" : {
+-      "serviceName": "ds"
+-    }
+-  }, {
+-    "key": "AmazonDynamoDBStreamsClient",
+-    "config" : {
+-      "serviceName": "dynamodb", // for v4 signing
+-      "regionMetadataServiceName": "streams.dynamodb" // for region metadata
+-    }
+-  }, {
+-    "key" : "AWSIotClient",
+-    "config" : {
+-      "regionMetadataServiceName": "iot" // for region metadata
+-    }
+-  } ],
+-  "hostRegexToRegionMappings" : [ {
+-    "hostNameRegex" : "(.+\\.)?s3\\.amazonaws\\.com",
+-    "regionName"    : "us-east-1"
+-  }, {
+-    "hostNameRegex" : "(.+\\.)?s3-external-1\\.amazonaws\\.com",
+-    "regionName"    : "us-east-1"
+-  }, {
+-    "hostNameRegex" : "(.+\\.)?s3-fips-us-gov-west-1\\.amazonaws\\.com",
+-    "regionName"    : "us-gov-west-1"
+-  } ],
+-  "userAgentTemplate": "aws-sdk-{platform}/{version} {os.name}/{os.version} {java.vm.name}/{java.vm.version} java/{java.version}{language.and.region}{additional.languages}"
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/config/Builder.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/config/Builder.java
+--- ./src/main/java/com/amazonaws/internal/config/Builder.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/config/Builder.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,19 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- * 
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- * 
+- *  http://aws.amazon.com/apache2.0
+- * 
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal.config;
+-
+-public interface Builder {
+-    public T build();
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/config/HostRegexToRegionMapping.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/config/HostRegexToRegionMapping.java
+--- ./src/main/java/com/amazonaws/internal/config/HostRegexToRegionMapping.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/config/HostRegexToRegionMapping.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,58 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal.config;
+-
+-import java.util.regex.Pattern;
+-import java.util.regex.PatternSyntaxException;
+-
+-import com.amazonaws.annotation.Immutable;
+-
+-@Immutable
+-public class HostRegexToRegionMapping {
+-
+-    private final String regionName;
+-    private final Pattern hostNameRegexPattern;
+-
+-    public HostRegexToRegionMapping(
+-            String hostNameRegex, String regionName) {
+-        if (hostNameRegex == null || hostNameRegex.isEmpty()) {
+-            throw new IllegalArgumentException(
+-                    "Invalid HostRegexToRegionMapping configuration: " +
+-                    "hostNameRegex must be non-empty");
+-        }
+-        try {
+-            this.hostNameRegexPattern = Pattern.compile(hostNameRegex);
+-        } catch (PatternSyntaxException e) {
+-            throw new IllegalArgumentException(
+-                    "Invalid HostRegexToRegionMapping configuration: " +
+-                    "hostNameRegex is not a valid regex",
+-                    e);
+-        }
+-        if (regionName == null || regionName.isEmpty()) {
+-            throw new IllegalArgumentException(
+-                    "Invalid HostRegexToRegionMapping configuration: " +
+-                    "regionName must be non-empty");
+-        }
+-        this.regionName = regionName;
+-    }
+-
+-    public String getRegionName() {
+-        return regionName;
+-    }
+-    
+-    public boolean isHostNameMatching(String hostname) {
+-    	return hostNameRegexPattern.matcher(hostname).matches();
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/config/HostRegexToRegionMappingJsonHelper.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/config/HostRegexToRegionMappingJsonHelper.java
+--- ./src/main/java/com/amazonaws/internal/config/HostRegexToRegionMappingJsonHelper.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/config/HostRegexToRegionMappingJsonHelper.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,49 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal.config;
+-
+-/**
+- * Builder class for HostRegexToRegionMapping which exposes its property
+- * setters.
+- */
+-public class HostRegexToRegionMappingJsonHelper implements Builder {
+-
+-    private String hostNameRegex;
+-    private String regionName;
+-
+-    public HostRegexToRegionMappingJsonHelper() {}
+-
+-    public String getHostNameRegex() {
+-        return hostNameRegex;
+-    }
+-
+-    public void setHostNameRegex(String hostNameRegex) {
+-        this.hostNameRegex = hostNameRegex;
+-    }
+-
+-    public String getRegionName() {
+-        return regionName;
+-    }
+-
+-    public void setRegionName(String regionName) {
+-        this.regionName = regionName;
+-    }
+-
+-    @Override
+-    public HostRegexToRegionMapping build() {
+-        return new HostRegexToRegionMapping(hostNameRegex, regionName);
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/config/HttpClientConfig.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/config/HttpClientConfig.java
+--- ./src/main/java/com/amazonaws/internal/config/HttpClientConfig.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/config/HttpClientConfig.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,62 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal.config;
+-
+-import com.amazonaws.annotation.Immutable;
+-
+-/**
+- * AWS HttpClient configuration.
+- */
+-@Immutable
+-public class HttpClientConfig {
+-    // This class is not strictly necessary for the existing use cases,
+-    // but allows future expansion of additional configurations to be made
+-    // with ease.
+-    private final String serviceName;
+-    private final String regionMetadataServiceName;
+-
+-    /**
+-     * @param serviceName
+-     *            The service name used for request signing. It's also used as
+-     *            the service identifier when looking up the region metadata if
+-     *            regionMetadataServiceName is not set.
+-     * @param regionMetadataServiceName
+-     *            Override value for the service name identifier when looking up
+-     *            the region metadata. This config is normally needed in
+-     *            scenarios when a common sigv4 service name is shared by
+-     *            multiple services that have different region metadata (for
+-     *            example, AmazonDynamoDBClient and AmazonDynamoDBStreamsClient
+-     *            share the same service name 'dynamodb' but not the same
+-     *            endpoint prefix).
+-     */
+-    HttpClientConfig(String serviceName, String regionMetadataServiceName) {
+-        this.serviceName = serviceName;
+-        this.regionMetadataServiceName = regionMetadataServiceName;
+-    }
+-
+-    @Override public String toString() {
+-        return "serviceName: " + serviceName + ", regionMetadataServiceName: "
+-                + regionMetadataServiceName;
+-    }
+-
+-    public String getServiceName() {
+-        return serviceName;
+-    }
+-
+-    public String getRegionMetadataServiceName() {
+-        return regionMetadataServiceName;
+-    }
+-
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/internal/config/HttpClientConfigJsonHelper.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/config/HttpClientConfigJsonHelper.java
+--- ./src/main/java/com/amazonaws/internal/config/HttpClientConfigJsonHelper.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/config/HttpClientConfigJsonHelper.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,60 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal.config;
+-
+-/**
+- * An internal class used to build {@link HttpClientConfig} after this class per se has been
+- * unmarshalled from JSON. This class allows us to make use of Jackson without the need to write any
+- * special parser or json marshaller/unmarshaller.
+- */
+-public class HttpClientConfigJsonHelper implements Builder {
+-
+-    private String serviceName;
+-    private String regionMetadataServiceName;
+-
+-    public HttpClientConfigJsonHelper() {
+-    }
+-
+-    public HttpClientConfigJsonHelper(String serviceName, String regionMetadataServiceName) {
+-        this.serviceName = serviceName;
+-        this.regionMetadataServiceName = regionMetadataServiceName;
+-    }
+-
+-    @Override
+-    public String toString() {
+-        return "serviceName: " + serviceName + ", regionMetadataServiceName: " + regionMetadataServiceName;
+-    }
+-
+-    public String getServiceName() {
+-        return serviceName;
+-    }
+-
+-    public void setServiceName(String serviceName) {
+-        this.serviceName = serviceName;
+-    }
+-
+-    public String getRegionMetadataServiceName() {
+-        return regionMetadataServiceName;
+-    }
+-
+-    public void setRegionMetadataServiceName(String regionMetadataServiceName) {
+-        this.regionMetadataServiceName = regionMetadataServiceName;
+-    }
+-
+-    @Override
+-    public HttpClientConfig build() {
+-        return new HttpClientConfig(serviceName, regionMetadataServiceName);
+-    }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/internal/config/InternalConfig.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/config/InternalConfig.java
+--- ./src/main/java/com/amazonaws/internal/config/InternalConfig.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/config/InternalConfig.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,320 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal.config;
+-
+-import java.io.IOException;
+-import java.net.URL;
+-import java.util.Collections;
+-import java.util.HashMap;
+-import java.util.LinkedList;
+-import java.util.List;
+-import java.util.Map;
+-
+-import com.amazonaws.annotation.Immutable;
+-import com.amazonaws.log.InternalLogApi;
+-import com.amazonaws.log.InternalLogFactory;
+-import com.amazonaws.util.ClassLoaderHelper;
+-import com.fasterxml.jackson.core.JsonParseException;
+-import com.fasterxml.jackson.core.JsonParser;
+-import com.fasterxml.jackson.databind.DeserializationFeature;
+-import com.fasterxml.jackson.databind.JsonMappingException;
+-import com.fasterxml.jackson.databind.MapperFeature;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-
+-/**
+- * Internal configuration for the AWS Java SDK.
+- */
+-@Immutable
+-public class InternalConfig {
+-
+-    //@formatter:off
+-    private static final ObjectMapper MAPPER = new ObjectMapper()
+-            .disable(MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS)
+-            .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+-            .configure(JsonParser.Feature.ALLOW_COMMENTS, true);
+-    //@formatter:on
+-
+-    private static final InternalLogApi log = InternalLogFactory.getLog(InternalConfig.class);
+-
+-    static final String DEFAULT_CONFIG_RESOURCE_RELATIVE_PATH = "awssdk_config_default.json";
+-    static final String DEFAULT_CONFIG_RESOURCE_ABSOLUTE_PATH = "/com/amazonaws/internal/config/"
+-            + DEFAULT_CONFIG_RESOURCE_RELATIVE_PATH;
+-
+-    static final String CONFIG_OVERRIDE_RESOURCE = "awssdk_config_override.json";
+-    private static final String SERVICE_REGION_DELIMITOR = "/";
+-
+-    private final SignerConfig defaultSignerConfig;
+-    private final Map serviceRegionSigners;
+-    private final Map regionSigners;
+-    private final Map serviceSigners;
+-    private final Map httpClients;
+-
+-    private final List hostRegexToRegionMappings;
+-
+-    private final String userAgentTemplate;
+-
+-    /**
+-     * @param defaults
+-     *            default configuration
+-     * @param override
+-     *            override configuration
+-     */
+-    InternalConfig(InternalConfigJsonHelper defaults, InternalConfigJsonHelper override) {
+-        SignerConfigJsonHelper scb = defaults.getDefaultSigner();
+-        this.defaultSignerConfig = scb == null ? null : scb.build();
+-
+-        regionSigners = mergeSignerMap(defaults.getRegionSigners(), override.getRegionSigners(), "region");
+-        serviceSigners = mergeSignerMap(defaults.getServiceSigners(), override.getServiceSigners(), "service");
+-        serviceRegionSigners = mergeSignerMap(defaults.getServiceRegionSigners(), override.getServiceRegionSigners(),
+-                "service" + SERVICE_REGION_DELIMITOR + "region");
+-        httpClients = merge(defaults.getHttpClients(), override.getHttpClients());
+-
+-        hostRegexToRegionMappings = append(override.getHostRegexToRegionMappings(),
+-                defaults.getHostRegexToRegionMappings());
+-
+-        if (override.getUserAgentTemplate() != null) {
+-            userAgentTemplate = override.getUserAgentTemplate();
+-        } else {
+-            userAgentTemplate = defaults.getUserAgentTemplate();
+-        }
+-    }
+-
+-    /**
+-     * Returns an immutable map by merging the override signer configuration into the default signer
+-     * configuration for the given theme.
+-     *
+-     * @param defaults
+-     *            default signer configuration
+-     * @param override
+-     *            signer configurations overrides
+-     * @param theme
+-     *            used for message logging. eg region, service, region+service
+-     */
+-    private Map mergeSignerMap(JsonIndex[] defaults,
+-                                                     JsonIndex[] overrides,
+-                                                     String theme) {
+-        Map map = buildSignerMap(defaults, theme);
+-        Map mapOverride = buildSignerMap(overrides, theme);
+-        map.putAll(mapOverride);
+-        return Collections.unmodifiableMap(map);
+-    }
+-
+-    private , T> Map merge(JsonIndex[] defaults, JsonIndex[] overrides) {
+-        Map map = buildMap(defaults);
+-        Map mapOverride = buildMap(overrides);
+-        map.putAll(mapOverride);
+-        return Collections.unmodifiableMap(map);
+-    }
+-
+-    private , T> Map buildMap(JsonIndex[] signerIndexes) {
+-        Map map = new HashMap();
+-        if (signerIndexes != null) {
+-            for (JsonIndex index : signerIndexes) {
+-                String region = index.getKey();
+-                T prev = map.put(region, index.newReadOnlyConfig());
+-                if (prev != null) {
+-                    log.warn("Duplicate definition of signer for " + index.getKey());
+-                }
+-            }
+-        }
+-        return map;
+-    }
+-
+-    private , T> List append(C[] defaults, C[] overrides) {
+-        List list = new LinkedList();
+-        if (defaults != null) {
+-            for (C builder : defaults) {
+-                list.add(builder.build());
+-            }
+-        }
+-        if (overrides != null) {
+-            for (C builder : overrides) {
+-                list.add(builder.build());
+-            }
+-        }
+-        return list;
+-    }
+-
+-    /**
+-     * Builds and returns a signer configuration map.
+-     *
+-     * @param signerIndexes
+-     *            signer configuration entries loaded from JSON
+-     * @param theme
+-     *            used for message logging. eg region, service, region+service
+-     */
+-    private Map buildSignerMap(JsonIndex[] signerIndexes,
+-                                                     String theme) {
+-        Map map = new HashMap();
+-        if (signerIndexes != null) {
+-            for (JsonIndex index : signerIndexes) {
+-                String region = index.getKey();
+-                SignerConfig prev = map.put(region, index.newReadOnlyConfig());
+-                if (prev != null) {
+-                    log.warn("Duplicate definition of signer for " + theme + " " + index.getKey());
+-                }
+-            }
+-        }
+-        return map;
+-    }
+-
+-    /**
+-     * Returns the signer configuration for the specified service, not specific to any region.
+-     */
+-    public SignerConfig getSignerConfig(String serviceName) {
+-        return getSignerConfig(serviceName, null);
+-    }
+-
+-    /**
+-     * Returns the http client configuration for the http client name.
+-     */
+-    public HttpClientConfig getHttpClientConfig(String httpClientName) {
+-        return httpClients.get(httpClientName);
+-    }
+-
+-    /**
+-     * Returns the signer configuration for the specified service name and an optional region name.
+-     * 
+-     * @param serviceName
+-     *            must not be null
+-     * @param regionName
+-     *            similar to the region name in Regions; can be null.
+-     * @return the signer
+-     */
+-    public SignerConfig getSignerConfig(String serviceName, String regionName) {
+-        if (serviceName == null)
+-            throw new IllegalArgumentException();
+-        SignerConfig signerConfig = null;
+-        if (regionName != null) {
+-            // Service+Region signer config has the highest precedence
+-            String key = serviceName + SERVICE_REGION_DELIMITOR + regionName;
+-            signerConfig = serviceRegionSigners.get(key);
+-            if (signerConfig != null) {
+-                return signerConfig;
+-            }
+-            // Region signer config has the 2nd highest precedence
+-            signerConfig = regionSigners.get(regionName);
+-            if (signerConfig != null) {
+-                return signerConfig;
+-            }
+-        }
+-        // Service signer config has the 3rd highest precedence
+-        signerConfig = serviceSigners.get(serviceName);
+-        // Fall back to the default
+-        return signerConfig == null ? defaultSignerConfig : signerConfig;
+-    }
+-
+-    /**
+-     * @return all the host-name-regex to region-name mappings.
+-     */
+-    public List getHostRegexToRegionMappings() {
+-        return Collections.unmodifiableList(hostRegexToRegionMappings);
+-    }
+-
+-    /**
+-     * @return the custom user agent template, if configured
+-     */
+-    public String getUserAgentTemplate() {
+-        return userAgentTemplate;
+-    }
+-
+-    static InternalConfigJsonHelper loadfrom(URL url) throws JsonParseException, JsonMappingException, IOException {
+-        if (url == null)
+-            throw new IllegalArgumentException();
+-        InternalConfigJsonHelper target = MAPPER.readValue(url, InternalConfigJsonHelper.class);
+-        return target;
+-    }
+-
+-    /**
+-     * Loads and returns the AWS Java SDK internal configuration from the classpath.
+-     */
+-    static InternalConfig load() throws JsonParseException, JsonMappingException, IOException {
+-        // First try loading via the class by using a relative path
+-        URL url = ClassLoaderHelper.getResource(DEFAULT_CONFIG_RESOURCE_RELATIVE_PATH, true, InternalConfig.class); // classesFirst=true
+-        if (url == null) { // Then try with the absolute path
+-            url = ClassLoaderHelper.getResource(DEFAULT_CONFIG_RESOURCE_ABSOLUTE_PATH, InternalConfig.class);
+-        }
+-        InternalConfigJsonHelper config = loadfrom(url);
+-        InternalConfigJsonHelper configOverride;
+-        URL overrideUrl = ClassLoaderHelper.getResource("/" + CONFIG_OVERRIDE_RESOURCE, InternalConfig.class);
+-        if (overrideUrl == null) { // Try without a leading "/"
+-            overrideUrl = ClassLoaderHelper.getResource(CONFIG_OVERRIDE_RESOURCE, InternalConfig.class);
+-        }
+-        if (overrideUrl == null) {
+-            log.debug("Configuration override " + CONFIG_OVERRIDE_RESOURCE + " not found.");
+-            configOverride = new InternalConfigJsonHelper();
+-        } else {
+-            configOverride = loadfrom(overrideUrl);
+-        }
+-        InternalConfig merged = new InternalConfig(config, configOverride);
+-        merged.setDefaultConfigFileLocation(url);
+-        merged.setOverrideConfigFileLocation(overrideUrl);
+-        return merged;
+-    }
+-
+-    /*
+-     * For debugging purposes
+-     */
+-
+-    private URL defaultConfigFileLocation;
+-    private URL overrideConfigFileLocation;
+-
+-    public URL getDefaultConfigFileLocation() {
+-        return defaultConfigFileLocation;
+-    }
+-
+-    public URL getOverrideConfigFileLocation() {
+-        return overrideConfigFileLocation;
+-    }
+-
+-    void setDefaultConfigFileLocation(URL url) {
+-        this.defaultConfigFileLocation = url;
+-    }
+-
+-    void setOverrideConfigFileLocation(URL url) {
+-        this.overrideConfigFileLocation = url;
+-    }
+-
+-    void dump() {
+-        StringBuilder sb = new StringBuilder().append("defaultSignerConfig: ").append(defaultSignerConfig).append("\n")
+-                .append("serviceRegionSigners: ").append(serviceRegionSigners).append("\n").append("regionSigners: ")
+-                .append(regionSigners).append("\n").append("serviceSigners: ").append(serviceSigners).append("\n")
+-                .append("userAgentTemplate: ").append(userAgentTemplate);
+-        log.debug(sb.toString());
+-    }
+-
+-    public static class Factory {
+-        private static final InternalConfig SINGELTON;
+-
+-        static {
+-            InternalConfig config = null;
+-            try {
+-                config = InternalConfig.load();
+-            } catch (RuntimeException ex) {
+-                throw ex;
+-            } catch (Exception ex) {
+-                throw new IllegalStateException("Fatal: Failed to load the internal config for AWS Java SDK", ex);
+-            }
+-            SINGELTON = config;
+-        }
+-
+-        /**
+-         * Returns a non-null and immutable instance of the AWS SDK internal configuration.
+-         */
+-        public static InternalConfig getInternalConfig() {
+-            return SINGELTON;
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/config/InternalConfigJsonHelper.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/config/InternalConfigJsonHelper.java
+--- ./src/main/java/com/amazonaws/internal/config/InternalConfigJsonHelper.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/config/InternalConfigJsonHelper.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,96 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal.config;
+-
+-/**
+- * An internal class used to help build {@link InternalConfig} after this class per se has been
+- * unmarshalled from JSON. This class allows us to make use of Jackson without the need to write any
+- * special parser or json marshaller/unmarshaller.
+- */
+-public class InternalConfigJsonHelper {
+-
+-    private SignerConfigJsonHelper defaultSigner;
+-
+-    // Implementation note:
+-    // Internally use list instead of Map for ease of implementation to
+-    // leverage on Jackson which supports recursive list of arbitrary pojos
+-    // without the use of custom [un]marshallers. This is not the case for
+-    // Map, which Jackson only supports the use of strings
+-    // without custom [un]marshaller.
+-    private JsonIndex[] serviceSigners;
+-    private JsonIndex[] regionSigners;
+-    private JsonIndex[] serviceRegionSigners;
+-    private JsonIndex[] httpClients;
+-
+-    private HostRegexToRegionMappingJsonHelper[] hostRegexToRegionMappings;
+-
+-    private String userAgentTemplate;
+-
+-    public SignerConfigJsonHelper getDefaultSigner() {
+-        return defaultSigner;
+-    }
+-
+-    public void setDefaultSigner(SignerConfigJsonHelper defaultSigner) {
+-        this.defaultSigner = defaultSigner;
+-    }
+-
+-    public JsonIndex[] getServiceSigners() {
+-        return serviceSigners;
+-    }
+-
+-    public void setServiceSigners(JsonIndex... serviceSigners) {
+-        this.serviceSigners = serviceSigners;
+-    }
+-
+-    public JsonIndex[] getRegionSigners() {
+-        return regionSigners;
+-    }
+-
+-    public void setRegionSigners(JsonIndex... regionSigners) {
+-        this.regionSigners = regionSigners;
+-    }
+-
+-    public JsonIndex[] getServiceRegionSigners() {
+-        return serviceRegionSigners;
+-    }
+-
+-    public void setServiceRegionSigners(JsonIndex... serviceRegionSigners) {
+-        this.serviceRegionSigners = serviceRegionSigners;
+-    }
+-
+-    public JsonIndex[] getHttpClients() {
+-        return httpClients;
+-    }
+-
+-    public void setHttpClients(JsonIndex... httpClients) {
+-        this.httpClients = httpClients;
+-    }
+-
+-    public HostRegexToRegionMappingJsonHelper[] getHostRegexToRegionMappings() {
+-        return hostRegexToRegionMappings;
+-    }
+-
+-    public void setHostRegexToRegionMappings(HostRegexToRegionMappingJsonHelper[] hostRegexToRegionMappings) {
+-        this.hostRegexToRegionMappings = hostRegexToRegionMappings;
+-    }
+-
+-    public String getUserAgentTemplate() {
+-        return userAgentTemplate;
+-    }
+-
+-    public void setUserAgentTemplate(String userAgentTemplate) {
+-        this.userAgentTemplate = userAgentTemplate;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/config/JsonIndex.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/config/JsonIndex.java
+--- ./src/main/java/com/amazonaws/internal/config/JsonIndex.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/config/JsonIndex.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,56 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- * 
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- * 
+- *  http://aws.amazon.com/apache2.0
+- * 
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal.config;
+-
+-/**
+- * An internal class used to represent a key-object pair for JSON persistence purposes.
+- */
+-public final class JsonIndex, T> {
+-
+-    private String key;
+-    private C config;
+-
+-    public JsonIndex() {
+-    }
+-
+-    public JsonIndex(String key) {
+-        this.key = key;
+-    }
+-
+-    public JsonIndex(String key, C config) {
+-        this.key = key;
+-        this.config = config;
+-    }
+-
+-    public String getKey() {
+-        return key;
+-    }
+-
+-    public void setKey(String key) {
+-        this.key = key;
+-    }
+-
+-    public C getConfig() {
+-        return config;
+-    }
+-
+-    public void setConfig(C config) {
+-        this.config = config;
+-    }
+-
+-    public T newReadOnlyConfig() {
+-        return config.build();
+-    }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/internal/config/SignerConfig.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/config/SignerConfig.java
+--- ./src/main/java/com/amazonaws/internal/config/SignerConfig.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/config/SignerConfig.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,43 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- * 
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- * 
+- *  http://aws.amazon.com/apache2.0
+- * 
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal.config;
+-
+-import com.amazonaws.annotation.Immutable;
+-
+-/**
+- * Signer configuration.
+- */
+-@Immutable
+-public class SignerConfig {
+-
+-    private final String signerType;
+-
+-    SignerConfig(String signerType) {
+-        this.signerType = signerType;
+-    }
+-
+-    SignerConfig(SignerConfig from) {
+-        this.signerType = from.getSignerType();
+-    }
+-
+-    public String getSignerType() {
+-        return signerType;
+-    }
+-
+-    @Override
+-    public String toString() {
+-        return signerType;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/config/SignerConfigJsonHelper.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/config/SignerConfigJsonHelper.java
+--- ./src/main/java/com/amazonaws/internal/config/SignerConfigJsonHelper.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/config/SignerConfigJsonHelper.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,45 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- * 
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- * 
+- *  http://aws.amazon.com/apache2.0
+- * 
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal.config;
+-
+-/**
+- * An internal class used to build {@link SignerConfig} after this class per se has been
+- * unmarshalled from JSON. This class allows us to make use of Jackson without the need to write any
+- * special parser or json marshaller/unmarshaller.
+- */
+-public class SignerConfigJsonHelper implements Builder {
+-
+-    private String signerType;
+-
+-    public SignerConfigJsonHelper() {
+-    }
+-
+-    public SignerConfigJsonHelper(String signerType) {
+-        this.signerType = signerType;
+-    }
+-
+-    public String getSignerType() {
+-        return signerType;
+-    }
+-
+-    public void setSignerType(String signerType) {
+-        this.signerType = signerType;
+-    }
+-
+-    @Override
+-    public SignerConfig build() {
+-        return new SignerConfig(signerType);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/CRC32MismatchException.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/CRC32MismatchException.java
+--- ./src/main/java/com/amazonaws/internal/CRC32MismatchException.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/CRC32MismatchException.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,49 +0,0 @@
+-/*
+- * Copyright 2012-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-import java.io.IOException;
+-
+-/**
+- * The exception will be thrown when client side CRC32 checksum does not match the one from server side.
+- */
+-public class CRC32MismatchException extends IOException {
+-
+-    private static final long serialVersionUID = 1L;
+-
+-    /**
+-     * Creates a new CRC32MismatchException with the specified message, and root
+-     * cause.
+-     *
+-     * @param message
+-     *            An error message describing why this exception was thrown.
+-     * @param t
+-     *            The underlying cause of this exception.
+-     */
+-    public CRC32MismatchException(String message, Throwable t) {
+-        super(message, t);
+-    }
+-
+-    /**
+-     * Creates a new CRC32MismatchException with the specified message.
+-     *
+-     * @param message
+-     *            An error message describing why this exception was thrown.
+-     */
+-    public CRC32MismatchException(String message) {
+-        super(message);
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/CustomBackoffStrategy.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/CustomBackoffStrategy.java
+--- ./src/main/java/com/amazonaws/internal/CustomBackoffStrategy.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/CustomBackoffStrategy.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,19 +0,0 @@
+-/*
+- * Copyright 2012-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-public abstract class CustomBackoffStrategy {
+-    public abstract int getBackoffPeriod(int retryAttempts);
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/internal/DateTimeJsonSerializer.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/DateTimeJsonSerializer.java
+--- ./src/main/java/com/amazonaws/internal/DateTimeJsonSerializer.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/DateTimeJsonSerializer.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,40 +0,0 @@
+-/*
+- * Copyright (c) 2016. Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.internal;
+-
+-import java.io.IOException;
+-
+-import org.joda.time.DateTime;
+-
+-import com.amazonaws.util.DateUtils;
+-import com.fasterxml.jackson.core.JsonGenerator;
+-import com.fasterxml.jackson.databind.JsonSerializer;
+-import com.fasterxml.jackson.databind.SerializerProvider;
+-
+-/**
+- * A Jackson serializer for Joda {@code DateTime}s.
+- */
+-public final class DateTimeJsonSerializer extends JsonSerializer {
+-
+-    @Override
+-    public void serialize(
+-            DateTime value,
+-            JsonGenerator jgen,
+-            SerializerProvider provider) throws IOException {
+-
+-        jgen.writeString(DateUtils.formatISO8601Date(value));
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/DefaultServiceEndpointBuilder.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/DefaultServiceEndpointBuilder.java
+--- ./src/main/java/com/amazonaws/internal/DefaultServiceEndpointBuilder.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/DefaultServiceEndpointBuilder.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,83 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-import com.amazonaws.annotation.NotThreadSafe;
+-import com.amazonaws.regions.Region;
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-
+-import java.net.URI;
+-import java.net.URISyntaxException;
+-
+-/**
+- * Uses region metdata to construct an endpoint for a specific service
+- */
+-@NotThreadSafe
+-public class DefaultServiceEndpointBuilder extends ServiceEndpointBuilder {
+-
+-    private static final Log log = LogFactory.getLog(DefaultServiceEndpointBuilder.class);
+-
+-    private final String serviceName;
+-    private final String protocol;
+-    private Region region;
+-
+-    public DefaultServiceEndpointBuilder(String serviceName, String protocol) {
+-        this.serviceName = serviceName;
+-        this.protocol = protocol;
+-    }
+-
+-    public DefaultServiceEndpointBuilder withRegion(Region region) {
+-        if (region == null) {
+-            throw new IllegalArgumentException("Region cannot be null");
+-        }
+-        this.region = region;
+-        return this;
+-    }
+-
+-    @Override
+-    public URI getServiceEndpoint() {
+-        String serviceEndpoint = region.getServiceEndpoint(serviceName);
+-
+-        if (serviceEndpoint == null) {
+-
+-            serviceEndpoint = String.format("%s.%s.%s", serviceName, region.getName(), region.getDomain());
+-
+-            log.info("{" + serviceName + ", " + region.getName() + "} was not "
+-                    + "found in region metadata, trying to construct an "
+-                    + "endpoint using the standard pattern for this region: '" + serviceEndpoint + "'.");
+-
+-        }
+-        return toURI(stripProtocol(serviceEndpoint));
+-    }
+-
+-    private String stripProtocol(final String endpoint) {
+-        final int protocolIndex = endpoint.indexOf("://");
+-        return protocolIndex >= 0 ? endpoint.substring(protocolIndex + "://".length()) : endpoint;
+-    }
+-
+-    private URI toURI(String endpoint) throws IllegalArgumentException {
+-        try {
+-            return new URI(String.format("%s://%s", protocol, endpoint));
+-        } catch (URISyntaxException e) {
+-            throw new IllegalArgumentException(e);
+-        }
+-    }
+-
+-    @Override
+-    public Region getRegion() {
+-        return region;
+-    }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/internal/DelegateInputStream.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/DelegateInputStream.java
+--- ./src/main/java/com/amazonaws/internal/DelegateInputStream.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/DelegateInputStream.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,66 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.internal;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-/**
+- * InputStream delegate class. Subclasses could extend this class, so that
+- * they need only override methods they are interested in enhancing.
+- *
+- */
+-public class DelegateInputStream extends InputStream {
+-
+-    protected final InputStream in;
+-
+-    public DelegateInputStream(InputStream in) {
+-        this.in = in;
+-    }
+-
+-    public int read() throws IOException {
+-        return in.read();
+-    }
+-
+-    public int read(byte b[]) throws IOException {
+-        return in.read(b);
+-    }
+-    public int read(byte b[], int off, int len) throws IOException {
+-        return in.read(b, off, len);
+-    }
+-
+-    public long skip(long n) throws IOException {
+-        return in.skip(n);
+-    }
+-    public int available() throws IOException {
+-        return in.available();
+-    }
+-    public void close() throws IOException {
+-        in.close();
+-    }
+-
+-    public void mark(int readlimit) {
+-        in.mark(readlimit);
+-    }
+-    public void reset() throws IOException {
+-        in.reset();
+-    }
+-
+-    public boolean markSupported() {
+-        return in.markSupported();
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/DelegateSocket.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/DelegateSocket.java
+--- ./src/main/java/com/amazonaws/internal/DelegateSocket.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/DelegateSocket.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,245 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.internal;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.io.OutputStream;
+-import java.net.InetAddress;
+-import java.net.Socket;
+-import java.net.SocketAddress;
+-import java.net.SocketException;
+-import java.nio.channels.SocketChannel;
+-
+-/**
+- * Socket delegate class. Subclasses could extend this class, so that
+- * they only need to override methods they are interested in enhancing.
+- *
+- */
+-public class DelegateSocket extends Socket {
+-
+-    protected final Socket sock;
+-
+-    public DelegateSocket(Socket sock) {
+-        this.sock = sock;
+-    }
+-
+-    @Override
+-    public void connect(SocketAddress endpoint) throws IOException {
+-        sock.connect(endpoint);
+-    }
+-
+-    @Override
+-    public void connect(SocketAddress endpoint, int timeout) throws IOException {
+-        sock.connect(endpoint, timeout);
+-    }
+-
+-    @Override
+-    public void bind(SocketAddress bindpoint) throws IOException {
+-        sock.bind(bindpoint);
+-    }
+-
+-    @Override
+-    public InetAddress getInetAddress() {
+-        return sock.getInetAddress();
+-    }
+-
+-    @Override
+-    public InetAddress getLocalAddress() {
+-        return sock.getLocalAddress();
+-    }
+-
+-    @Override
+-    public int getPort() {
+-        return sock.getPort();
+-    }
+-
+-    @Override
+-    public int getLocalPort() {
+-        return sock.getLocalPort();
+-    }
+-
+-    @Override
+-    public SocketAddress getRemoteSocketAddress() {
+-        return sock.getRemoteSocketAddress();
+-    }
+-
+-    @Override
+-    public SocketAddress getLocalSocketAddress() {
+-        return sock.getLocalSocketAddress();
+-    }
+-
+-    @Override
+-    public SocketChannel getChannel() {
+-        return sock.getChannel();
+-    }
+-
+-    @Override
+-    public InputStream getInputStream() throws IOException {
+-        return sock.getInputStream();
+-    }
+-
+-    @Override
+-    public OutputStream getOutputStream() throws IOException {
+-        return sock.getOutputStream();
+-    }
+-
+-    @Override
+-    public void setTcpNoDelay(boolean on) throws SocketException {
+-        sock.setTcpNoDelay(on);
+-    }
+-
+-    @Override
+-    public boolean getTcpNoDelay() throws SocketException {
+-        return sock.getTcpNoDelay();
+-    }
+-
+-    @Override
+-    public void setSoLinger(boolean on, int linger) throws SocketException {
+-        sock.setSoLinger(on, linger);
+-    }
+-
+-    @Override
+-    public int getSoLinger() throws SocketException {
+-        return sock.getSoLinger();
+-    }
+-
+-    @Override
+-    public void sendUrgentData(int data) throws IOException {
+-        sock.sendUrgentData(data);
+-    }
+-
+-    @Override
+-    public void setOOBInline(boolean on) throws SocketException {
+-        sock.setOOBInline(on);
+-    }
+-
+-    @Override
+-    public boolean getOOBInline() throws SocketException {
+-        return sock.getOOBInline();
+-    }
+-
+-    @Override
+-    public void setSoTimeout(int timeout) throws SocketException {
+-        sock.setSoTimeout(timeout);
+-    }
+-
+-    @Override
+-    public int getSoTimeout() throws SocketException {
+-        return sock.getSoTimeout();
+-    }
+-
+-    @Override
+-    public void setSendBufferSize(int size) throws SocketException {
+-        sock.setSendBufferSize(size);
+-    }
+-
+-    @Override
+-    public int getSendBufferSize() throws SocketException {
+-        return sock.getSendBufferSize();
+-    }
+-
+-    @Override
+-    public void setReceiveBufferSize(int size) throws SocketException {
+-        sock.setReceiveBufferSize(size);
+-    }
+-
+-    @Override
+-    public int getReceiveBufferSize() throws SocketException {
+-        return sock.getReceiveBufferSize();
+-    }
+-
+-    @Override
+-    public void setKeepAlive(boolean on) throws SocketException {
+-        sock.setKeepAlive(on);
+-    }
+-
+-    @Override
+-    public boolean getKeepAlive() throws SocketException {
+-        return sock.getKeepAlive();
+-    }
+-
+-    @Override
+-    public void setTrafficClass(int tc) throws SocketException {
+-        sock.setTrafficClass(tc);
+-    }
+-
+-    @Override
+-    public int getTrafficClass() throws SocketException {
+-        return sock.getTrafficClass();
+-    }
+-
+-    @Override
+-    public void setReuseAddress(boolean on) throws SocketException {
+-        sock.setReuseAddress(on);
+-    }
+-
+-    @Override
+-    public boolean getReuseAddress() throws SocketException {
+-        return sock.getReuseAddress();
+-    }
+-
+-    @Override
+-    public void close() throws IOException {
+-        sock.close();
+-    }
+-
+-    @Override
+-    public void shutdownInput() throws IOException {
+-        sock.shutdownInput();
+-    }
+-
+-    @Override
+-    public void shutdownOutput() throws IOException {
+-        sock.shutdownOutput();
+-    }
+-
+-    @Override
+-    public String toString() {
+-        return sock.toString();
+-    }
+-
+-    @Override
+-    public boolean isConnected() {
+-        return sock.isConnected();
+-    }
+-
+-    @Override
+-    public boolean isBound() {
+-        return sock.isBound();
+-    }
+-
+-    @Override
+-    public boolean isClosed() {
+-        return sock.isClosed();
+-    }
+-
+-    @Override
+-    public boolean isInputShutdown() {
+-        return sock.isInputShutdown();
+-    }
+-
+-    @Override
+-    public boolean isOutputShutdown() {
+-        return sock.isOutputShutdown();
+-    }
+-
+-    @Override
+-    public void setPerformancePreferences(int connectionTime, int latency,
+-            int bandwidth) {
+-        sock.setPerformancePreferences(connectionTime, latency, bandwidth);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/DelegateSSLSocket.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/DelegateSSLSocket.java
+--- ./src/main/java/com/amazonaws/internal/DelegateSSLSocket.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/DelegateSSLSocket.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,333 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.io.OutputStream;
+-import java.net.InetAddress;
+-import java.net.SocketAddress;
+-import java.net.SocketException;
+-import java.nio.channels.SocketChannel;
+-
+-import javax.net.ssl.HandshakeCompletedListener;
+-import javax.net.ssl.SSLSession;
+-import javax.net.ssl.SSLSocket;
+-
+-public class DelegateSSLSocket extends SSLSocket {
+-    protected final SSLSocket sock;
+-
+-    public DelegateSSLSocket(SSLSocket sock) {
+-        this.sock = sock;
+-    }
+-
+-    @Override
+-    public void connect(SocketAddress endpoint) throws IOException {
+-        sock.connect(endpoint);
+-    }
+-
+-    @Override
+-    public void connect(SocketAddress endpoint, int timeout) throws IOException {
+-        sock.connect(endpoint, timeout);
+-    }
+-
+-    @Override
+-    public void bind(SocketAddress bindpoint) throws IOException {
+-        sock.bind(bindpoint);
+-    }
+-
+-    @Override
+-    public InetAddress getInetAddress() {
+-        return sock.getInetAddress();
+-    }
+-
+-    @Override
+-    public InetAddress getLocalAddress() {
+-        return sock.getLocalAddress();
+-    }
+-
+-    @Override
+-    public int getPort() {
+-        return sock.getPort();
+-    }
+-
+-    @Override
+-    public int getLocalPort() {
+-        return sock.getLocalPort();
+-    }
+-
+-    @Override
+-    public SocketAddress getRemoteSocketAddress() {
+-        return sock.getRemoteSocketAddress();
+-    }
+-
+-    @Override
+-    public SocketAddress getLocalSocketAddress() {
+-        return sock.getLocalSocketAddress();
+-    }
+-
+-    @Override
+-    public SocketChannel getChannel() {
+-        return sock.getChannel();
+-    }
+-
+-    @Override
+-    public InputStream getInputStream() throws IOException {
+-        return sock.getInputStream();
+-    }
+-
+-    @Override
+-    public OutputStream getOutputStream() throws IOException {
+-        return sock.getOutputStream();
+-    }
+-
+-    @Override
+-    public void setTcpNoDelay(boolean on) throws SocketException {
+-        sock.setTcpNoDelay(on);
+-    }
+-
+-    @Override
+-    public boolean getTcpNoDelay() throws SocketException {
+-        return sock.getTcpNoDelay();
+-    }
+-
+-    @Override
+-    public void setSoLinger(boolean on, int linger) throws SocketException {
+-        sock.setSoLinger(on, linger);
+-    }
+-
+-    @Override
+-    public int getSoLinger() throws SocketException {
+-        return sock.getSoLinger();
+-    }
+-
+-    @Override
+-    public void sendUrgentData(int data) throws IOException {
+-        sock.sendUrgentData(data);
+-    }
+-
+-    @Override
+-    public void setOOBInline(boolean on) throws SocketException {
+-        sock.setOOBInline(on);
+-    }
+-
+-    @Override
+-    public boolean getOOBInline() throws SocketException {
+-        return sock.getOOBInline();
+-    }
+-
+-    @Override
+-    public void setSoTimeout(int timeout) throws SocketException {
+-        sock.setSoTimeout(timeout);
+-    }
+-
+-    @Override
+-    public int getSoTimeout() throws SocketException {
+-        return sock.getSoTimeout();
+-    }
+-
+-    @Override
+-    public void setSendBufferSize(int size) throws SocketException {
+-        sock.setSendBufferSize(size);
+-    }
+-
+-    @Override
+-    public int getSendBufferSize() throws SocketException {
+-        return sock.getSendBufferSize();
+-    }
+-
+-    @Override
+-    public void setReceiveBufferSize(int size) throws SocketException {
+-        sock.setReceiveBufferSize(size);
+-    }
+-
+-    @Override
+-    public int getReceiveBufferSize() throws SocketException {
+-        return sock.getReceiveBufferSize();
+-    }
+-
+-    @Override
+-    public void setKeepAlive(boolean on) throws SocketException {
+-        sock.setKeepAlive(on);
+-    }
+-
+-    @Override
+-    public boolean getKeepAlive() throws SocketException {
+-        return sock.getKeepAlive();
+-    }
+-
+-    @Override
+-    public void setTrafficClass(int tc) throws SocketException {
+-        sock.setTrafficClass(tc);
+-    }
+-
+-    @Override
+-    public int getTrafficClass() throws SocketException {
+-        return sock.getTrafficClass();
+-    }
+-
+-    @Override
+-    public void setReuseAddress(boolean on) throws SocketException {
+-        sock.setReuseAddress(on);
+-    }
+-
+-    @Override
+-    public boolean getReuseAddress() throws SocketException {
+-        return sock.getReuseAddress();
+-    }
+-
+-    @Override
+-    public void close() throws IOException {
+-        sock.close();
+-    }
+-
+-    @Override
+-    public void shutdownInput() throws IOException {
+-        sock.shutdownInput();
+-    }
+-
+-    @Override
+-    public void shutdownOutput() throws IOException {
+-        sock.shutdownOutput();
+-    }
+-
+-    @Override
+-    public String toString() {
+-        return sock.toString();
+-    }
+-
+-    @Override
+-    public boolean isConnected() {
+-        return sock.isConnected();
+-    }
+-
+-    @Override
+-    public boolean isBound() {
+-        return sock.isBound();
+-    }
+-
+-    @Override
+-    public boolean isClosed() {
+-        return sock.isClosed();
+-    }
+-
+-    @Override
+-    public boolean isInputShutdown() {
+-        return sock.isInputShutdown();
+-    }
+-
+-    @Override
+-    public boolean isOutputShutdown() {
+-        return sock.isOutputShutdown();
+-    }
+-
+-    @Override
+-    public void setPerformancePreferences(int connectionTime, int latency,
+-            int bandwidth) {
+-        sock.setPerformancePreferences(connectionTime, latency, bandwidth);
+-    }
+-
+-    @Override
+-    public String[] getSupportedCipherSuites() {
+-        return sock.getSupportedCipherSuites();
+-    }
+-
+-    @Override
+-    public String[] getEnabledCipherSuites() {
+-        return sock.getEnabledCipherSuites();
+-    }
+-
+-    @Override
+-    public void setEnabledCipherSuites(String[] suites) {
+-        sock.setEnabledCipherSuites(suites);
+-    }
+-
+-    @Override
+-    public String[] getSupportedProtocols() {
+-        return sock.getSupportedProtocols();
+-    }
+-
+-    @Override
+-    public String[] getEnabledProtocols() {
+-        return sock.getEnabledProtocols();
+-    }
+-
+-    @Override
+-    public void setEnabledProtocols(String[] protocols) {
+-        sock.setEnabledProtocols(protocols);
+-    }
+-
+-    @Override
+-    public SSLSession getSession() {
+-        return sock.getSession();
+-    }
+-
+-    @Override
+-    public void addHandshakeCompletedListener(
+-            HandshakeCompletedListener listener) {
+-        sock.addHandshakeCompletedListener(listener);
+-    }
+-
+-    @Override
+-    public void removeHandshakeCompletedListener(
+-            HandshakeCompletedListener listener) {
+-        sock.removeHandshakeCompletedListener(listener);
+-    }
+-
+-    @Override
+-    public void startHandshake() throws IOException {
+-        sock.startHandshake();
+-    }
+-
+-    @Override
+-    public void setUseClientMode(boolean mode) {
+-        sock.setUseClientMode(mode);
+-    }
+-
+-    @Override
+-    public boolean getUseClientMode() {
+-        return sock.getUseClientMode();
+-    }
+-
+-    @Override
+-    public void setNeedClientAuth(boolean need) {
+-        sock.setNeedClientAuth(need);
+-    }
+-
+-    @Override
+-    public boolean getNeedClientAuth() {
+-        return sock.getNeedClientAuth();
+-    }
+-
+-    @Override
+-    public void setWantClientAuth(boolean want) {
+-        sock.setWantClientAuth(want);
+-    }
+-
+-    @Override
+-    public boolean getWantClientAuth() {
+-        return sock.getWantClientAuth();
+-    }
+-
+-    @Override
+-    public void setEnableSessionCreation(boolean flag) {
+-        sock.setEnableSessionCreation(flag);
+-    }
+-
+-    @Override
+-    public boolean getEnableSessionCreation() {
+-        return sock.getEnableSessionCreation();
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/DynamoDBBackoffStrategy.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/DynamoDBBackoffStrategy.java
+--- ./src/main/java/com/amazonaws/internal/DynamoDBBackoffStrategy.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/DynamoDBBackoffStrategy.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,36 +0,0 @@
+-/*
+- * Copyright 2012-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-public class DynamoDBBackoffStrategy extends CustomBackoffStrategy {
+-	public int getBackoffPeriod(int retries) {
+-
+-		if (retries <= 0) {
+-			return 0;
+-		} else {
+-
+-			int delay = 50 * (int) Math.pow(2, retries - 1);
+-
+-			if (delay < 0) {
+-				delay = Integer.MAX_VALUE;
+-			}
+-
+-			return delay;
+-		}
+-
+-	}
+-
+-    public static final CustomBackoffStrategy DEFAULT = new DynamoDBBackoffStrategy();
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/internal/EC2MetadataClient.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/EC2MetadataClient.java
+--- ./src/main/java/com/amazonaws/internal/EC2MetadataClient.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/EC2MetadataClient.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,154 +0,0 @@
+-/*
+- * Copyright 2012-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-import static com.amazonaws.SDKGlobalConfiguration.EC2_METADATA_SERVICE_OVERRIDE_SYSTEM_PROPERTY;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.net.HttpURLConnection;
+-import java.net.URL;
+-
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.util.EC2MetadataUtils;
+-
+-/**
+- * Simple client for accessing the Amazon EC2 Instance Metadata Service.
+- *
+- * @deprecated Refer {@link EC2MetadataUtils}
+- */
+-@Deprecated
+-public class EC2MetadataClient {
+-
+-    /** Default endpoint for the Amazon EC2 Instance Metadata Service. */
+-    private static final String EC2_METADATA_SERVICE_URL = "http://169.254.169.254";
+-
+-    /** Default resource path for credentials in the Amazon EC2 Instance Metadata Service. */
+-    public static final String SECURITY_CREDENTIALS_RESOURCE = "/latest/meta-data/iam/security-credentials/";
+-
+-    private static final Log log = LogFactory.getLog(EC2MetadataClient.class);
+-
+-    /**
+-     * Connects to the Amazon EC2 Instance Metadata Service to retrieve the
+-     * default credential information (if any).
+-     *
+-     * @return The response from the Amazon EC2 Instance Metadata Service, or
+-     *         null if no credential information was available.
+-     *
+-     * @throws IOException
+-     *             If any problems are encountered while connecting to the
+-     *             Amazon EC2 Instance Metadata Service.
+-     */
+-    public String getDefaultCredentials() throws IOException {
+-        String securityCredentialsList = readResource(SECURITY_CREDENTIALS_RESOURCE);
+-
+-        securityCredentialsList = securityCredentialsList.trim();
+-        String[] securityCredentials = securityCredentialsList.split("\n");
+-        if (securityCredentials.length == 0) return null;
+-
+-        String securityCredentialsName = securityCredentials[0];
+-
+-        return readResource(SECURITY_CREDENTIALS_RESOURCE + securityCredentialsName);
+-    }
+-
+-    /**
+-     * Connects to the metadata service to read the specified resource and
+-     * returns the text contents.
+-     *
+-     * @param resourcePath
+-     *            The resource
+-     *
+-     * @return The text payload returned from the Amazon EC2 Instance Metadata
+-     *         service for the specified resource path.
+-     *
+-     * @throws IOException
+-     *             If any problems were encountered while connecting to metadata
+-     *             service for the requested resource path.
+-     * @throws SdkClientException
+-     *             If the requested metadata service is not found.
+-     */
+-    public String readResource(String resourcePath) throws IOException, SdkClientException {
+-        URL url = getEc2MetadataServiceUrlForResource(resourcePath);
+-        log.debug("Connecting to EC2 instance metadata service at URL: " + url.toString());
+-
+-        HttpURLConnection connection = (HttpURLConnection)url.openConnection();
+-        connection.setConnectTimeout(1000 * 2);
+-        connection.setReadTimeout(1000 * 5);
+-        connection.setRequestMethod("GET");
+-        connection.setDoOutput(true);
+-        connection.connect();
+-
+-        return readResponse(connection);
+-    }
+-
+-
+-    /**
+-     * Reads a response from the Amazon EC2 Instance Metadata Service and
+-     * returns the content as a string.
+-     *
+-     * @param connection
+-     *            The connection to the Amazon EC2 Instance Metadata Service.
+-     *
+-     * @return The content contained in the response from the Amazon EC2
+-     *         Instance Metadata Service.
+-     *
+-     * @throws IOException
+-     *             If any problems ocurred while reading the response.
+-     */
+-    private String readResponse(HttpURLConnection connection) throws IOException {
+-        if (connection.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND)
+-            throw new SdkClientException("The requested metadata is not found at " + connection.getURL());
+-
+-        InputStream inputStream = connection.getInputStream();
+-
+-        try {
+-            StringBuilder buffer = new StringBuilder();
+-            while (true) {
+-                int c = inputStream.read();
+-                if (c == -1) break;
+-                buffer.append((char)c);
+-            }
+-
+-            return buffer.toString();
+-        } finally {
+-            inputStream.close();
+-        }
+-    }
+-
+-    /**
+-     * Constructs a URL to the EC2 metadata service for the specified
+-     * resource path.
+-     *
+-     * @param resourcePath
+-     *            The resource portion of the URL.
+-     *
+-     * @return A URL to the EC2 metadata service for the specified resource
+-     *         path.
+-     *
+-     * @throws IOException
+-     *             If a valid URL could not be constructed.
+-     */
+-    private URL getEc2MetadataServiceUrlForResource(String resourcePath) throws IOException {
+-        String endpoint = EC2_METADATA_SERVICE_URL;
+-        if (System.getProperty(EC2_METADATA_SERVICE_OVERRIDE_SYSTEM_PROPERTY) != null) {
+-            endpoint = System.getProperty(EC2_METADATA_SERVICE_OVERRIDE_SYSTEM_PROPERTY);
+-        }
+-
+-        return new URL(endpoint + resourcePath);
+-    }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/internal/FIFOCache.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/FIFOCache.java
+--- ./src/main/java/com/amazonaws/internal/FIFOCache.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/FIFOCache.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,100 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-import java.util.concurrent.locks.ReentrantReadWriteLock;
+-import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
+-import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
+-
+-import com.amazonaws.annotation.ThreadSafe;
+-
+-/**
+- * A bounded cache that has a FIFO eviction policy when the cache is full.
+- *
+- * @param 
+- *            value type
+- */
+-@ThreadSafe
+-public final class FIFOCache {
+-    private final BoundedLinkedHashMap map;
+-    private final ReadLock rlock;
+-    private final WriteLock wlock;
+-
+-    /**
+-     * @param maxSize
+-     *            the maximum number of entries of the cache
+-     */
+-    public FIFOCache(final int maxSize) {
+-        if (maxSize < 1) {
+-            throw new IllegalArgumentException("maxSize " + maxSize
+-                    + " must be at least 1");
+-        }
+-        map = new BoundedLinkedHashMap(maxSize);
+-        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
+-        rlock = lock.readLock();
+-        wlock = lock.writeLock();
+-    }
+-
+-    /**
+-     * Adds an entry to the cache, evicting the earliest entry if necessary.
+-     */
+-    public T add(String key, T value) {
+-        wlock.lock();
+-        try {
+-            return map.put(key, value);
+-        } finally {
+-            wlock.unlock();
+-        }
+-    }
+-
+-    /** Returns the value of the given key; or null of no such entry exists. */
+-    public T get(String key) {
+-        rlock.lock();
+-        try {
+-            return map.get(key);
+-        } finally {
+-            rlock.unlock();
+-        }
+-    }
+-
+-    /**
+-     * Returns the current size of the cache.
+-     */
+-    public int size() {
+-        rlock.lock();
+-        try {
+-            return map.size();
+-        } finally {
+-            rlock.unlock();
+-        }
+-    }
+-
+-    /**
+-     * Returns the maximum size of the cache.
+-     */
+-    public int getMaxSize() {
+-        return map.getMaxSize();
+-    }
+-
+-    @Override
+-    public String toString() {
+-        rlock.lock();
+-        try {
+-            return map.toString();
+-        } finally {
+-            rlock.unlock();
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/http/CompositeErrorCodeParser.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/http/CompositeErrorCodeParser.java
+--- ./src/main/java/com/amazonaws/internal/http/CompositeErrorCodeParser.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/http/CompositeErrorCodeParser.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,46 +0,0 @@
+-/*
+- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- * 
+- * Licensed under the Apache License, Version 2.0 (the "License"). You may not
+- * use this file except in compliance with the License. A copy of the License is
+- * located at
+- * 
+- * http://aws.amazon.com/apache2.0
+- * 
+- * or in the "license" file accompanying this file. This file is distributed on
+- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal.http;
+-
+-import java.util.Arrays;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.http.HttpResponse;
+-import com.amazonaws.protocol.json.JsonContent;
+-
+-@SdkInternalApi
+-public class CompositeErrorCodeParser implements ErrorCodeParser {
+-    private final Iterable parsers;
+-
+-    public CompositeErrorCodeParser(Iterable parsers) {
+-        this.parsers = parsers;
+-    }
+-
+-    public CompositeErrorCodeParser(ErrorCodeParser... parsers) {
+-        this.parsers = Arrays.asList(parsers);
+-    }
+-
+-    @Override
+-    public String parseErrorCode(HttpResponse response, JsonContent jsonContent) {
+-        for (ErrorCodeParser parser : parsers) {
+-            String errorCode = parser.parseErrorCode(response, jsonContent);
+-            if (errorCode != null) {
+-                return errorCode;
+-            }
+-        }
+-
+-        return null;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/http/ErrorCodeParser.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/http/ErrorCodeParser.java
+--- ./src/main/java/com/amazonaws/internal/http/ErrorCodeParser.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/http/ErrorCodeParser.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,24 +0,0 @@
+-/*
+- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- * 
+- * Licensed under the Apache License, Version 2.0 (the "License"). You may not
+- * use this file except in compliance with the License. A copy of the License is
+- * located at
+- * 
+- * http://aws.amazon.com/apache2.0
+- * 
+- * or in the "license" file accompanying this file. This file is distributed on
+- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal.http;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.http.HttpResponse;
+-import com.amazonaws.protocol.json.JsonContent;
+-
+-@SdkInternalApi
+-public interface ErrorCodeParser {
+-    String parseErrorCode(HttpResponse response, JsonContent jsonContent);
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/http/IonErrorCodeParser.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/http/IonErrorCodeParser.java
+--- ./src/main/java/com/amazonaws/internal/http/IonErrorCodeParser.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/http/IonErrorCodeParser.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,75 +0,0 @@
+-/*
+- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- * 
+- * Licensed under the Apache License, Version 2.0 (the "License"). You may not
+- * use this file except in compliance with the License. A copy of the License is
+- * located at
+- * 
+- * http://aws.amazon.com/apache2.0
+- * 
+- * or in the "license" file accompanying this file. This file is distributed on
+- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal.http;
+-
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.http.HttpResponse;
+-import com.amazonaws.protocol.json.JsonContent;
+-import com.amazonaws.util.IOUtils;
+-
+-import software.amazon.ion.IonReader;
+-import software.amazon.ion.IonSystem;
+-import software.amazon.ion.IonType;
+-
+-@SdkInternalApi
+-public class IonErrorCodeParser implements ErrorCodeParser {
+-    private static final Log log = LogFactory.getLog(IonErrorCodeParser.class);
+-
+-    private static final String TYPE_PREFIX = "aws-type:";
+-    private static final String X_AMZN_REQUEST_ID_HEADER = "x-amzn-RequestId";
+-
+-    private final IonSystem ionSystem;
+-
+-    public IonErrorCodeParser(IonSystem ionSystem) {
+-        this.ionSystem = ionSystem;
+-    }
+-
+-    @Override
+-    public String parseErrorCode(HttpResponse response, JsonContent jsonContents) {
+-        IonReader reader = ionSystem.newReader(jsonContents.getRawContent());
+-        try {
+-            IonType type = reader.next();
+-            if (type != IonType.STRUCT) {
+-                throw new SdkClientException(String.format("Can only get error codes from structs (saw %s), request id %s", type, getRequestId(response)));
+-            }
+-
+-            boolean errorCodeSeen = false;
+-            String errorCode = null;
+-            String[] annotations = reader.getTypeAnnotations();
+-            for (String annotation : annotations) {
+-                if (annotation.startsWith(TYPE_PREFIX)) {
+-                    if (errorCodeSeen) {
+-                        throw new SdkClientException(String.format("Multiple error code annotations found for request id %s", getRequestId(response)));
+-                    } else {
+-                        errorCodeSeen = true;
+-                        errorCode = annotation.substring(TYPE_PREFIX.length());
+-                    }
+-                }
+-            }
+-
+-            return errorCode;
+-        } finally {
+-            IOUtils.closeQuietly(reader, log);
+-        }
+-    }
+-
+-    private static String getRequestId(HttpResponse response) {
+-        return response.getHeaders().get(X_AMZN_REQUEST_ID_HEADER);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/http/JsonErrorCodeParser.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/http/JsonErrorCodeParser.java
+--- ./src/main/java/com/amazonaws/internal/http/JsonErrorCodeParser.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/http/JsonErrorCodeParser.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,87 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal.http;
+-
+-import java.util.Map;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.http.HttpResponse;
+-import com.amazonaws.protocol.json.JsonContent;
+-import com.fasterxml.jackson.databind.JsonNode;
+-
+-@SdkInternalApi
+-public class JsonErrorCodeParser implements ErrorCodeParser {
+-
+-    /**
+-     * Services using AWS JSON 1.1 protocol with HTTP binding send the error code information in the
+-     * response headers, instead of the content. Package private for tests.
+-     */
+-    static final String X_AMZN_ERROR_TYPE = "x-amzn-ErrorType";
+-
+-    private final String errorCodeFieldName;
+-
+-    public JsonErrorCodeParser() {
+-        this(null);
+-    }
+-
+-    public JsonErrorCodeParser(String errorCodeFieldName) {
+-        this.errorCodeFieldName = errorCodeFieldName == null ? "__type" : errorCodeFieldName;
+-    }
+-
+-    /**
+-     * Parse the error code from the response.
+-     *
+-     * @return Error Code of exceptional response or null if it can't be determined
+-     */
+-    public String parseErrorCode(HttpResponse response, JsonContent jsonContent) {
+-        String errorCodeFromHeader = parseErrorCodeFromHeader(response.getHeaders());
+-        if (errorCodeFromHeader != null) {
+-            return errorCodeFromHeader;
+-        } else if (jsonContent != null) {
+-            return parseErrorCodeFromContents(jsonContent.getJsonNode());
+-        } else {
+-            return null;
+-        }
+-    }
+-
+-    /**
+-     * Attempt to parse the error code from the response headers. Returns null if information is not
+-     * present in the header.
+-     */
+-    private String parseErrorCodeFromHeader(Map httpHeaders) {
+-        String headerValue = httpHeaders.get(X_AMZN_ERROR_TYPE);
+-        if (headerValue != null) {
+-            int separator = headerValue.indexOf(':');
+-            if (separator != -1) {
+-                headerValue = headerValue.substring(0, separator);
+-            }
+-        }
+-        return headerValue;
+-    }
+-
+-    /**
+-     * Attempt to parse the error code from the response content. Returns null if information is not
+-     * present in the content. Codes are expected to be in the form "typeName" or
+-     * "prefix#typeName" Examples : "AccessDeniedException", "com.amazonaws.dynamodb.v20111205#ProvisionedThroughputExceededException"
+-     */
+-    private String parseErrorCodeFromContents(JsonNode jsonContents) {
+-        if (jsonContents == null || !jsonContents.has(errorCodeFieldName)) {
+-            return null;
+-        }
+-        String code = jsonContents.findValue(errorCodeFieldName).asText();
+-        int separator = code.lastIndexOf("#");
+-        return code.substring(separator + 1);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/http/JsonErrorMessageParser.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/http/JsonErrorMessageParser.java
+--- ./src/main/java/com/amazonaws/internal/http/JsonErrorMessageParser.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/http/JsonErrorMessageParser.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,85 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal.http;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.http.HttpResponse;
+-import com.fasterxml.jackson.databind.JsonNode;
+-
+-import java.util.Arrays;
+-import java.util.LinkedList;
+-import java.util.List;
+-
+-@SdkProtectedApi
+-public class JsonErrorMessageParser {
+-
+-    private static final List DEFAULT_ERROR_MESSAGE_LOCATIONS = Arrays
+-            .asList("message", "Message", "errorMessage");
+-
+-    /**
+-     * x-amzn-error-message may be returned by RESTFUL services that do not send a response
+-     * payload (like in a HEAD request).
+-     */
+-    public static final String X_AMZN_ERROR_MESSAGE = "x-amzn-error-message";
+-
+-    /**
+-     * Standard JSON Error Message Parser that checks for JSON fields in this order: 'message',
+-     * 'Message', 'errorMessage'
+-     */
+-    public static final JsonErrorMessageParser DEFAULT_ERROR_MESSAGE_PARSER = new JsonErrorMessageParser(
+-            DEFAULT_ERROR_MESSAGE_LOCATIONS);
+-
+-    private static final HttpResponse EMPTY_HTTP_RESPONSE = new HttpResponse(null, null);
+-
+-    private final List errorMessageJsonLocations;
+-
+-    /**
+-     * @param errorMessageJsonLocations JSON field locations where the parser will attempt to
+-     *                                  extract the error message from.
+-     */
+-    public JsonErrorMessageParser(List errorMessageJsonLocations) {
+-        this.errorMessageJsonLocations = new LinkedList(errorMessageJsonLocations);
+-    }
+-
+-    /**
+-     * @deprecated By {@link #parseErrorMessage(HttpResponse, JsonNode)}
+-     */
+-    @Deprecated
+-    public String parseErrorMessage(JsonNode jsonNode) {
+-        return parseErrorMessage(EMPTY_HTTP_RESPONSE, jsonNode);
+-    }
+-
+-    /**
+-     * Parse the error message from the response.
+-     *
+-     * @return Error Code of exceptional response or null if it can't be determined
+-     */
+-    public String parseErrorMessage(HttpResponse httpResponse, JsonNode jsonNode) {
+-        // If X_AMZN_ERROR_MESSAGE is present, prefer that. Otherwise check the JSON body.
+-        final String headerMessage = httpResponse.getHeader(X_AMZN_ERROR_MESSAGE);
+-        if (headerMessage != null) {
+-            return headerMessage;
+-        }
+-        for (String field : errorMessageJsonLocations) {
+-            JsonNode value = jsonNode.get(field);
+-            if (value != null && value.isTextual()) {
+-                return value.asText();
+-            }
+-        }
+-        return null;
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/IdentityEndpointBuilder.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/IdentityEndpointBuilder.java
+--- ./src/main/java/com/amazonaws/internal/IdentityEndpointBuilder.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/IdentityEndpointBuilder.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,47 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-import java.net.URI;
+-
+-import com.amazonaws.regions.Region;
+-
+-/**
+- * More of a No-Op endpoint builder that just returns the same endpoint it was constructed with
+- */
+-public class IdentityEndpointBuilder extends ServiceEndpointBuilder {
+-
+-    private final URI endpoint;
+-
+-    public IdentityEndpointBuilder(URI endpoint) {
+-        this.endpoint = endpoint;
+-    }
+-
+-    @Override
+-    public URI getServiceEndpoint() {
+-        return endpoint;
+-    }
+-
+-    @Override
+-    public DefaultServiceEndpointBuilder withRegion(Region region) {
+-        // No-op
+-        return null;
+-    }
+-
+-    @Override
+-    public Region getRegion() {
+-        return null;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/ListWithAutoConstructFlag.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/ListWithAutoConstructFlag.java
+--- ./src/main/java/com/amazonaws/internal/ListWithAutoConstructFlag.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/ListWithAutoConstructFlag.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,54 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-import java.util.ArrayList;
+-import java.util.Collection;
+-
+-/**
+- * List with auto construct flag to indicate whether it is auto constructed by Java SDK.
+- */
+-public class ListWithAutoConstructFlag extends ArrayList {
+-
+-    private static final long serialVersionUID = 1L;
+-
+-    /**
+-     * Auto construct flag to indicate whether the list is auto constructed by Java SDK.
+-     */
+-    private boolean autoConstruct;
+-
+-    public ListWithAutoConstructFlag() {
+-        super();
+-    }
+-
+-    public ListWithAutoConstructFlag(Collection c) {
+-          super(c);
+-    }
+-
+-    public  ListWithAutoConstructFlag(int initialCapacity) {
+-        super(initialCapacity);
+-    }
+-
+-    public void setAutoConstruct(boolean autoConstruct) {
+-        this.autoConstruct = autoConstruct;
+-    }
+-
+-    /**
+-     * Return true if the list is auto constructed by Java SDK
+-     */
+-    public boolean isAutoConstruct() {
+-        return autoConstruct;
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/MetricAware.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/MetricAware.java
+--- ./src/main/java/com/amazonaws/internal/MetricAware.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/MetricAware.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,27 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-/**
+- * Used to check if any metrics gathering activity is already turned on in one
+- * of the underlying wrapped objects.
+- */
+-public interface MetricAware {
+-    /**
+-     * Returns true if this object or one of it's inner wrapped objects has
+-     * metrics gathering activity turned on; false otherwise.
+-     */
+-    public boolean isMetricActivated();
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/MetricsInputStream.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/MetricsInputStream.java
+--- ./src/main/java/com/amazonaws/internal/MetricsInputStream.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/MetricsInputStream.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,95 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.internal;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import com.amazonaws.util.AWSRequestMetrics.Field;
+-import com.amazonaws.util.AWSRequestMetrics;
+-
+-/**
+- * Record input stream read time into {@link AWSRequestMetrics} under metric type
+- * HttpSocketReadTime;
+- */
+-public class MetricsInputStream extends DelegateInputStream {
+-
+-    private AWSRequestMetrics metrics;
+-
+-    public MetricsInputStream(InputStream in) {
+-        super(in);
+-    }
+-
+-    public void setMetrics(AWSRequestMetrics metrics) {
+-        this.metrics = metrics;
+-    }
+-
+-    /**
+-     * {@inheritDoc}
+-     * Record the read time into the metrics.
+-     */
+-    @Override
+-    public int read() throws IOException {
+-        if (metrics != null) {
+-            metrics.startEvent(Field.HttpSocketReadTime);
+-        }
+-        try {
+-            return in.read();
+-        } finally {
+-            if (metrics != null) {
+-                metrics.endEvent(Field.HttpSocketReadTime);
+-            }
+-        }
+-    }
+-
+-    /**
+-     * {@inheritDoc}
+-     *
+-     * Record the read time into the metrics.
+-     */
+-    @Override
+-    public int read(byte b[]) throws IOException {
+-        if (metrics != null) {
+-            metrics.startEvent(Field.HttpSocketReadTime);
+-        }
+-        try {
+-            return in.read(b);
+-        } finally {
+-            if (metrics != null) {
+-                metrics.endEvent(Field.HttpSocketReadTime);
+-            }
+-        }
+-    }
+-
+-    /**
+-     * {@inheritDoc}
+-     *
+-     * Record the read time into the metrics.
+-     */
+-    @Override
+-    public int read(byte b[], int off, int len) throws IOException {
+-        if (metrics != null) {
+-            metrics.startEvent(Field.HttpSocketReadTime);
+-        }
+-        try {
+-            return in.read(b, off, len);
+-        } finally {
+-            if (metrics != null) {
+-                metrics.endEvent(Field.HttpSocketReadTime);
+-            }
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/ReleasableInputStream.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/ReleasableInputStream.java
+--- ./src/main/java/com/amazonaws/internal/ReleasableInputStream.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/ReleasableInputStream.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,132 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Portions copyright 2006-2009 James Murty. Please see LICENSE.txt
+- * for applicable license terms and NOTICE.txt for applicable notices.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-import com.amazonaws.annotation.NotThreadSafe;
+-
+-import java.io.FileInputStream;
+-import java.io.InputStream;
+-
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-
+-/**
+- * An input stream that can have the close operation disabled (to avoid
+- * accidentally being closed). This is necessary, for example, when an input
+- * stream needs to be marked-and-reset multiple times but only as long as the
+- * input stream has not been closed. To survive not being accidentally closed,
+- * the close method can be disabled via {@link #disableClose()}.
+- * 

+- * The creator of this input stream should therefore always call
+- * {@link #release()} in a finally block to truly release the underlying
+- * resources.
+- * 
+- * @see Releasable
+- * @see ResettableInputStream
+- */
+-@NotThreadSafe
+-public class ReleasableInputStream extends SdkFilterInputStream implements Releasable {
+-    private static final Log log = LogFactory
+-            .getLog(ReleasableInputStream.class);
+-    /**
+-     * True if the close method is disabled; false otherwise. Default is false.
+-     * In case the close method is disabled, caller would be responsible to
+-     * release resources via {@link #release()}.
+-     */
+-    private boolean closeDisabled;
+-
+-    /**
+-     * This constructor is not meant to be used directly. Use
+-     * {@link #wrap(InputStream)} instead.
+-     */
+-    protected ReleasableInputStream(InputStream is) {
+-        super(is);
+-    }
+-
+-    /**
+-     * If {@link #closeDisabled} is false, closes this input stream and releases
+-     * any system resources associated with the stream. Otherwise, this method
+-     * does nothing.
+-     */
+-    @Override
+-    public final void close() {
+-        if (!closeDisabled)
+-            doRelease();
+-    }
+-
+-    /**
+-     * Closes the underlying stream file and releases any system resources associated.
+-     */
+-    @Override
+-    public final void release() {
+-        doRelease();
+-    }
+-
+-    /**
+-     * Used to truly release the underlying resources.
+-     */
+-    private void doRelease() {
+-        try {
+-            in.close();
+-        } catch (Exception ex) {
+-            if (log.isDebugEnabled())
+-                log.debug("FYI", ex);
+-        }
+-        if (in instanceof Releasable) {
+-            // This allows any underlying stream that has the close operation
+-            // disabled to be truly released
+-            Releasable r = (Releasable)in;
+-            r.release();
+-        }
+-        abortIfNeeded();
+-    }
+-
+-    /**
+-     * Returns true if the close method has been disabled; false otherwise. Once
+-     * the close method is disabled, caller would be responsible to release
+-     * resources via {@link #release()}.
+-     */
+-    public final boolean isCloseDisabled() {
+-        return closeDisabled;
+-    }
+-
+-    /**
+-     * Used to disable the close method. Once the close method is disabled,
+-     * caller would be responsible to release resources via {@link #release()}.
+-     */
+-    public final  T disableClose() {
+-        this.closeDisabled = true;
+-        @SuppressWarnings("unchecked")
+-        T t = (T)this;
+-        return t;
+-    }
+-
+-    /**
+-     * Wraps the given input stream into a {@link ReleasableInputStream} if
+-     * necessary. Note if the given input stream is a {@link FileInputStream}, a
+-     * {@link ResettableInputStream} which is a specific subclass of
+-     * {@link ReleasableInputStream} will be returned.
+-     */
+-    public static ReleasableInputStream wrap(InputStream is) {
+-        if (is instanceof ReleasableInputStream)
+-            return (ReleasableInputStream)is;   // already wrapped
+-        if (is instanceof FileInputStream)
+-            return ResettableInputStream.newResettableInputStream((FileInputStream)is);
+-        return new ReleasableInputStream(is);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/Releasable.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/Releasable.java
+--- ./src/main/java/com/amazonaws/internal/Releasable.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/Releasable.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,56 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-import java.io.Closeable;
+-
+-/**
+- * Used for releasing a resource.
+- * 

+- * For example, the creation of a ResettableInputStream would entail
+- * physically opening a file. If the opened file is meant to be closed only (in
+- * a finally block) by the very same code block that created it, then it is
+- * necessary that the release method must not be called while the execution is
+- * made in other stack frames.
+- * 
+- * In such case, as other stack frames may inadvertently or indirectly call the
+- * close method of the stream, the creator of the stream would need to
+- * explicitly disable the accidental closing via
+- * ResettableInputStream#disableClose(), so that the release method
+- * becomes the only way to truly close the opened file.
+- */
+-public interface Releasable {
+-    /**
+-     * Releases the allocated resource. This method should not be called except
+-     * by the caller who allocated the resource at the very top of the call
+-     * stack. This allows, typically, a {@link Closeable} resource to be not
+-     * unintentionally released owing to the calling of the
+-     * {@link Closeable#close()} methods by implementation deep down in the call
+-     * stack.
+-     * 

+-     * For example, the creation of a ResettableInputStream would entail
+-     * physically opening a file. If the opened file is meant to be closed only
+-     * (in a finally block) by the very same code block that created it, then it
+-     * is necessary that the release method must not be called while the
+-     * execution is made in other stack frames.
+-     * 
+-     * In such case, as other stack frames may inadvertently or indirectly call
+-     * the close method of the stream, the creator of the stream would need to
+-     * explicitly disable the accidental closing via
+-     * ResettableInputStream#disableClose(), so that the release method
+-     * becomes the only way to truly close the opened file.
+-     */
+-    public void release();
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/ResettableInputStream.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/ResettableInputStream.java
+--- ./src/main/java/com/amazonaws/internal/ResettableInputStream.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/ResettableInputStream.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,305 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Portions copyright 2006-2009 James Murty. Please see LICENSE.txt
+- * for applicable license terms and NOTICE.txt for applicable notices.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-import java.io.File;
+-import java.io.FileInputStream;
+-import java.io.IOException;
+-import java.nio.channels.FileChannel;
+-
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.annotation.NotThreadSafe;
+-
+-/**
+- * A mark-and-resettable input stream that can be used on files or file input
+- * streams.
+- * 
+- * In particular, a {@link ResettableInputStream} allows the close operation to
+- * be disabled via {@link #disableClose()} (to avoid accidentally being closed).
+- * This is necessary when such input stream needs to be marked-and-reset
+- * multiple times but only as long as the stream has not been closed.
+- * 

+- * The creator of this input stream should therefore always call
+- * {@link #release()} in a finally block to truly release the underlying
+- * resources.
+- * 
+- * @see Releasable
+- */
+-@NotThreadSafe
+-public class ResettableInputStream extends ReleasableInputStream {
+-    private static final Log log = LogFactory
+-            .getLog(ResettableInputStream.class);
+-    private final File file; // null if the file is not known
+-    private FileInputStream fis; // never null
+-    private FileChannel fileChannel; // never null
+-    /**
+-     * Marked position of the file; default to zero.
+-     */
+-    private long markPos;
+-
+-    /**
+-     * @param file
+-     *            must not be null. Upon successful construction the the file
+-     *            will be opened with an input stream automatically marked at
+-     *            the starting position of the given file.
+-     *            

+-     *            Note the creation of a {@link ResettableInputStream} would
+-     *            entail physically opening a file. If the opened file is meant
+-     *            to be closed only (in a finally block) by the very same code
+-     *            block that created it, then it is necessary that the release
+-     *            method must not be called while the execution is made in other
+-     *            stack frames.
+-     * 
+-     *            In such case, as other stack frames may inadvertently or
+-     *            indirectly call the close method of the stream, the creator of
+-     *            the stream would need to explicitly disable the accidental
+-     *            closing via {@link ResettableInputStream#disableClose()}, so
+-     *            that the release method becomes the only way to truly close
+-     *            the opened file.
+-     */
+-    public ResettableInputStream(File file) throws IOException {
+-        this(new FileInputStream(file), file);
+-    }
+-
+-    /**
+-     * @param fis
+-     *            file input stream; must not be null. Upon successful
+-     *            construction the input stream will be automatically marked at
+-     *            the current position of the given file input stream.
+-     * 

+-     * Note the creation of a {@link ResettableInputStream} would entail
+-     * physically opening a file. If the opened file is meant to be closed only
+-     * (in a finally block) by the very same code block that created it, then it
+-     * is necessary that the release method must not be called while the
+-     * execution is made in other stack frames.
+-     * 
+-     * In such case, as other stack frames may inadvertently or indirectly call
+-     * the close method of the stream, the creator of the stream would need to
+-     * explicitly disable the accidental closing via
+-     * {@link ResettableInputStream#disableClose()}, so that the release method
+-     * becomes the only way to truly close the opened file.
+-     */
+-    public ResettableInputStream(FileInputStream fis) throws IOException {
+-        this(fis, null);
+-    }
+-
+-    /**
+-     * @param file
+-     *            can be null if not known
+-     */
+-    private ResettableInputStream(FileInputStream fis, File file) throws IOException {
+-        super(fis);
+-        this.file = file;
+-        this.fis = fis;
+-        this.fileChannel = fis.getChannel();
+-        this.markPos = fileChannel.position();
+-    }
+-
+-    @Override
+-    public final boolean markSupported() {
+-        return true;
+-    }
+-
+-    /**
+-     * Marks the current position in this input stream. A subsequent call to
+-     * the reset method repositions this stream at the last marked
+-     * position so that subsequent reads re-read the same bytes.
+-     * This method works as long as the underlying file has not been closed.
+-     * 

+-     * Note the creation of a {@link ResettableInputStream} would entail
+-     * physically opening a file. If the opened file is meant to be closed only
+-     * (in a finally block) by the very same code block that created it, then it
+-     * is necessary that the release method must not be called while the
+-     * execution is made in other stack frames.
+-     * 
+-     * In such case, as other stack frames may inadvertently or indirectly call
+-     * the close method of the stream, the creator of the stream would need to
+-     * explicitly disable the accidental closing via
+-     * {@link ResettableInputStream#disableClose()}, so that the release method
+-     * becomes the only way to truly close the opened file.
+-     * 
+-     * @param _
+-     *            ignored
+-     */
+-    @Override
+-    public void mark(int _) {
+-        abortIfNeeded();
+-        try {
+-            markPos = fileChannel.position();
+-        } catch (IOException e) {
+-            throw new SdkClientException("Failed to mark the file position", e);
+-        }
+-        if (log.isTraceEnabled())
+-            log.trace("File input stream marked at position " + markPos);
+-    }
+-
+-    /**
+-     * Repositions this stream to the position at the time the
+-     * mark method was last called on this input stream.
+-     * This method works as long as the underlying file has not been closed.
+-     * 

+-     * Note the creation of a {@link ResettableInputStream} would entail
+-     * physically opening a file. If the opened file is meant to be closed only
+-     * (in a finally block) by the very same code block that created it, then it
+-     * is necessary that the release method must not be called while the
+-     * execution is made in other stack frames.
+-     * 
+-     * In such case, as other stack frames may inadvertently or indirectly call
+-     * the close method of the stream, the creator of the stream would need to
+-     * explicitly disable the accidental closing via
+-     * {@link ResettableInputStream#disableClose()}, so that the release method
+-     * becomes the only way to truly close the opened file.
+-     */
+-    @Override
+-    public void reset() throws IOException {
+-        abortIfNeeded();
+-        fileChannel.position(markPos);
+-        if (log.isTraceEnabled())
+-            log.trace("Reset to position " + markPos);
+-    }
+-
+-    @Override
+-    public int available() throws IOException {
+-        abortIfNeeded();
+-        return fis.available();
+-    }
+-
+-    @Override
+-    public int read() throws IOException {
+-        abortIfNeeded();
+-        return fis.read();
+-    }
+-
+-    @Override
+-    public long skip(long n) throws IOException {
+-        abortIfNeeded();
+-        return fis.skip(n);
+-    }
+-
+-    @Override
+-    public int read(byte[] arg0, int arg1, int arg2) throws IOException {
+-        abortIfNeeded();
+-        return fis.read(arg0, arg1, arg2);
+-    }
+-
+-    /**
+-     * Returns the underlying file, if known; or null if not;
+-     */
+-    public File getFile() {
+-        return file;
+-    }
+-
+-    /**
+-     * Convenient factory method to construct a new resettable input stream for
+-     * the given file, converting any IOException into SdkClientException.
+-     * 

+-     * Note the creation of a {@link ResettableInputStream} would entail
+-     * physically opening a file. If the opened file is meant to be closed only
+-     * (in a finally block) by the very same code block that created it, then it
+-     * is necessary that the release method must not be called while the
+-     * execution is made in other stack frames.
+-     * 
+-     * In such case, as other stack frames may inadvertently or indirectly call
+-     * the close method of the stream, the creator of the stream would need to
+-     * explicitly disable the accidental closing via
+-     * {@link ResettableInputStream#disableClose()}, so that the release method
+-     * becomes the only way to truly close the opened file.
+-     */
+-    public static ResettableInputStream newResettableInputStream(File file) {
+-        return newResettableInputStream(file, null);
+-    }
+-
+-    /**
+-     * Convenient factory method to construct a new resettable input stream for
+-     * the given file, converting any IOException into SdkClientException
+-     * with the given error message.
+-     * 

+-     * Note the creation of a {@link ResettableInputStream} would entail
+-     * physically opening a file. If the opened file is meant to be closed only
+-     * (in a finally block) by the very same code block that created it, then it
+-     * is necessary that the release method must not be called while the
+-     * execution is made in other stack frames.
+-     * 
+-     * In such case, as other stack frames may inadvertently or indirectly call
+-     * the close method of the stream, the creator of the stream would need to
+-     * explicitly disable the accidental closing via
+-     * {@link ResettableInputStream#disableClose()}, so that the release method
+-     * becomes the only way to truly close the opened file.
+-     */
+-    public static ResettableInputStream newResettableInputStream(File file,
+-            String errmsg) {
+-        try {
+-            return new ResettableInputStream(file);
+-        } catch (IOException e) {
+-            throw errmsg == null
+-                ? new SdkClientException(e)
+-                : new SdkClientException(errmsg, e);
+-        }
+-    }
+-
+-    /**
+-     * Convenient factory method to construct a new resettable input stream for
+-     * the given file input stream, converting any IOException into
+-     * SdkClientException.
+-     * 

+-     * Note the creation of a {@link ResettableInputStream} would entail
+-     * physically opening a file. If the opened file is meant to be closed only
+-     * (in a finally block) by the very same code block that created it, then it
+-     * is necessary that the release method must not be called while the
+-     * execution is made in other stack frames.
+-     * 
+-     * In such case, as other stack frames may inadvertently or indirectly call
+-     * the close method of the stream, the creator of the stream would need to
+-     * explicitly disable the accidental closing via
+-     * {@link ResettableInputStream#disableClose()}, so that the release method
+-     * becomes the only way to truly close the opened file.
+-     */
+-    public static ResettableInputStream newResettableInputStream(
+-            FileInputStream fis) {
+-        return newResettableInputStream(fis, null);
+-    }
+-
+-    /**
+-     * Convenient factory method to construct a new resettable input stream for
+-     * the given file input stream, converting any IOException into
+-     * SdkClientException with the given error message.
+-     * 

+-     * Note the creation of a {@link ResettableInputStream} would entail
+-     * physically opening a file. If the opened file is meant to be closed only
+-     * (in a finally block) by the very same code block that created it, then it
+-     * is necessary that the release method must not be called while the
+-     * execution is made in other stack frames.
+-     * 
+-     * In such case, as other stack frames may inadvertently or indirectly call
+-     * the close method of the stream, the creator of the stream would need to
+-     * explicitly disable the accidental closing via
+-     * {@link ResettableInputStream#disableClose()}, so that the release method
+-     * becomes the only way to truly close the opened file.
+-     */
+-    public static ResettableInputStream newResettableInputStream(
+-            FileInputStream fis, String errmsg) {
+-        try {
+-            return new ResettableInputStream(fis);
+-        } catch (IOException e) {
+-            throw new SdkClientException(errmsg, e);
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/SdkBufferedInputStream.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkBufferedInputStream.java
+--- ./src/main/java/com/amazonaws/internal/SdkBufferedInputStream.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkBufferedInputStream.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,114 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-import static com.amazonaws.util.SdkRuntime.shouldAbort;
+-
+-import java.io.BufferedInputStream;
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import com.amazonaws.AbortedException;
+-
+-/**
+- * A buffered input stream that is both SDK metric aware, and can be aborted
+- * via thread interrupt.
+- */
+-public class SdkBufferedInputStream extends BufferedInputStream implements
+-        MetricAware {
+-    public SdkBufferedInputStream(InputStream in) {
+-        super(in);
+-    }
+-
+-    public SdkBufferedInputStream(InputStream in, int size) {
+-        super(in, size);
+-    }
+-
+-    @Override
+-    public boolean isMetricActivated() {
+-        if (in instanceof MetricAware) {
+-            MetricAware metricAware = (MetricAware)in;
+-            return metricAware.isMetricActivated();
+-        }
+-        return false;
+-    }
+-
+-    /**
+-     * Aborts with subclass specific abortion logic executed if needed.
+-     * Note the interrupted status of the thread is cleared by this method.
+-     * @throws AbortedException if found necessary.
+-     */
+-    protected final void abortIfNeeded() {
+-        if (shouldAbort()) {
+-            abort();    // execute subclass specific abortion logic
+-            throw new AbortedException();
+-        }
+-    }
+-
+-    /**
+-     * Can be used to provide abortion logic prior to throwing the
+-     * AbortedException. No-op by default.
+-     */
+-    protected void abort() {
+-    }
+-
+-    @Override
+-    public int read() throws IOException {
+-        abortIfNeeded();
+-        return super.read();
+-    }
+-
+-    @Override
+-    public int read(byte b[], int off, int len) throws IOException {
+-        abortIfNeeded();
+-        return super.read(b, off, len);
+-    }
+-
+-    @Override
+-    public long skip(long n) throws IOException {
+-        abortIfNeeded();
+-        return super.skip(n);
+-    }
+-
+-    @Override
+-    public int available() throws IOException {
+-        abortIfNeeded();
+-        return super.available();
+-    }
+-
+-    @Override
+-    public void close() throws IOException {
+-        super.close();
+-        abortIfNeeded();
+-    }
+-
+-    @Override
+-    public void mark(int readlimit) {
+-        abortIfNeeded();
+-        super.mark(readlimit);
+-    }
+-
+-    @Override
+-    public void reset() throws IOException {
+-        abortIfNeeded();
+-        super.reset();
+-    }
+-
+-    @Override
+-    public boolean markSupported() {
+-        abortIfNeeded();
+-        return super.markSupported();
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/SdkDigestInputStream.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkDigestInputStream.java
+--- ./src/main/java/com/amazonaws/internal/SdkDigestInputStream.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkDigestInputStream.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,93 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.security.DigestInputStream;
+-import java.security.MessageDigest;
+-
+-/**
+- * Base class for AWS Java SDK specific {@link DigestInputStream}.
+- */
+-public class SdkDigestInputStream extends DigestInputStream implements
+-        MetricAware, Releasable {
+-    private static final int SKIP_BUF_SIZE = 2*1024;
+-    public SdkDigestInputStream(InputStream stream, MessageDigest digest) {
+-        super(stream, digest);
+-    }
+-
+-    @Override
+-    public final boolean isMetricActivated() {
+-        if (in instanceof MetricAware) {
+-            MetricAware metricAware = (MetricAware)in;
+-            return metricAware.isMetricActivated();
+-        }
+-        return false;
+-    }
+-
+-    // https://github.com/aws/aws-sdk-java/issues/232
+-    /**
+-     * Skips over and discards n bytes of data from this input
+-     * stream, while taking the skipped bytes into account for digest
+-     * calculation. The skip method may, for a variety of reasons,
+-     * end up skipping over some smaller number of bytes, possibly
+-     * 0. This may result from any of a number of conditions;
+-     * reaching end of file before n bytes have been skipped is
+-     * only one possibility. The actual number of bytes skipped is returned. If
+-     * n is negative, no bytes are skipped.
+-     *
+-     * 

+-     * The skip method of this class creates a byte array and then
+-     * repeatedly reads into it until n bytes have been read or the
+-     * end of the stream has been reached. Subclasses are encouraged to provide
+-     * a more efficient implementation of this method. For instance, the
+-     * implementation may depend on the ability to seek.
+-     *
+-     * @param n
+-     *            the number of bytes to be skipped.
+-     * @return the actual number of bytes skipped.
+-     * @exception IOException
+-     *                if the stream does not support seek, or if some other I/O
+-     *                error occurs.
+-     */
+-    @Override
+-    public final long skip(final long n) throws IOException {
+-        if (n <= 0)
+-            return n;
+-        byte[] b = new byte[(int)Math.min(SKIP_BUF_SIZE, n)];
+-        long m = n; // remaining number of bytes to read
+-        while (m > 0) {
+-            int len = read(b, 0, (int)Math.min(m, b.length));
+-            if (len == -1)
+-                return n - m;
+-            m -= len;
+-        }
+-        assert (m == 0);
+-        return n;
+-    }
+-
+-    @Override
+-    public final void release() {
+-        // Don't call IOUtils.release(in, null) or else could lead to infinite loop
+-        SdkIOUtils.closeQuietly(this);
+-        if (in instanceof Releasable) {
+-            // This allows any underlying stream that has the close operation
+-            // disabled to be truly released
+-            Releasable r = (Releasable)in;
+-            r.release();
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/SdkFilterInputStream.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkFilterInputStream.java
+--- ./src/main/java/com/amazonaws/internal/SdkFilterInputStream.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkFilterInputStream.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,132 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-import static com.amazonaws.util.SdkRuntime.shouldAbort;
+-
+-import java.io.FilterInputStream;
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import com.amazonaws.AbortedException;
+-
+-/**
+- * Base class for AWS Java SDK specific {@link FilterInputStream}.
+- */
+-public class SdkFilterInputStream extends FilterInputStream implements
+-        MetricAware, Releasable {
+-    private volatile boolean aborted = false;
+-
+-    protected SdkFilterInputStream(InputStream in) {
+-        super(in);
+-    }
+-
+-    @Override
+-    public boolean isMetricActivated() {
+-        if (in instanceof MetricAware) {
+-            MetricAware metricAware = (MetricAware)in;
+-            return metricAware.isMetricActivated();
+-        }
+-        return false;
+-    }
+-
+-    /**
+-     * Aborts with subclass specific abortion logic executed if needed.
+-     * Note the interrupted status of the thread is cleared by this method.
+-     * @throws AbortedException if found necessary.
+-     */
+-    protected final void abortIfNeeded() {
+-        if (shouldAbort()) {
+-            abort();    // execute subclass specific abortion logic
+-            throw new AbortedException();
+-        }
+-    }
+-
+-    /**
+-     * Can be used to provide abortion logic prior to throwing the
+-     * AbortedException. If the wrapped {@code InputStream} is also an instance
+-     * of this class, then it will also be aborted, otherwise this is a no-op.
+-     */
+-    public void abort() {
+-        if (in instanceof SdkFilterInputStream) {
+-            ((SdkFilterInputStream) in).abort();
+-        }
+-        aborted = true;
+-    }
+-
+-    protected boolean isAborted() {
+-        return aborted;
+-    }
+-
+-    @Override
+-    public int read() throws IOException {
+-        abortIfNeeded();
+-        return in.read();
+-    }
+-
+-    @Override
+-    public int read(byte b[], int off, int len) throws IOException {
+-        abortIfNeeded();
+-        return in.read(b, off, len);
+-    }
+-
+-    @Override
+-    public long skip(long n) throws IOException {
+-        abortIfNeeded();
+-        return in.skip(n);
+-    }
+-
+-    @Override
+-    public int available() throws IOException {
+-        abortIfNeeded();
+-        return in.available();
+-    }
+-
+-    @Override
+-    public void close() throws IOException {
+-        in.close();
+-        abortIfNeeded();
+-    }
+-
+-    @Override
+-    public synchronized void mark(int readlimit) {
+-        abortIfNeeded();
+-        in.mark(readlimit);
+-    }
+-
+-    @Override
+-    public synchronized void reset() throws IOException {
+-        abortIfNeeded();
+-        in.reset();
+-    }
+-
+-    @Override
+-    public boolean markSupported() {
+-        abortIfNeeded();
+-        return in.markSupported();
+-    }
+-
+-    @Override
+-    public void release() {
+-        // Don't call IOUtils.release(in, null) or else could lead to infinite loop
+-        SdkIOUtils.closeQuietly(this);
+-        if (in instanceof Releasable) {
+-            // This allows any underlying stream that has the close operation
+-            // disabled to be truly released
+-            Releasable r = (Releasable)in;
+-            r.release();
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/SdkFilterOutputStream.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkFilterOutputStream.java
+--- ./src/main/java/com/amazonaws/internal/SdkFilterOutputStream.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkFilterOutputStream.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,51 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-import java.io.FilterOutputStream;
+-import java.io.OutputStream;
+-
+-import com.amazonaws.util.IOUtils;
+-
+-/**
+- * Base class for AWS Java SDK specific {@link FilterOutputStream}.
+- */
+-public class SdkFilterOutputStream extends FilterOutputStream implements
+-        MetricAware, Releasable {
+-    public SdkFilterOutputStream(OutputStream out) {
+-        super(out);
+-    }
+-
+-    @Override
+-    public boolean isMetricActivated() {
+-        if (out instanceof MetricAware) {
+-            MetricAware metricAware = (MetricAware)out;
+-            return metricAware.isMetricActivated();
+-        }
+-        return false;
+-    }
+-
+-    @Override
+-    public final void release() {
+-        // Don't call IOUtils.release(in, null) or else could lead to infinite loop
+-        IOUtils.closeQuietly(this, null);
+-        if (out instanceof Releasable) {
+-            // This allows any underlying stream that has the close operation
+-            // disabled to be truly released
+-            Releasable r = (Releasable)out;
+-            r.release();
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/SdkFunction.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkFunction.java
+--- ./src/main/java/com/amazonaws/internal/SdkFunction.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkFunction.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,27 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-/**
+- * Similar to the Function functional interface in Java 8.
+- *
+- * @param   Input type
+- * @param  Output type
+- */
+-public interface SdkFunction {
+-
+-    Output apply(Input input);
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/SdkInputStream.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkInputStream.java
+--- ./src/main/java/com/amazonaws/internal/SdkInputStream.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkInputStream.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,90 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-import static com.amazonaws.util.SdkRuntime.shouldAbort;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import org.apache.commons.logging.LogFactory;
+-
+-import com.amazonaws.AbortedException;
+-import com.amazonaws.util.IOUtils;
+-
+-/**
+- * Base class for AWS Java SDK specific {@link InputStream}.
+- */
+-public abstract class SdkInputStream extends InputStream implements
+-        MetricAware, Releasable {
+-    /**
+-     * Returns the underlying input stream, if any, from the subclass; or null
+-     * if there is no underlying input stream.
+-     */
+-    abstract protected InputStream getWrappedInputStream();
+-
+-    @Override
+-    public final boolean isMetricActivated() {
+-        InputStream in = getWrappedInputStream();
+-        if (in instanceof MetricAware) {
+-            MetricAware metricAware = (MetricAware)in;
+-            return metricAware.isMetricActivated();
+-        }
+-        return false;
+-    }
+-
+-    /**
+-     * Aborts with subclass specific abortion logic executed if needed.
+-     * Note the interrupted status of the thread is cleared by this method.
+-     * @throws AbortedException if found necessary.
+-     */
+-    protected final void abortIfNeeded() {
+-        if (shouldAbort()) {
+-            try {
+-                abort();    // execute subclass specific abortion logic
+-            } catch (IOException e) {
+-                LogFactory.getLog(getClass()).debug("FYI", e);
+-            }
+-            throw new AbortedException();
+-        }
+-    }
+-
+-    /**
+-     * Can be used to provide abortion logic prior to throwing the
+-     * AbortedException. No-op by default.
+-     */
+-    protected void abort() throws IOException {
+-        // no-op by default, but subclass such as S3ObjectInputStream may override
+-    }
+-
+-    /**
+-     * WARNING: Subclass that overrides this method must NOT call
+-     * super.release() or else it would lead to infinite loop.
+-     * 

+-     * {@inheritDoc}
+-     */
+-    @Override
+-    public void release() {
+-        // Don't call IOUtils.release(in, null) or else could lead to infinite loop
+-        IOUtils.closeQuietly(this, null);
+-        InputStream in = getWrappedInputStream();
+-        if (in instanceof Releasable) {
+-            // This allows any underlying stream that has the close operation
+-            // disabled to be truly released
+-            Releasable r = (Releasable)in;
+-            r.release();
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/SdkInternalList.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkInternalList.java
+--- ./src/main/java/com/amazonaws/internal/SdkInternalList.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkInternalList.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,56 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-import java.util.ArrayList;
+-import java.util.Collection;
+-
+-/**
+- * List with auto construct flag to indicate whether it is auto constructed by
+- * Java SDK.
+- */
+-public class SdkInternalList extends ArrayList {
+-
+-    private static final long serialVersionUID = 1L;
+-
+-    /**
+-    * Auto construct flag to indicate whether the list is auto constructed by
+-    * Java SDK.
+-    */
+-    private final boolean autoConstruct;
+-
+-    public SdkInternalList() {
+-        super();
+-        autoConstruct = true;
+-    }
+-
+-    public SdkInternalList(Collection c) {
+-        super(c);
+-        autoConstruct = false;
+-    }
+-
+-    public SdkInternalList(int initialCapacity) {
+-        super(initialCapacity);
+-        autoConstruct = false;
+-    }
+-
+-    /**
+-    * Return true if the list is auto constructed by Java SDK
+-    */
+-    public boolean isAutoConstruct() {
+-        return autoConstruct;
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/SdkInternalMap.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkInternalMap.java
+--- ./src/main/java/com/amazonaws/internal/SdkInternalMap.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkInternalMap.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,135 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-import java.io.Serializable;
+-import java.util.Collection;
+-import java.util.HashMap;
+-import java.util.Map;
+-import java.util.Set;
+-
+-/**
+- * Map with auto construct flag to indicate whether it is auto constructed by
+- * Java SDK.
+- */
+-public class SdkInternalMap implements Map, Serializable {
+-    private static final long serialVersionUID = 1L;
+-
+-    private final Map map;
+-
+-    /**
+-    * Auto construct flag to indicate whether the map is auto constructed by
+-    * Java SDK.
+-    */
+-    private final boolean autoConstruct;
+-
+-    public SdkInternalMap() {
+-        this.map = new HashMap();
+-        autoConstruct = true;
+-    }
+-
+-    public SdkInternalMap(Map m) {
+-        this.map = m;
+-        autoConstruct = false;
+-    }
+-
+-    /**
+-    * Return true if the map is auto constructed by Java SDK; false otherwise.
+-    */
+-    public boolean isAutoConstruct() {
+-        return autoConstruct;
+-    }
+-
+-    @Override
+-    public int size() {
+-        return map.size();
+-    }
+-
+-    @Override
+-    public boolean isEmpty() {
+-        return map.isEmpty();
+-    }
+-
+-    @Override
+-    public boolean containsKey(Object key) {
+-        return map.containsKey(key);
+-    }
+-
+-    @Override
+-    public boolean containsValue(Object value) {
+-        return map.containsValue(value);
+-    }
+-
+-    @Override
+-    public V get(Object key) {
+-        return map.get(key);
+-    }
+-
+-    @Override
+-    public V put(K key, V value) {
+-        return map.put(key, value);
+-    }
+-
+-    @Override
+-    public V remove(Object key) {
+-        return map.remove(key);
+-    }
+-
+-    @Override
+-    public void putAll(Map m) {
+-        map.putAll(m);
+-    }
+-
+-    @Override
+-    public void clear() {
+-        map.clear();
+-    }
+-
+-    @Override
+-    public Set keySet() {
+-        return map.keySet();
+-    }
+-
+-    @Override
+-    public Collection values() {
+-        return map.values();
+-    }
+-
+-    @Override
+-    public Set> entrySet() {
+-        return map.entrySet();
+-    }
+-
+-    @Override
+-    public boolean equals(Object o) {
+-        if (this == o) return true;
+-        if (map == null ) return o == null;
+-        if (!(o instanceof Map)) return false;
+-        
+-        Map that = (Map) o;
+-
+-        return map.equals(that);
+-    }
+-
+-    @Override
+-    public int hashCode() {
+-        return map == null ? 0 : map.hashCode();
+-    }
+-
+-    @Override
+-    public String toString() {
+-        return map == null ? null : map.toString();
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/SdkIOUtils.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkIOUtils.java
+--- ./src/main/java/com/amazonaws/internal/SdkIOUtils.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkIOUtils.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,49 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-import java.io.Closeable;
+-import java.io.IOException;
+-
+-import com.amazonaws.log.InternalLogApi;
+-import com.amazonaws.log.InternalLogFactory;
+-
+-/**
+- * Utilities for IO operations.
+- */
+-enum SdkIOUtils {
+-    ;
+-    private static final InternalLogApi defaultLog = InternalLogFactory.getLog(SdkIOUtils.class);
+-
+-    static void closeQuietly(Closeable is) {
+-        closeQuietly(is, null);
+-    }
+-    /**
+-     * Closes the given Closeable quietly.
+-     * @param is the given closeable
+-     * @param log logger used to log any failure should the close fail
+-     */
+-    static void closeQuietly(Closeable is, InternalLogApi log) {
+-        if (is != null) {
+-            try {
+-                is.close();
+-            } catch (IOException ex) {
+-                InternalLogApi logger = log == null ? defaultLog : log;
+-                if (logger.isDebugEnabled())
+-                    logger.debug("Ignore failure in closing the Closeable", ex);
+-            }
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/SdkMetricsSocket.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkMetricsSocket.java
+--- ./src/main/java/com/amazonaws/internal/SdkMetricsSocket.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkMetricsSocket.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,52 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.internal;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.net.Socket;
+-
+-import com.amazonaws.util.AWSRequestMetrics;
+-
+-/**
+- * A wrapper to Socket with metrics feature to record socket read time.
+- */
+-public class SdkMetricsSocket extends DelegateSocket {
+-
+-    private MetricsInputStream metricsIS;
+-
+-    public SdkMetricsSocket(Socket sock) {
+-        super(sock);
+-    }
+-
+-    /**
+-     * {@link AWSRequestMetrics} is set per request.
+-     */
+-    public void setMetrics(AWSRequestMetrics metrics) {
+-        if (metricsIS == null) {
+-            throw new IllegalStateException(
+-                    "The underlying input stream must be initialized!");
+-        }
+-        metricsIS.setMetrics(metrics);
+-    }
+-
+-    @Override
+-    public InputStream getInputStream() throws IOException {
+-        metricsIS = new MetricsInputStream(sock.getInputStream());
+-        return metricsIS;
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/SdkPredicate.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkPredicate.java
+--- ./src/main/java/com/amazonaws/internal/SdkPredicate.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkPredicate.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,30 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-/**
+- * Similar to Predicate functional interface in Java 8
+- */
+-public abstract class SdkPredicate {
+-
+-    /**
+-     * Evaluates this predicate on the given argument
+-     * 
+-     * @param t
+-     *            The input argument
+-     * @return true if the input argument matches the predicate, otherwise false
+-     */
+-    public abstract boolean test(T t);
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/SdkSocket.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkSocket.java
+--- ./src/main/java/com/amazonaws/internal/SdkSocket.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkSocket.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,78 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-import java.io.IOException;
+-import java.net.Socket;
+-import java.net.SocketAddress;
+-
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-
+-public class SdkSocket extends DelegateSocket {
+-    private static final Log log = LogFactory.getLog(SdkSocket.class);
+-
+-    public SdkSocket(Socket sock) {
+-        super(sock);
+-        if (log.isDebugEnabled())
+-            log.debug("created: " + endpoint());
+-    }
+-
+-    /**
+-     * Returns the endpoint in the format of "address:port"
+-     */
+-    private String endpoint() {
+-        return sock.getInetAddress() + ":" + sock.getPort();
+-    }
+-
+-    @Override
+-    public void connect(SocketAddress endpoint) throws IOException {
+-        if (log.isDebugEnabled())
+-            log.debug("connecting to: " + endpoint);
+-        sock.connect(endpoint);
+-        if (log.isDebugEnabled())
+-            log.debug("connected to: " + endpoint());
+-    }
+-
+-    @Override
+-    public void connect(SocketAddress endpoint, int timeout) throws IOException {
+-        if (log.isDebugEnabled())
+-            log.debug("connecting to: " + endpoint);
+-        sock.connect(endpoint, timeout);
+-        if (log.isDebugEnabled())
+-            log.debug("connected to: " + endpoint());
+-    }
+-
+-    @Override
+-    public void close() throws IOException {
+-        if (log.isDebugEnabled())
+-            log.debug("closing " + endpoint());
+-        sock.close();
+-    }
+-
+-    @Override
+-    public void shutdownInput() throws IOException {
+-        if (log.isDebugEnabled())
+-            log.debug("shutting down input of " + endpoint());
+-        sock.shutdownInput();
+-    }
+-
+-    @Override
+-    public void shutdownOutput() throws IOException {
+-        if (log.isDebugEnabled())
+-            log.debug("shutting down output of " + endpoint());
+-        sock.shutdownOutput();
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/SdkSSLContext.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkSSLContext.java
+--- ./src/main/java/com/amazonaws/internal/SdkSSLContext.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkSSLContext.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,42 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon Technologies, Inc.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at:
+- *
+- *    http://aws.amazon.com/apache2.0
+- *
+- * This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+- * OR CONDITIONS OF ANY KIND, either express or implied. See the
+- * License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-import org.apache.http.conn.ssl.SSLContexts;
+-import org.apache.http.conn.ssl.SSLInitializationException;
+-
+-import javax.net.ssl.SSLContext;
+-import java.security.KeyManagementException;
+-import java.security.NoSuchAlgorithmException;
+-import java.security.SecureRandom;
+-
+-public class SdkSSLContext {
+-
+-    /**
+-     * @see SSLContexts#createDefault()
+-     */
+-    public static final SSLContext getPreferredSSLContext(final SecureRandom secureRandom) {
+-        try {
+-            final SSLContext sslcontext = SSLContext.getInstance("TLS");
+-            // http://download.java.net/jdk9/docs/technotes/guides/security/jsse/JSSERefGuide.html
+-            sslcontext.init(null, null, secureRandom);
+-            return sslcontext;
+-        } catch (final NoSuchAlgorithmException ex) {
+-            throw new SSLInitializationException(ex.getMessage(), ex);
+-        } catch (final KeyManagementException ex) {
+-            throw new SSLInitializationException(ex.getMessage(), ex);
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/SdkSSLMetricsSocket.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkSSLMetricsSocket.java
+--- ./src/main/java/com/amazonaws/internal/SdkSSLMetricsSocket.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkSSLMetricsSocket.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,56 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.internal;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import javax.net.ssl.SSLSocket;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.annotation.SdkTestInternalApi;
+-import com.amazonaws.util.AWSRequestMetrics;
+-
+-/**
+- * A wrapper to SSLSocket with metric feature to record socket read time.
+- */
+-public class SdkSSLMetricsSocket extends DelegateSSLSocket {
+-
+-    private MetricsInputStream metricsIS;
+-
+-    public SdkSSLMetricsSocket(SSLSocket sock) {
+-        super(sock);
+-    }
+-
+-    public void setMetrics(AWSRequestMetrics metrics) throws IOException {
+-        // make sure metricsIS is initialized.
+-        getInputStream();
+-        metricsIS.setMetrics(metrics);
+-    }
+-
+-    @Override
+-    public InputStream getInputStream() throws IOException {
+-        if (metricsIS == null) {
+-            metricsIS = new MetricsInputStream(sock.getInputStream());
+-        }
+-        return metricsIS;
+-    }
+-
+-    @SdkTestInternalApi
+-    MetricsInputStream getMetricsInputStream() {
+-        return metricsIS;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/SdkSSLSocket.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkSSLSocket.java
+--- ./src/main/java/com/amazonaws/internal/SdkSSLSocket.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/SdkSSLSocket.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,79 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-import java.io.IOException;
+-import java.net.SocketAddress;
+-
+-import javax.net.ssl.SSLSocket;
+-
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-
+-public class SdkSSLSocket extends DelegateSSLSocket {
+-    private static final Log log = LogFactory.getLog(SdkSSLSocket.class);
+-
+-    public SdkSSLSocket(SSLSocket sock) {
+-        super(sock);
+-        if (log.isDebugEnabled())
+-            log.debug("created: " + endpoint());
+-    }
+-
+-    /**
+-     * Returns the endpoint in the format of "address:port"
+-     */
+-    private String endpoint() {
+-        return sock.getInetAddress() + ":" + sock.getPort();
+-    }
+-
+-    @Override
+-    public void connect(SocketAddress endpoint) throws IOException {
+-        if (log.isDebugEnabled())
+-            log.debug("connecting to: " + endpoint);
+-        sock.connect(endpoint);
+-        if (log.isDebugEnabled())
+-            log.debug("connected to: " + endpoint());
+-    }
+-
+-    @Override
+-    public void connect(SocketAddress endpoint, int timeout) throws IOException {
+-        if (log.isDebugEnabled())
+-            log.debug("connecting to: " + endpoint);
+-        sock.connect(endpoint, timeout);
+-        if (log.isDebugEnabled())
+-            log.debug("connected to: " + endpoint());
+-    }
+-
+-    @Override
+-    public void close() throws IOException {
+-        if (log.isDebugEnabled())
+-            log.debug("closing " + endpoint());
+-        sock.close();
+-    }
+-
+-    @Override
+-    public void shutdownInput() throws IOException {
+-        if (log.isDebugEnabled())
+-            log.debug("shutting down input of " + endpoint());
+-        sock.shutdownInput();
+-    }
+-
+-    @Override
+-    public void shutdownOutput() throws IOException {
+-        if (log.isDebugEnabled())
+-            log.debug("shutting down output of " + endpoint());
+-        sock.shutdownOutput();
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/internal/ServiceEndpointBuilder.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/ServiceEndpointBuilder.java
+--- ./src/main/java/com/amazonaws/internal/ServiceEndpointBuilder.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/internal/ServiceEndpointBuilder.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,43 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.internal;
+-
+-import java.net.URI;
+-
+-import com.amazonaws.regions.Region;
+-
+-/**
+- * Construct a service endpoint based on metadata like service name and region
+- */
+-public abstract class ServiceEndpointBuilder {
+-
+-    /**
+-     * Get the URI of the service endpoint
+-     * 
+-     * @return URI of endpoint
+-     */
+-    public abstract URI getServiceEndpoint();
+-
+-    public abstract Region getRegion();
+-
+-    /**
+-     * Changes the region of the endpoint builder
+-     * 
+-     * @param region
+-     *            New region to use in endpoint determination
+-     * @return A reference to this updated object so that method calls can be chained together.
+-     */
+-    public abstract ServiceEndpointBuilder withRegion(Region region);
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/jmx/JmxInfoProviderSupport.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/jmx/JmxInfoProviderSupport.java
+--- ./src/main/java/com/amazonaws/jmx/JmxInfoProviderSupport.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/jmx/JmxInfoProviderSupport.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,85 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon Technologies, Inc.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at:
+- *
+- *    http://aws.amazon.com/apache2.0
+- *
+- * This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+- * OR CONDITIONS OF ANY KIND, either express or implied. See the
+- * License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package com.amazonaws.jmx;
+-
+-import java.lang.management.ManagementFactory;
+-import java.lang.management.ThreadMXBean;
+-import java.util.List;
+-
+-import javax.management.Attribute;
+-import javax.management.AttributeList;
+-import javax.management.MBeanServer;
+-import javax.management.ObjectName;
+-
+-import org.apache.commons.logging.LogFactory;
+-
+-import com.amazonaws.jmx.spi.JmxInfoProvider;
+-
+-public class JmxInfoProviderSupport implements JmxInfoProvider {
+-    @Override
+-    public long[] getFileDecriptorInfo() {
+-        MBeanServer mbsc = MBeans.getMBeanServer();
+-        AttributeList attributes;
+-        try {
+-            attributes = mbsc.getAttributes(
+-                new ObjectName("java.lang:type=OperatingSystem"), 
+-                new String[]{"OpenFileDescriptorCount", "MaxFileDescriptorCount"});
+-            List attrList = attributes.asList();
+-            long openFdCount = (Long)attrList.get(0).getValue();
+-            long maxFdCount = (Long)attrList.get(1).getValue();
+-            long[] fdCounts = { openFdCount, maxFdCount};
+-            return fdCounts;
+-        } catch (Exception e) {
+-            LogFactory.getLog(SdkMBeanRegistrySupport.class).debug(
+-                    "Failed to retrieve file descriptor info", e);
+-        }
+-        return null;
+-    }
+-
+-    @Override
+-    public int getThreadCount() {
+-      ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
+-      return threadMXBean.getThreadCount();
+-    }
+-
+-    @Override
+-    public int getDaemonThreadCount() {
+-        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
+-        return threadMXBean.getDaemonThreadCount();
+-    }
+-
+-    @Override
+-    public int getPeakThreadCount() {
+-        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
+-        return threadMXBean.getPeakThreadCount();
+-    }
+-
+-    @Override
+-    public long getTotalStartedThreadCount() {
+-        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
+-        return threadMXBean.getTotalStartedThreadCount();
+-    }
+-
+-    @Override
+-    public long[] findDeadlockedThreads() {
+-        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
+-        return threadMXBean.findDeadlockedThreads();
+-    }
+-
+-    @Override
+-    public boolean isEnabled() {
+-        return true;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/jmx/MBeans.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/jmx/MBeans.java
+--- ./src/main/java/com/amazonaws/jmx/MBeans.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/jmx/MBeans.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,117 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.jmx;
+-
+-import java.lang.management.ManagementFactory;
+-import java.util.List;
+-
+-import javax.management.InstanceAlreadyExistsException;
+-import javax.management.InstanceNotFoundException;
+-import javax.management.MBeanRegistrationException;
+-import javax.management.MBeanServer;
+-import javax.management.MBeanServerFactory;
+-import javax.management.MalformedObjectNameException;
+-import javax.management.NotCompliantMBeanException;
+-import javax.management.ObjectName;
+-
+-import org.apache.commons.logging.LogFactory;
+-
+-/**
+- * MBean related utilities.
+- */
+-public enum MBeans {
+-    ;
+-    /**
+-     * Registers the given MBean under the given object name to the first
+-     * registered MBean server, or the platform MBean server if there is no
+-     * explicitly registered MBean server.
+-     * 
+-     * @return true if the registration succeeded, or false if an MBean already
+-     *         exists under the given object name.
+-     * @throws MBeanRegistrationException
+-     *             The preRegister (MBeanRegistration interface) method of the
+-     *             MBean has thrown an exception. The MBean will not be
+-     *             registered.
+-     */
+-    public static  boolean registerMBean(String objectName, T mbean)
+-            throws MBeanRegistrationException {
+-        MBeanServer server = getMBeanServer();
+-        try {
+-            server.registerMBean(mbean, new ObjectName(objectName));
+-        } catch (MalformedObjectNameException e) {
+-            throw new IllegalArgumentException(e);
+-        } catch (NotCompliantMBeanException e) {
+-            throw new IllegalArgumentException(e);
+-        } catch (InstanceAlreadyExistsException e) {
+-            LogFactory.getLog(MBeans.class).debug(
+-                "Failed to register mbean " + objectName, e);
+-            return false;
+-        }
+-        return true;
+-    }
+-
+-    /**
+-     * Unregisters the MBean under the given object name to the first MBean
+-     * server, or the platform MBean server if there is no explicitly registered
+-     * MBean server.
+-     * 
+-     * @return true if the unregistration succeeded, or false if the MBean
+-     *         doesn't exist under the given object name.
+-     * @throws MBeanRegistrationException
+-     *             Wraps exceptions thrown by the preRegister(), preDeregister()
+-     *             methods of the MBeanRegistration interface.
+-     */
+-    public static  boolean unregisterMBean(String objectName)
+-            throws MBeanRegistrationException {
+-        MBeanServer server = getMBeanServer();
+-        try {
+-            server.unregisterMBean(new ObjectName(objectName));
+-        } catch (MalformedObjectNameException e) {
+-            throw new IllegalArgumentException(e);
+-        } catch (InstanceNotFoundException e) {
+-            LogFactory.getLog(MBeans.class).debug(
+-                    "Failed to unregister mbean " + objectName, e);
+-            return false;
+-        }
+-        return true;
+-    }
+-
+-    /**
+-     * Returns true if an MBean identified by the specified object name is
+-     * already registered with the first MBean server, or the platform MBean
+-     * server if there is no explicitly registered MBean server; false
+-     * otherwise.
+-     */
+-    public static boolean isRegistered(String objectName) {
+-        MBeanServer server = getMBeanServer();
+-        try {
+-            return server.isRegistered(new ObjectName(objectName));
+-        } catch (MalformedObjectNameException e) {
+-            throw new IllegalArgumentException(e);
+-        }
+-    }
+-
+-    /**
+-     * Returns the first registered MBean server, or the platform MBean server
+-     * if there is none.
+-     */
+-    public static MBeanServer getMBeanServer() {
+-        List servers = MBeanServerFactory.findMBeanServer(null);
+-        MBeanServer server = servers.size() > 0
+-            ? servers.get(0)
+-            : ManagementFactory.getPlatformMBeanServer();
+-        return server;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/jmx/SdkMBeanRegistrySupport.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/jmx/SdkMBeanRegistrySupport.java
+--- ./src/main/java/com/amazonaws/jmx/SdkMBeanRegistrySupport.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/jmx/SdkMBeanRegistrySupport.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,48 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.jmx;
+-
+-import org.apache.commons.logging.LogFactory;
+-
+-import com.amazonaws.jmx.spi.SdkMBeanRegistry;
+-import com.amazonaws.metrics.MetricAdmin;
+-
+-public class SdkMBeanRegistrySupport implements SdkMBeanRegistry {
+-    ;
+-    @Override
+-    public boolean registerMetricAdminMBean(String objectName) {
+-        try {
+-            return MBeans.registerMBean(objectName, new MetricAdmin());
+-        } catch(Exception ex) {
+-            LogFactory.getLog(SdkMBeanRegistrySupport.class).warn("", ex);
+-        }
+-        return false;
+-    }
+-
+-    @Override
+-    public boolean unregisterMBean(String objectName) {
+-        try {
+-            return MBeans.unregisterMBean(objectName);
+-        } catch(Exception ex) {
+-            LogFactory.getLog(SdkMBeanRegistrySupport.class).warn("", ex);
+-        }
+-        return false;
+-    }
+-
+-    @Override
+-    public boolean isMBeanRegistered(String objectName) {
+-        return MBeans.isRegistered(objectName);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/jmx/spi/JmxInfoProvider.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/jmx/spi/JmxInfoProvider.java
+--- ./src/main/java/com/amazonaws/jmx/spi/JmxInfoProvider.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/jmx/spi/JmxInfoProvider.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,87 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon Technologies, Inc.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at:
+- *
+- *    http://aws.amazon.com/apache2.0
+- *
+- * This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+- * OR CONDITIONS OF ANY KIND, either express or implied. See the
+- * License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package com.amazonaws.jmx.spi;
+-
+-import org.apache.commons.logging.LogFactory;
+-
+-/**
+- * SPI used to retrieve JMX information and can survive the absence of JMX.
+- */
+-public interface JmxInfoProvider {
+-    public long[] getFileDecriptorInfo();
+-    public int getThreadCount();
+-    public int getDaemonThreadCount();
+-    public int getPeakThreadCount();
+-    public long getTotalStartedThreadCount();
+-    public long[] findDeadlockedThreads();
+-    public boolean isEnabled();
+-
+-    public static class Factory {
+-        private static final JmxInfoProvider provider;
+-        static {
+-            JmxInfoProvider p;
+-            try {
+-                Class c = Class.forName("com.amazonaws.jmx.JmxInfoProviderSupport");
+-                p = (JmxInfoProvider)c.newInstance();
+-            } catch (Exception e) {
+-                LogFactory
+-                    .getLog(JmxInfoProvider.class)
+-                    .debug("Failed to load the JMX implementation module - JMX is disabled", e);
+-                p = NONE;
+-            }
+-            provider = p;
+-        }
+-        public static JmxInfoProvider getJmxInfoProvider() {
+-            return provider;
+-        }
+-    }
+-
+-    static final JmxInfoProvider NONE = new JmxInfoProvider() {
+-        @Override
+-        public long[] getFileDecriptorInfo() {
+-            return null;
+-        }
+-
+-        @Override
+-        public int getThreadCount() {
+-            return 0;
+-        }
+-
+-        @Override
+-        public int getDaemonThreadCount() {
+-            return 0;
+-        }
+-
+-        @Override
+-        public int getPeakThreadCount() {
+-            return 0;
+-        }
+-
+-        @Override
+-        public long getTotalStartedThreadCount() {
+-            return 0;
+-        }
+-
+-        @Override
+-        public long[] findDeadlockedThreads() {
+-            return null;
+-        }
+-
+-        @Override
+-        public boolean isEnabled() {
+-            return false;
+-        }
+-    };
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/jmx/spi/SdkMBeanRegistry.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/jmx/spi/SdkMBeanRegistry.java
+--- ./src/main/java/com/amazonaws/jmx/spi/SdkMBeanRegistry.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/jmx/spi/SdkMBeanRegistry.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,72 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon Technologies, Inc.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at:
+- *
+- *    http://aws.amazon.com/apache2.0
+- *
+- * This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+- * OR CONDITIONS OF ANY KIND, either express or implied. See the
+- * License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package com.amazonaws.jmx.spi;
+-
+-import org.apache.commons.logging.LogFactory;
+-
+-/**
+- * SPI used to register MBeans and can survive the absence of JMX.
+- */
+-public interface SdkMBeanRegistry {
+-    /**
+-     * Returns true if the registration of the admin MBean under the given
+-     * object name succeeded; false otherwise.
+-     */
+-    public boolean registerMetricAdminMBean(String objectName);
+-
+-    /**
+-     * Returns true if the unregistration of the MBean under the given object
+-     * name succeeded; false otherwise.
+-     */
+-    public boolean unregisterMBean(String objectName);
+-
+-    /**
+-     * Returns true if the the MBean under the given object name is currently
+-     * registered; false otherwise.
+-     */
+-    public boolean isMBeanRegistered(String objectName);
+-
+-    public static class Factory {
+-        private static final SdkMBeanRegistry registry;
+-        static {
+-            SdkMBeanRegistry rego;
+-            try {
+-                Class c = Class.forName("com.amazonaws.jmx.SdkMBeanRegistrySupport");
+-                rego = (SdkMBeanRegistry)c.newInstance();
+-            } catch (Exception e) {
+-                LogFactory
+-                    .getLog(SdkMBeanRegistry.class)
+-                    .debug("Failed to load the JMX implementation module - JMX is disabled", e);
+-                rego = NONE;
+-            }
+-            registry = rego;
+-        }
+-        public static SdkMBeanRegistry getMBeanRegistry() {
+-            return registry;
+-        }
+-    }
+-    
+-    static final SdkMBeanRegistry NONE = new SdkMBeanRegistry() {
+-        @Override public boolean registerMetricAdminMBean(String objectName) {
+-            return false;
+-        }
+-        @Override public boolean unregisterMBean(String objectName) {
+-            return false;
+-        }
+-        @Override public boolean isMBeanRegistered(String objectName) {
+-            return false;
+-        }
+-    };
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/metrics/AwsSdkMetrics.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/AwsSdkMetrics.java
+--- ./src/main/java/com/amazonaws/metrics/AwsSdkMetrics.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/AwsSdkMetrics.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,962 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.metrics;
+-import static com.amazonaws.SDKGlobalConfiguration.DEFAULT_METRICS_SYSTEM_PROPERTY;
+-
+-import java.io.File;
+-import java.io.FileNotFoundException;
+-import java.io.IOException;
+-import java.net.InetAddress;
+-import java.util.Collection;
+-import java.util.Collections;
+-import java.util.HashSet;
+-import java.util.Set;
+-
+-import com.amazonaws.regions.Region;
+-import com.amazonaws.regions.RegionUtils;
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-
+-import com.amazonaws.SDKGlobalConfiguration;
+-import com.amazonaws.auth.AWSCredentials;
+-import com.amazonaws.auth.AWSCredentialsProvider;
+-import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
+-import com.amazonaws.auth.PropertiesCredentials;
+-import com.amazonaws.jmx.spi.SdkMBeanRegistry;
+-import com.amazonaws.regions.Regions;
+-import com.amazonaws.util.AWSRequestMetrics;
+-import com.amazonaws.util.AWSRequestMetrics.Field;
+-import com.amazonaws.util.AWSServiceMetrics;
+-
+-/**
+- * Used to control the default AWS SDK metric collection system.
+- * 

+- * The default metric collection of the Java AWS SDK is disabled by default. To
+- * enable it, simply specify the system property
+- * "com.amazonaws.sdk.enableDefaultMetrics" when starting up the JVM.
+- * When the system property is specified, a default metric collector will be
+- * started at the AWS SDK level. The default implementation uploads the
+- * request/response metrics captured to Amazon CloudWatch using AWS credentials
+- * obtained via the {@link DefaultAWSCredentialsProviderChain}.
+- * 

+- * By default, the metrics are uploaded to the us-east-1 region. You can
+- * change the region by changing the system property as
+- * -Dcom.amazonaws.sdk.enableDefaultMetrics=cloudwatchRegion={newregion}
+- * See #CLOUDWATCH_REGION
+- * 

+- * 

+- * For additional optional attributes that can be specified for the system
+- * property, please read the javadoc of the individual fields of
+- * this class for more details.
+- * 

+- * Instead of via system properties, the default AWS SDK metric collection can
+- * also be enabled programmatically via {@link #enableDefaultMetrics()}.
+- * Similarly, metric collection at the AWS SDK level can be disabled via
+- * {@link #disableMetrics()}.
+- * 

+- * Clients who needs to fully customize the metric collection can implement the
+- * SPI {@link MetricCollector}, and then replace the default AWS SDK
+- * implementation of the collector via
+- * {@link #setMetricCollector(MetricCollector)}.
+- * 

+- * Alternatively, for limited customization of the internal collector
+- * implementation provided by the AWS SDK, one can extend the internal Amazon
+- * CloudWatch metric collector. See the javadoc at
+- * com.amazonaws.metrics.internal.cloudwatch.CloudWatchMetricConfig for more
+- * details.
+- */
+-public enum AwsSdkMetrics {
+-    ;
+-    private static final Log log = LogFactory.getLog(AwsSdkMetrics.class);
+-    public static final String DEFAULT_METRIC_NAMESPACE = "AWSSDK/Java";
+-    private static final String MBEAN_OBJECT_NAME =
+-        "com.amazonaws.management:type=" + AwsSdkMetrics.class.getSimpleName();
+-
+-    /**
+-     * Object name under which the Admin Mbean of the current classloader is
+-     * registered.
+-     */
+-    private static volatile String registeredAdminMbeanName;
+-    /**
+-     * Used to enable the use of a single metric namespace for all levels of SDK
+-     * generated CloudWatch metrics such as JVM level, host level, etc.
+-     *
+-     * 
+-     * Example:
+-     *  -Dcom.amazonaws.sdk.enableDefaultMetrics=useSingleMetricNamespace
+-     * 

+-     */
+-    public static final String USE_SINGLE_METRIC_NAMESPACE = "useSingleMetricNamespace";
+-    /**
+-     * Used to exclude the generation of JVM metrics when the AWS SDK default
+-     * metrics is enabled.
+-     * By default, jvm metrics is included.
+-     *
+-     * 
+-     * Example:
+-     *  -Dcom.amazonaws.sdk.enableDefaultMetrics=excludeJvmMetrics
+-     * 

+-     */
+-    public static final String EXCLUDE_MACHINE_METRICS = "excludeMachineMetrics";
+-
+-    /**
+-     * Used to generate per host level metrics when the AWS SDK default
+-     * metrics is enabled.
+-     * By default, per-host level metrics is excluded.
+-     *
+-     * 
+-     * Example:
+-     *  -Dcom.amazonaws.sdk.enableDefaultMetrics=includePerHostMetrics
+-     * 

+-     */
+-    public static final String INCLUDE_PER_HOST_METRICS = "includePerHostMetrics";
+-
+-    /**
+-     * Used to specify an AWS credential property file.
+-     * By default, the {@link DefaultAWSCredentialsProviderChain} is used.
+-     *
+-     * 
+-     * Example:
+-     *  -Dcom.amazonaws.sdk.enableDefaultMetrics=credentialFile=/path/aws.properties
+-     * 

+-     * @deprecated in favor of {@link AWS_CREDENTIAL_PROPERTIES_FILE}
+-     */
+-    public static final String AWS_CREDENTAIL_PROPERTIES_FILE= "credentialFile";
+-
+-    /**
+-     * Used to specify an AWS credential property file.
+-     * By default, the {@link DefaultAWSCredentialsProviderChain} is used.
+-     *
+-     * 
+-     * Example:
+-     *  -Dcom.amazonaws.sdk.enableDefaultMetrics=credentialFile=/path/aws.properties
+-     * 

+-     */
+-    public static final String AWS_CREDENTIAL_PROPERTIES_FILE= "credentialFile";
+-
+-    /**
+-     * Used to specify the Amazon CloudWatch region for metrics uploading purposes.
+-     * By default, metrics are uploaded to us-east-1.
+-     *
+-     * 
+-     * Example:
+-     *  -Dcom.amazonaws.sdk.enableDefaultMetrics=cloudwatchRegion=us-west-2
+-     * 

+-     */
+-    public static final String CLOUDWATCH_REGION = "cloudwatchRegion";
+-
+-    /**
+-     * Used to specify the internal in-memory queue size for queuing metrics
+-     * data points. The default size is 1,000.
+-     *
+-     * 
+-     * Example:
+-     *  -Dcom.amazonaws.sdk.enableDefaultMetrics=metricQueueSize=1000
+-     * 

+-     */
+-    public static final String METRIC_QUEUE_SIZE = "metricQueueSize";
+-
+-    /**
+-     * Used to specify the internal queue polling timeout in millisecond.
+-     * The default timeout is 1 minute, which is optimal for the default
+-     * CloudWatch implementation.
+-     *
+-     * 
+-     * Example:
+-     *  -Dcom.amazonaws.sdk.enableDefaultMetrics=getQueuePollTimeoutMilli=60000
+-     * 

+-     */
+-    public static final String QUEUE_POLL_TIMEOUT_MILLI = "getQueuePollTimeoutMilli";
+-
+-    /**
+-     * Used to specify a custom metric name space.
+-     * The default name space is {@link #DEFAULT_METRIC_NAMESPACE}.
+-     *
+-     * 
+-     * Example:
+-     *  -Dcom.amazonaws.sdk.enableDefaultMetrics=metricNameSpace=MyNameSpace
+-     * 

+-     */
+-    public static final String METRIC_NAME_SPACE = "metricNameSpace";
+-
+-    /**
+-     * Used to generate per JVM level metrics when the AWS SDK default
+-     * metrics is enabled.
+-     * By default, JVM level metrics are not generated.
+-     *
+-     * 
+-     * Example:
+-     *  -Dcom.amazonaws.sdk.enableDefaultMetrics=jvmMetricName=Tomcat1
+-     * 

+-     */
+-    public static final String JVM_METRIC_NAME = "jvmMetricName";
+-
+-    /**
+-     * Used to explicitly specify the host name for metric purposes, instead of
+-     * detecting the host name via {@link InetAddress} when the AWS SDK default
+-     * metrics is enabled. Specifying the host name also has the side effecting
+-     * of enabling per host level metrics.
+-     *
+-     * 
+-     * Example:
+-     *  -Dcom.amazonaws.sdk.enableDefaultMetrics=hostMetricName=MyHost
+-     * 

+-     */
+-    public static final String HOST_METRIC_NAME = "hostMetricName";
+-
+-    private static final String DEFAULT_METRIC_COLLECTOR_FACTORY =
+-        "com.amazonaws.metrics.internal.cloudwatch.DefaultMetricCollectorFactory";
+-
+-    /**
+-     * Used to explicitly enable {@link Field#HttpSocketReadTime} for recording socket read time.
+-     *
+-     * 
+-     * Example:
+-     *  -Dcom.amazonaws.sdk.enableDefaultMetrics=enableHttpSocketReadMetric
+-     * 

+-     */
+-    private static final String ENABLE_HTTP_SOCKET_READ_METRIC = "enableHttpSocketReadMetric";
+-    /**
+-     * True if the system property {@link #DEFAULT_METRICS_SYSTEM_PROPERTY} has
+-     * been set; false otherwise.
+-     */
+-    private static final boolean defaultMetricsEnabled;
+-    private static volatile AWSCredentialsProvider credentialProvider;
+-    /**
+-     * True if machine metrics is to be excluded; false otherwise.
+-     */
+-    private static volatile boolean machineMetricsExcluded;
+-    /**
+-     * True if per-host metrics is to be included; false if per-host metrics is
+-     * to be excluded when {@link #hostMetricName} is not specified. In the
+-     * absence of {@link #hostMetricName}, the host name will be automatically
+-     * detected via {@link InetAddress}.
+-     */
+-    private static volatile boolean perHostMetricsIncluded;
+-
+-    /**
+-     * True if socket read time metric is enabled; false otherwise. The {@link Field#HttpSocketReadTime}
+-     * could have a big impact to performance, disabled by default.
+-     */
+-    private static volatile boolean httpSocketReadMetricEnabled;
+-
+-    private static volatile Region region;
+-    private static volatile Integer metricQueueSize;
+-    private static volatile Long queuePollTimeoutMilli;
+-    private static volatile String metricNameSpace = DEFAULT_METRIC_NAMESPACE;
+-    private static volatile String credentialFile;
+-
+-    /**
+-     * No JVM level metrics is generated if this field is set to null or blank.
+-     * Otherwise, the value in this field is used to compose the metric name
+-     * space.
+-     *
+-     * Example:
+-     * 
    
+-     * 
  1. If jvmMetricName="Tomcat1" and host-level metrics is disabled, the
+-     * metric name space will be something like: "AWSSDK/Java/Tomcat1".
    2. 
+-     * 
  2. If jvmMetricName="Tomcat1" and host-level metrics is enabled, the
+-     * metric name space will be something like:
+-     * "AWSSDK/Java/myhost.mycompany.com/Tomcat1".
    3. 
+-     * 
  3. If jvmMetricName="Tomcat1" and host-level metrics is enabled and the
+-     * metricNameSpace="MyNameSpace", the metric name space will be something
+-     * like: "MyNameSpace/myhost.mycompany.com/Tomcat1".
    4. 
+-     * 

+-     */
+-    private static volatile String jvmMetricName;
+-    private static volatile String hostMetricName;
+-    /**
+-     * True if the same metric namespace is to be used for all levels (such as
+-     * JVM level, host-level, etc.) of AWS Cloudwatch Metrics for the Java SDK;
+-     * false otherwise.
+-     */
+-    private static volatile boolean singleMetricNamespace;
+-
+-    static {
+-        String defaultMetrics = System.getProperty(DEFAULT_METRICS_SYSTEM_PROPERTY);
+-        defaultMetricsEnabled = defaultMetrics != null;
+-        if (defaultMetricsEnabled) {
+-            String[] values = defaultMetrics.split(",");
+-            boolean excludeMachineMetrics = false;
+-            boolean includePerHostMetrics = false;
+-            boolean useSingleMetricNamespace = false;
+-            boolean enableHttpSocketReadMetric = false;
+-            for (String s: values) {
+-                String part = s.trim();
+-                if (!excludeMachineMetrics && EXCLUDE_MACHINE_METRICS.equals(part)) {
+-                    excludeMachineMetrics = true;
+-                } else if (!includePerHostMetrics && INCLUDE_PER_HOST_METRICS.equals(part)) {
+-                    includePerHostMetrics = true;
+-                } else if (!useSingleMetricNamespace && USE_SINGLE_METRIC_NAMESPACE.equals(part)) {
+-                    useSingleMetricNamespace = true;
+-                } else if (!enableHttpSocketReadMetric && ENABLE_HTTP_SOCKET_READ_METRIC.equals(part)) {
+-                    enableHttpSocketReadMetric = true;
+-                } else {
+-                    String[] pair = part.split("=");
+-                    if (pair.length == 2) {
+-                        String key = pair[0].trim();
+-                        String value  = pair[1].trim();
+-                        try {
+-                            if (AWS_CREDENTAIL_PROPERTIES_FILE.equals(key)
+-                                    || AWS_CREDENTIAL_PROPERTIES_FILE.equals(key)) {
+-                                setCredentialFile0(value);
+-                            } else if (CLOUDWATCH_REGION.equals(key)) {
+-                                region = RegionUtils.getRegion(value);
+-                            } else if (METRIC_QUEUE_SIZE.equals(key)) {
+-                            	Integer i = Integer.valueOf(value);
+-                                if (i.intValue() < 1)
+-                                    throw new IllegalArgumentException(METRIC_QUEUE_SIZE + " must be at least 1");
+-                                metricQueueSize = i;
+-                            } else if (QUEUE_POLL_TIMEOUT_MILLI.equals(key)) {
+-                            	Long i = Long.valueOf(value);
+-                                if (i.intValue() < 1000)
+-                                    throw new IllegalArgumentException(QUEUE_POLL_TIMEOUT_MILLI + " must be at least 1000");
+-                                queuePollTimeoutMilli = i;
+-                            } else if (METRIC_NAME_SPACE.equals(key)) {
+-                                metricNameSpace = value;
+-                            } else if (JVM_METRIC_NAME.equals(key)) {
+-                                jvmMetricName = value;
+-                            } else if (HOST_METRIC_NAME.equals(key)) {
+-                                hostMetricName = value;
+-                            } else {
+-                                LogFactory.getLog(AwsSdkMetrics.class).debug("Ignoring unrecognized parameter: " + part);
+-                            }
+-                        } catch (Exception e) {
+-                            LogFactory.getLog(AwsSdkMetrics.class).debug("Ignoring failure", e);
+-                        }
+-                    }
+-                }
+-            }
+-            machineMetricsExcluded = excludeMachineMetrics;
+-            perHostMetricsIncluded = includePerHostMetrics;
+-            singleMetricNamespace = useSingleMetricNamespace;
+-            httpSocketReadMetricEnabled = enableHttpSocketReadMetric;
+-        }
+-    }
+-
+-    private static final MetricRegistry registry = new MetricRegistry();
+-    private static volatile MetricCollector mc;
+-    /**
+-     * Used to disallow re-entrancy in enabling the default metric collection system.
+-     */
+-    private static boolean dirtyEnabling;
+-    /** Exports AwsSdkMetrics for JMX access. */
+-    static {
+-        try {
+-            registerMetricAdminMBean();
+-        } catch(Exception ex) {
+-            LogFactory.getLog(AwsSdkMetrics.class).warn("", ex);
+-        }
+-    }
+-
+-    /**
+-     * Returns true if the metric admin MBean is currently registered for JMX
+-     * access; false otherwise.
+-     */
+-    public static boolean isMetricAdminMBeanRegistered() {
+-        SdkMBeanRegistry registry = SdkMBeanRegistry.Factory.getMBeanRegistry();
+-        return registeredAdminMbeanName != null
+-                && registry.isMBeanRegistered(registeredAdminMbeanName);
+-    }
+-
+-    /**
+-     * Returns the name of the registered admin mbean; or null if the admin
+-     * mbean is not currently registered.
+-     */
+-    public static String getRegisteredAdminMbeanName() {
+-        return registeredAdminMbeanName;
+-    }
+-
+-    /**
+-     * Registers the metric admin MBean for JMX access for the current
+-     * classloader. If an AdminMbean is found to have been registered under a
+-     * different class loader, the AdminMBean of the current class loader would
+-     * be registered under the same name {@link #MBEAN_OBJECT_NAME} but with an
+-     * additional suffix in the format of "/", where count is a counter
+-     * incrementing from 1.
+-     *
+-     * @return true if the registeration succeeded; false otherwise.
+-     */
+-    public static boolean registerMetricAdminMBean() {
+-        SdkMBeanRegistry registry = SdkMBeanRegistry.Factory.getMBeanRegistry();
+-        synchronized(AwsSdkMetrics.class) {
+-            if (registeredAdminMbeanName != null)
+-                return false;   // already registered
+-            boolean registered = registry.registerMetricAdminMBean(MBEAN_OBJECT_NAME);
+-            if (registered) {
+-                registeredAdminMbeanName = MBEAN_OBJECT_NAME;
+-            } else {
+-                String mbeanName = MBEAN_OBJECT_NAME;
+-                int count = 0;
+-                while (registry.isMBeanRegistered(mbeanName)) {
+-                    mbeanName = MBEAN_OBJECT_NAME + "/" + ++count;
+-                }
+-                registered = registry.registerMetricAdminMBean(mbeanName);
+-                if (registered)
+-                    registeredAdminMbeanName = mbeanName;
+-            }
+-            if (registered)
+-                log.debug("Admin mbean registered under " + registeredAdminMbeanName);
+-            return registered;
+-        }
+-    }
+-
+-    /**
+-     * Unregisters the metric admin MBean from JMX for the current classloader.
+-     *
+-     * @return true if the unregistration succeeded or if there is no admin
+-     *         MBean registered; false otherwise.
+-     */
+-    public static boolean unregisterMetricAdminMBean() {
+-        SdkMBeanRegistry registry = SdkMBeanRegistry.Factory.getMBeanRegistry();
+-        synchronized(AwsSdkMetrics.class) {
+-            if (registeredAdminMbeanName == null)
+-                return true;
+-            boolean success = registry.unregisterMBean(registeredAdminMbeanName);
+-            if (success)
+-                registeredAdminMbeanName = null;
+-            return success;
+-        }
+-    }
+-    /**
+-     * Returns a non-null request metric collector for the SDK. If no custom
+-     * request metric collector has previously been specified via
+-     * {@link #setMetricCollector(MetricCollector)} and the
+-     * {@link SDKGlobalConfiguration#DEFAULT_METRICS_SYSTEM_PROPERTY} has been set, then this method
+-     * will initialize and return the default metric collector provided by the
+-     * AWS SDK on a best-attempt basis.
+-     */
+-    public static  T getRequestMetricCollector() {
+-        if (mc == null) {
+-            if (isDefaultMetricsEnabled())
+-                enableDefaultMetrics();
+-        }
+-        @SuppressWarnings("unchecked")
+-        T t = (T)(mc == null ? RequestMetricCollector.NONE : mc.getRequestMetricCollector());
+-        return t;
+-    }
+-
+-    public static  T getServiceMetricCollector() {
+-        if (mc == null) {
+-            if (isDefaultMetricsEnabled())
+-                enableDefaultMetrics();
+-        }
+-        @SuppressWarnings("unchecked")
+-        T t = (T)(mc == null ? ServiceMetricCollector.NONE : mc.getServiceMetricCollector());
+-        return t;
+-    }
+-
+-    /**
+-     * This method should never be called by anyone except the JMX MBean used
+-     * for administrative purposes only.
+-     */
+-    static MetricCollector getInternalMetricCollector() {
+-        return mc;
+-    }
+-
+-    public static  T getMetricCollector() {
+-        if (mc == null) {
+-            if (isDefaultMetricsEnabled())
+-                enableDefaultMetrics();
+-        }
+-        @SuppressWarnings("unchecked")
+-        T t = (T)(mc == null ? MetricCollector.NONE : mc);
+-        return t;
+-    }
+-
+-    /**
+-     * Sets the metric collector to be used by the AWS SDK, and stop the
+-     * previously running collector used by the AWS SDK, if any. Note, however,
+-     * a request metric collector specified at the web service client level or
+-     * request level, if any, always takes precedence over the one specified at
+-     * the AWS SDK level.
+-     * 

+-     * Caller of this method is responsible for starting the new metric
+-     * collector specified as the input parameter.
+-     *
+-     * @param mc
+-     *            the metric collector to be used by the AWS SDK; or
+-     *            null if no metric collection is to be performed
+-     *            at the AWS SDK level.
+-     *
+-     * @see RequestMetricCollector
+-     * @see RequestMetricCollector#NONE
+-     */
+-    public static synchronized void setMetricCollector(MetricCollector mc) {
+-        MetricCollector old = AwsSdkMetrics.mc;
+-        AwsSdkMetrics.mc = mc;
+-        if (old != null) {
+-            old.stop();
+-        }
+-    }
+-
+-    /**
+-     * Used to set whether the machine metrics is to be excluded.
+-     *
+-     * @param excludeMachineMetrics true if machine metrics is to be excluded;
+-     * false otherwise.
+-     */
+-    public static void setMachineMetricsExcluded(boolean excludeMachineMetrics) {
+-        AwsSdkMetrics.machineMetricsExcluded = excludeMachineMetrics;
+-    }
+-
+-    /**
+-     * Used to set whether the per-host metrics is to be included.
+-     *
+-     * @param includePerHostMetrics true if per-host metrics is to be included;
+-     * false otherwise.
+-     */
+-    public static void setPerHostMetricsIncluded(boolean includePerHostMetrics) {
+-        AwsSdkMetrics.perHostMetricsIncluded = includePerHostMetrics;
+-    }
+-
+-    /**
+-     * Used to enable {@link Field#HttpSocketReadTime} metric since by default it is disabled.
+-     */
+-    public static void enableHttpSocketReadMetric() {
+-        AwsSdkMetrics.httpSocketReadMetricEnabled = true;
+-    }
+-
+-    /**
+-     * Returns true if the system property
+-     * {@link SDKGlobalConfiguration#DEFAULT_METRICS_SYSTEM_PROPERTY} has been
+-     * set; false otherwise.
+-     */
+-    public static boolean isDefaultMetricsEnabled() {
+-        return defaultMetricsEnabled;
+-    }
+-
+-    /**
+-     * Returns true if a single metric name space is to be used for all
+-     * levels of SDK generated CloudWatch metrics, including JVM level, host
+-     * level, etc.; false otherwise.
+-     */
+-    public static boolean isSingleMetricNamespace() {
+-        return singleMetricNamespace;
+-    }
+-
+-    /**
+-     * Used to set whether a single metric name space is to be used for all
+-     * levels of SDK generated CloudWatch metrics, including JVM level, host
+-     * level, etc.
+-     *
+-     * @param singleMetricNamespace
+-     *            true if single metric name is to be used; false otherwise.
+-     */
+-    public static void setSingleMetricNamespace(boolean singleMetricNamespace) {
+-        AwsSdkMetrics.singleMetricNamespace = singleMetricNamespace;
+-    }
+-
+-    /**
+-     * Returns true if metrics at the AWS SDK level is enabled; false
+-     * if disabled.
+-     */
+-    public static boolean isMetricsEnabled() {
+-        MetricCollector mc = AwsSdkMetrics.mc;
+-        return mc != null && mc.isEnabled();
+-    }
+-
+-    /**
+-     * Returns true if machine metrics is to be excluded.
+-     */
+-    public static boolean isMachineMetricExcluded() {
+-        return machineMetricsExcluded;
+-    }
+-
+-    /**
+-     * Returns true if the per-host metrics flag has been set; false otherwise.
+-     */
+-    public static boolean isPerHostMetricIncluded() {
+-        return perHostMetricsIncluded;
+-    }
+-
+-    /**
+-     * Returns true if per-host metrics is enabled; false otherwise.
+-     */
+-    public static boolean isPerHostMetricEnabled() {
+-        if (perHostMetricsIncluded)
+-            return true;
+-        String host = hostMetricName;
+-        host = host == null ? "" : host.trim();
+-        return host.length() > 0;
+-    }
+-
+-    /**
+-     * Returns true if HttpSocketReadMetric is enabled; false otherwise.
+-     */
+-    public static boolean isHttpSocketReadMetricEnabled() {
+-        return httpSocketReadMetricEnabled;
+-    }
+-
+-    /**
+-     * Starts the default AWS SDK metric collector, but
+-     * only if no metric collector is currently in use at the AWS SDK
+-     * level.
+-     *
+-     * @return true if the default AWS SDK metric collector has been
+-     *         successfully started by this call; false otherwise.
+-     */
+-    public static synchronized boolean enableDefaultMetrics() {
+-        if (mc == null || !mc.isEnabled()) {
+-            if (dirtyEnabling) {
+-                throw new IllegalStateException("Reentrancy is not allowed");
+-            }
+-            dirtyEnabling = true;
+-            try {
+-                Class c = Class.forName(DEFAULT_METRIC_COLLECTOR_FACTORY);
+-                MetricCollector.Factory f = (MetricCollector.Factory)c.newInstance();
+-                MetricCollector instance = f.getInstance();
+-                if (instance != null) {
+-                    setMetricCollector(instance);
+-                    return true;
+-                }
+-            } catch (Exception e) {
+-                LogFactory.getLog(AwsSdkMetrics.class)
+-                    .warn("Failed to enable the default metrics", e);
+-            } finally {
+-                dirtyEnabling = false;
+-            }
+-        }
+-        return false;
+-    }
+-
+-    /**
+-     * Convenient method to disable the metric collector at the AWS SDK
+-     * level.
+-     */
+-    public static void disableMetrics() {
+-        setMetricCollector(MetricCollector.NONE);
+-    }
+-
+-    /**
+-     * Adds the given metric type to the registry of predefined metrics to be
+-     * captured at the AWS SDK level.
+-     *
+-     * @return true if the set of predefined metric types gets changed as a
+-     *        result of the call
+-     */
+-    public static boolean add(MetricType type) {
+-        return type == null ? false : registry.addMetricType(type);
+-    }
+-    /**
+-     * Adds the given metric types to the registry of predefined metrics to be
+-     * captured at the AWS SDK level.
+-     *
+-     * @return true if the set of predefined metric types gets changed as a
+-     *        result of the call
+-     */
+-    public static  boolean addAll(Collection types) {
+-        return types == null || types.size() == 0
+-             ? false
+-             : registry.addMetricTypes(types);
+-    }
+-    /**
+-     * Sets the given metric types to replace the registry of predefined metrics
+-     * to be captured at the AWS SDK level.
+-     */
+-    public static  void set(Collection types) {
+-        registry.setMetricTypes(types);
+-    }
+-    /**
+-     * Removes the given metric type from the registry of predefined metrics to
+-     * be captured at the AWS SDK level.
+-     *
+-     * @return true if the set of predefined metric types gets changed as a
+-     *        result of the call
+-     */
+-    public static boolean remove(MetricType type) {
+-        return type == null ? false : registry.removeMetricType(type);
+-    }
+-    /**
+-     * Returns an unmodifiable set of the current predefined metrics.
+-     */
+-    public static Set getPredefinedMetrics() {
+-        return registry.predefinedMetrics();
+-    }
+-
+-    /**
+-     * Returns the credential provider for the default AWS SDK metric implementation.
+-     * This method is restricted to calls from the default AWS SDK metric implementation.
+-     *
+-     * @throws SecurityException if called outside the default AWS SDK metric implementation.
+-     */
+-    public static AWSCredentialsProvider getCredentialProvider() {
+-        StackTraceElement[] e = Thread.currentThread().getStackTrace();
+-        for (int i=0; i < e.length; i++) {
+-            if (e[i].getClassName().equals(DEFAULT_METRIC_COLLECTOR_FACTORY)) {
+-                return credentialProvider;
+-            }
+-        }
+-        SecurityException ex = new SecurityException();
+-        LogFactory.getLog(AwsSdkMetrics.class).warn("Illegal attempt to access the credential provider", ex);
+-        throw ex;
+-    }
+-
+-    /**
+-     * Sets the credential provider for the default AWS SDK metric
+-     * implementation; or null if the default is to be used. Calling this method
+-     * may result in the credential provider being different from the credential
+-     * file property.
+-     */
+-    public static synchronized void setCredentialProvider(
+-            AWSCredentialsProvider provider) {
+-        credentialProvider = provider;
+-    }
+-
+-    /**
+-     * Returns the region configured for the default AWS SDK metric collector;
+-     * or null if the default is to be used.
+-     *
+-     * @throws IllegalArgumentException when using a region not included in
+-     * {@link Regions}
+-     *
+-     * @deprecated Use {@link #getRegionName()}
+-     */
+-    public static Regions getRegion() throws IllegalArgumentException {
+-        return Regions.fromName(region.getName());
+-    }
+-
+-    /**
+-     * Returns the region name configured for the default AWS SDK metric collector;
+-     * or null if the default is to be used.
+-     */
+-    public static String getRegionName() {
+-        return region == null ? null : region.getName();
+-    }
+-
+-    /**
+-     * Sets the region to be used for the default AWS SDK metric collector;
+-     * or null if the default is to be used.
+-     */
+-    public static void setRegion(Regions region) {
+-        AwsSdkMetrics.region = RegionUtils.getRegion(region.getName());
+-    }
+-
+-    /**
+-     * Sets the region to be used for the default AWS SDK metric collector;
+-     * or null if the default is to be used.
+-     */
+-    public static void setRegion(String region) {
+-        AwsSdkMetrics.region = RegionUtils.getRegion(region);
+-    }
+-
+-    /**
+-     * Returns the last set AWS credential file, or null if there is none.
+-     */
+-    public static String getCredentailFile() {
+-        return credentialFile;
+-    }
+-
+-    /**
+-     * Sets the AWS credential file to be used for accessing Amazon CloudWatch.
+-     * Successfully calling this method would result in the AWS credential
+-     * provider to make use of the given credential file.
+-     */
+-    public static void setCredentialFile(String filepath)
+-            throws FileNotFoundException, IOException {
+-        setCredentialFile0(filepath);
+-    }
+-
+-    /**
+-     * Internal method to implement the {@link #setCredentialFile(String)}.
+-     */
+-    private static void setCredentialFile0(String filepath)
+-            throws FileNotFoundException, IOException {
+-        final PropertiesCredentials cred =
+-            new PropertiesCredentials(new File(filepath));
+-        synchronized(AwsSdkMetrics.class) {
+-            credentialProvider = new AWSCredentialsProvider() {
+-                @Override public void refresh() {}
+-                @Override public AWSCredentials getCredentials() {
+-                    return cred;
+-                }
+-            };
+-            AwsSdkMetrics.credentialFile = filepath;
+-        }
+-    }
+-
+-    /**
+-     * Returns the internal metric queue size to be used for the default AWS SDK
+-     * metric collector; or null if the default is to be used.
+-     */
+-    public static Integer getMetricQueueSize() {
+-        return metricQueueSize;
+-    }
+-
+-    /**
+-     * Sets the metric queue size to be used for the default AWS SDK metric collector;
+-     * or null if the default is to be used.
+-     */
+-    public static void setMetricQueueSize(Integer size) {
+-        metricQueueSize = size;
+-    }
+-
+-    /**
+-     * Returns the internal metric queue timeout in millisecond to be used for
+-     * the default AWS SDK metric collector; or null if the default is to be
+-     * used.
+-     */
+-    public static Long getQueuePollTimeoutMilli() {
+-        return queuePollTimeoutMilli;
+-    }
+-
+-    /**
+-     * Sets the queue poll time in millisecond to be used for the default AWS
+-     * SDK metric collector; or null if the default is to be used.
+-     */
+-    public static void setQueuePollTimeoutMilli(Long timeoutMilli) {
+-        queuePollTimeoutMilli = timeoutMilli;
+-    }
+-
+-    /**
+-     * Returns the metric name space, which is never null or blank.
+-     */
+-    public static String getMetricNameSpace() {
+-        return metricNameSpace;
+-    }
+-
+-    /**
+-     * Sets the metric name space.
+-     *
+-     * @param metricNameSpace
+-     *            metric name space which must neither be null or blank.
+-     *
+-     * @throws IllegalArgumentException
+-     *             if the specified metric name space is either null or blank.
+-     */
+-    public static void setMetricNameSpace(String metricNameSpace) {
+-        if (metricNameSpace == null || metricNameSpace.trim().length() == 0)
+-            throw new IllegalArgumentException();
+-        AwsSdkMetrics.metricNameSpace = metricNameSpace;
+-    }
+-
+-    /**
+-     * Returns the name of the JVM for generating per-JVM level metrics;
+-     * or null or blank if per-JVM level metrics are disabled.
+-     */
+-    public static String getJvmMetricName() {
+-        return jvmMetricName;
+-    }
+-
+-    /**
+-     * Sets the name of the JVM for generating per-JVM level metrics.
+-     *
+-     * @param jvmMetricName
+-     *            name of the JVM for generating per-JVM level metrics; or null
+-     *            or blank if per-JVM level metrics are to be disabled.
+-     */
+-    public static void setJvmMetricName(String jvmMetricName) {
+-        AwsSdkMetrics.jvmMetricName = jvmMetricName;
+-    }
+-
+-    /**
+-     * Returns the host name for generating per-host level metrics; or
+-     * null or blank if the host is to be automatically detected via
+-     * {@link InetAddress}.
+-     */
+-    public static String getHostMetricName() {
+-        return hostMetricName;
+-    }
+-
+-    /**
+-     * Sets the host name for generating per-host level metrics.
+-     *
+-     * @param hostMetricName
+-     *            host name for generating per-host level metrics; or
+-     *            null or blank if the host is to be automatically detected via
+-     *            {@link InetAddress}.
+-     */
+-    public static void setHostMetricName(String hostMetricName) {
+-        AwsSdkMetrics.hostMetricName = hostMetricName;
+-    }
+-
+-    /**
+-     * Used as a registry for the predefined metrics to be captured by the
+-     * metric collector at the AWS SDK level.
+-     */
+-    private static class MetricRegistry {
+-        private final Set metricTypes = new HashSet();
+-        private volatile Set readOnly;
+-
+-        MetricRegistry() {
+-            metricTypes.add(Field.ClientExecuteTime);
+-            metricTypes.add(Field.Exception);
+-            metricTypes.add(Field.ThrottleException);
+-            metricTypes.add(Field.HttpClientRetryCount);
+-            metricTypes.add(Field.HttpRequestTime);
+-            metricTypes.add(Field.RequestCount);
+-//            metricTypes.add(Field.RequestSigningTime);
+-//            metricTypes.add(Field.ResponseProcessingTime);
+-            metricTypes.add(Field.RetryCount);
+-            metricTypes.add(Field.RetryCapacityConsumed);
+-            metricTypes.add(Field.ThrottledRetryCount);
+-            metricTypes.add(Field.HttpClientSendRequestTime);
+-            metricTypes.add(Field.HttpClientReceiveResponseTime);
+-            metricTypes.add(Field.HttpSocketReadTime);
+-            metricTypes.add(Field.HttpClientPoolAvailableCount);
+-            metricTypes.add(Field.HttpClientPoolLeasedCount);
+-            metricTypes.add(Field.HttpClientPoolPendingCount);
+-            metricTypes.add(AWSServiceMetrics.HttpClientGetConnectionTime);
+-            syncReadOnly();
+-        }
+-
+-        private void syncReadOnly() {
+-            readOnly = Collections.unmodifiableSet(new HashSet(metricTypes));
+-        }
+-
+-        public boolean addMetricType(MetricType type) {
+-            synchronized(metricTypes) {
+-                boolean added = metricTypes.add(type);
+-                if (added)
+-                    syncReadOnly();
+-                return added;
+-            }
+-        }
+-        public  boolean addMetricTypes(Collection types) {
+-            synchronized(metricTypes) {
+-                boolean added = metricTypes.addAll(types);
+-                if (added)
+-                    syncReadOnly();
+-                return added;
+-            }
+-        }
+-        public  void setMetricTypes(Collection types) {
+-            synchronized(metricTypes) {
+-                if (types == null || types.size() == 0) {
+-                    if (metricTypes.size() == 0)
+-                        return;
+-                    if (types == null)
+-                        types = Collections.emptyList();
+-                }
+-                metricTypes.clear();
+-                if (!addMetricTypes(types)) {
+-                    syncReadOnly(); // avoid missing sync
+-                }
+-            }
+-        }
+-        public boolean removeMetricType(MetricType type) {
+-            synchronized(metricTypes) {
+-                boolean removed = metricTypes.remove(type);
+-                if (removed)
+-                    syncReadOnly();
+-                return removed;
+-            }
+-        }
+-        public Set predefinedMetrics() {
+-            return readOnly;
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/metrics/ByteThroughputHelper.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/ByteThroughputHelper.java
+--- ./src/main/java/com/amazonaws/metrics/ByteThroughputHelper.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/ByteThroughputHelper.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,53 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.metrics;
+-
+-import java.util.concurrent.TimeUnit;
+-
+-/**
+- * Helper class to capture the byte throughput.
+- * 

+- * Note this class is only relevant
+- * when metric is enabled. Otherwise it should not even be involved in the call
+- * stack to minimize runtime overhead.
+- */
+-class ByteThroughputHelper extends ByteThroughputProvider {
+-    private static final int REPORT_INTERVAL_SECS = 10;
+-
+-    ByteThroughputHelper(ThroughputMetricType type) {
+-        super(type);
+-    }
+-
+-    long startTiming() {
+-        if (TimeUnit.NANOSECONDS.toSeconds(getDurationNano()) > REPORT_INTERVAL_SECS) {
+-            reportMetrics();
+-        }
+-        return System.nanoTime();
+-    }
+-    
+-
+-    void reportMetrics() {
+-        if (getByteCount() > 0) {
+-            ServiceMetricCollector col = AwsSdkMetrics.getServiceMetricCollector();
+-            col.collectByteThroughput(this);
+-            reset();
+-        }
+-    }
+-
+-    @Override
+-    public void increment(int bytesDelta, long startTimeNano) {
+-        super.increment(bytesDelta, startTimeNano);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/metrics/ByteThroughputProvider.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/ByteThroughputProvider.java
+--- ./src/main/java/com/amazonaws/metrics/ByteThroughputProvider.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/ByteThroughputProvider.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,57 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.metrics;
+-
+-/**
+- * Byte throughput metric information provider.
+- */
+-public abstract class ByteThroughputProvider {
+-    private long duration;
+-    private int byteCount;
+-    private final ThroughputMetricType throughputType;
+-
+-    protected ByteThroughputProvider(ThroughputMetricType type) { this.throughputType = type; }
+-    public ThroughputMetricType getThroughputMetricType() { return throughputType; }
+-    public int getByteCount() { return byteCount; }
+-    public long getDurationNano() { return duration; }
+-    
+-    /**
+-     * Returns a provider id that can be used to compute the number of active
+-     * byte throughput provider of a specific metric type being active in a
+-     * given time interval.
+-     */
+-    public String getProviderId() { return super.toString(); }
+-    
+-    /**
+-     * @param bytesDelta the number of bytes to increment
+-     * @param startTimeNano the start time in nano seconds
+-     */
+-    protected void increment(int bytesDelta, long startTimeNano) {
+-        this.byteCount += bytesDelta;
+-        this.duration += System.nanoTime() - startTimeNano;
+-    }
+-    
+-    protected void reset() {
+-        this.byteCount = 0;
+-        this.duration = 0;
+-    }
+-
+-    @Override
+-    public String toString() {
+-        return String.format(
+-                "providerId=%s, throughputType=%s, byteCount=%d, duration=%d",
+-                getProviderId(), throughputType, byteCount, duration);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/metrics/internal/ServiceMetricTypeGuesser.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/internal/ServiceMetricTypeGuesser.java
+--- ./src/main/java/com/amazonaws/metrics/internal/ServiceMetricTypeGuesser.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/internal/ServiceMetricTypeGuesser.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,54 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.metrics.internal;
+-
+-import com.amazonaws.AmazonWebServiceRequest;
+-import com.amazonaws.Request;
+-import com.amazonaws.metrics.AwsSdkMetrics;
+-import com.amazonaws.metrics.ServiceMetricType;
+-import com.amazonaws.metrics.SimpleThroughputMetricType;
+-import com.amazonaws.metrics.ThroughputMetricType;
+-
+-/**
+- * An internal helper factory for generating service specific {@link ServiceMetricType}
+- * without causing compile time dependency on the service specific artifacts.
+- * 
+- * There exists a S3ServiceMetricTest.java unit test in the S3 client library
+- * that ensures this class behaves consistently with the service metric enum
+- * defined in the S3 client library.
+- */
+-public enum ServiceMetricTypeGuesser {
+-    ;
+-    /**
+-     * Returned the best-guessed throughput metric type for the given request,
+-     * or null if there is none or if metric is disabled.
+-     */
+-    public static ThroughputMetricType guessThroughputMetricType(
+-            final Request req,
+-            final String metricNameSuffix,
+-            final String byteCountMetricNameSuffix)
+-    {
+-        if (!AwsSdkMetrics.isMetricsEnabled())
+-            return null;    // metric disabled
+-        Object orig = req.getOriginalRequestObject();
+-        if (orig.getClass().getName().startsWith("com.amazonaws.services.s3")) {
+-            return new SimpleThroughputMetricType(
+-                "S3" + metricNameSuffix,
+-                req.getServiceName(),
+-                "S3" + byteCountMetricNameSuffix);
+-        }
+-        return null;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/metrics/MetricAdmin.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/MetricAdmin.java
+--- ./src/main/java/com/amazonaws/metrics/MetricAdmin.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/MetricAdmin.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,142 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon Technologies, Inc.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at:
+- *
+- *    http://aws.amazon.com/apache2.0
+- *
+- * This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+- * OR CONDITIONS OF ANY KIND, either express or implied. See the
+- * License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package com.amazonaws.metrics;
+-
+-import java.io.FileNotFoundException;
+-import java.io.IOException;
+-
+-import com.amazonaws.regions.Regions;
+-
+-/**
+- *  Administration of AwsSdkMetrics as an MBean.
+- */
+-public class MetricAdmin implements MetricAdminMBean {
+-    @Override
+-    public boolean enableDefaultMetrics() {
+-        return AwsSdkMetrics.enableDefaultMetrics();
+-    }
+-    @Override
+-    public void disableMetrics() {
+-        AwsSdkMetrics.disableMetrics();
+-    }
+-    @Override
+-    public String getRequestMetricCollector() {
+-        MetricCollector mc = AwsSdkMetrics.getInternalMetricCollector();
+-        RequestMetricCollector rmc = mc == null ? null : mc.getRequestMetricCollector();
+-        return mc == null || rmc == RequestMetricCollector.NONE
+-             ? "NONE"
+-             : rmc.getClass().getName()
+-             ;
+-    }
+-    @Override
+-    public String getServiceMetricCollector() {
+-        MetricCollector mc = AwsSdkMetrics.getInternalMetricCollector();
+-        ServiceMetricCollector smc = mc == null ? null : mc.getServiceMetricCollector();
+-        return mc == null || smc == ServiceMetricCollector.NONE
+-             ? "NONE"
+-             : smc.getClass().getName()
+-             ;
+-    }
+-    @Override
+-    public boolean isMetricsEnabled() {
+-        return AwsSdkMetrics.isMetricsEnabled();
+-    }
+-
+-    @Override
+-    public boolean isMachineMetricsExcluded() {
+-        return AwsSdkMetrics.isMachineMetricExcluded();
+-    }
+-    @Override
+-    public void setMachineMetricsExcluded(boolean excludeJvmMetrics) {
+-        AwsSdkMetrics.setMachineMetricsExcluded(excludeJvmMetrics);
+-    }
+-    @Override
+-    public String getRegion() {
+-        return AwsSdkMetrics.getRegionName();
+-    }
+-    @Override
+-    public void setRegion(String region) {
+-        AwsSdkMetrics.setRegion(region);
+-    }
+-    @Override
+-    public Integer getMetricQueueSize() {
+-        return AwsSdkMetrics.getMetricQueueSize();
+-    }
+-    @Override
+-    public void setMetricQueueSize(Integer metricQueueSize) {
+-        AwsSdkMetrics.setMetricQueueSize(metricQueueSize);
+-
+-    }
+-    @Override
+-    public Integer getQueuePollTimeoutMilli() {
+-        Long queuePollTimeoutMilli = AwsSdkMetrics.getQueuePollTimeoutMilli();
+-        return queuePollTimeoutMilli == null ? null : queuePollTimeoutMilli.intValue();
+-    }
+-    @Override
+-    public void setQueuePollTimeoutMilli(Integer timeoutMilli) {
+-        AwsSdkMetrics.setQueuePollTimeoutMilli(timeoutMilli == null ? null : timeoutMilli.longValue());
+-    }
+-    @Override
+-    public String getMetricNameSpace() {
+-        return AwsSdkMetrics.getMetricNameSpace();
+-    }
+-    @Override
+-    public void setMetricNameSpace(String metricNameSpace) {
+-        AwsSdkMetrics.setMetricNameSpace(metricNameSpace);
+-    }
+-
+-    @Override
+-    public boolean isPerHostMetricsIncluded() {
+-        return AwsSdkMetrics.isPerHostMetricIncluded();
+-    }
+-    @Override
+-    public void setPerHostMetricsIncluded(boolean includePerHostMetrics) {
+-        AwsSdkMetrics.setPerHostMetricsIncluded(includePerHostMetrics);
+-    }
+-    @Override
+-    public String getJvmMetricName() {
+-        return AwsSdkMetrics.getJvmMetricName();
+-    }
+-    @Override
+-    public void setJvmMetricName(String jvmMetricName) {
+-        AwsSdkMetrics.setJvmMetricName(jvmMetricName);
+-    }
+-    @Override
+-    public String getHostMetricName() {
+-        return AwsSdkMetrics.getHostMetricName();
+-    }
+-    @Override
+-    public void setHostMetricName(String hostMetricName) {
+-        AwsSdkMetrics.setHostMetricName(hostMetricName);
+-    }
+-    @Override
+-    public String getCredentialFile() {
+-        return AwsSdkMetrics.getCredentailFile();
+-    }
+-
+-    @Override
+-    public void setCredentialFile(String filepath)
+-            throws FileNotFoundException, IOException {
+-        AwsSdkMetrics.setCredentialFile(filepath);
+-    }
+-    @Override
+-    public boolean isSingleMetricNamespace() {
+-        return AwsSdkMetrics.isSingleMetricNamespace();
+-    }
+-    @Override
+-    public void setSingleMetricNamespace(boolean singleMetricNamespace) {
+-        AwsSdkMetrics.setSingleMetricNamespace(singleMetricNamespace);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/metrics/MetricAdminMBean.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/MetricAdminMBean.java
+--- ./src/main/java/com/amazonaws/metrics/MetricAdminMBean.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/MetricAdminMBean.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,187 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon Technologies, Inc.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at:
+- *
+- *    http://aws.amazon.com/apache2.0
+- *
+- * This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+- * OR CONDITIONS OF ANY KIND, either express or implied. See the
+- * License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package com.amazonaws.metrics;
+-
+-import java.io.FileNotFoundException;
+-import java.io.IOException;
+-import java.net.InetAddress;
+-
+-/**
+- * MBean interface for AwsSdkMetrics administration.
+- */
+-public interface MetricAdminMBean {
+-    /**
+-     * Returns true if metrics at the AWS SDK level is enabled; false if
+-     * disabled.
+-     */
+-    public boolean isMetricsEnabled();
+-
+-    /**
+-     * Returns the name of the request metric collector set at the AWS SDK
+-     * level, or NONE if there is none.
+-     */
+-    public String getRequestMetricCollector();
+-
+-    /**
+-     * Returns the name of the service metric collector set at the AWS SDK
+-     * level, or NONE if there is none.
+-     */
+-    public String getServiceMetricCollector();
+-
+-    /**
+-     * Starts the default AWS SDK metric collector, but only if no metric
+-     * collector is currently in use at the AWS SDK level.
+-     * 
+-     * @return true if the default AWS SDK metric collector has been
+-     *         successfully started by this call; false otherwise.
+-     */
+-    public boolean enableDefaultMetrics();
+-
+-    /**
+-     * Disables the metric collector at the AWS SDK level.
+-     */
+-    public void disableMetrics();
+-
+-    /**
+-     * Returns true if machine metrics is to be excluded; false otherwise.
+-     */
+-    public boolean isMachineMetricsExcluded();
+-
+-    /**
+-     * Used to set whether the JVM metrics is to be excluded.
+-     * 
+-     * @param excludeMachineMetrics
+-     *            true if JVM metrics is to be excluded; false otherwise.
+-     */
+-    public void setMachineMetricsExcluded(boolean excludeMachineMetrics);
+-
+-    /**
+-     * Returns true if per-host metrics is to be included; false otherwise.
+-     */
+-    public boolean isPerHostMetricsIncluded();
+-
+-    /**
+-     * Used to set whether the per-host metrics is to be included.
+-     * 
+-     * @param includePerHostMetrics
+-     *            true if per-host metrics is to be included; false otherwise.
+-     */
+-    public void setPerHostMetricsIncluded(boolean includePerHostMetrics);
+-
+-    /**
+-     * Returns the region configured for the default AWS SDK metric collector;
+-     * or null if the default is to be used.
+-     */
+-    public String getRegion();
+-
+-    /**
+-     * Sets the region to be used for the default AWS SDK metric collector; or
+-     * null if the default is to be used.
+-     */
+-    public void setRegion(String region);
+-
+-    /**
+-     * Returns the last set AWS credential file; or null if there is none.
+-     */
+-    public String getCredentialFile();
+-
+-    /**
+-     * Sets the AWS credential file used by the default AWS SDK metric collector
+-     * for accessing CloudWatch.
+-     * 
+-     * @param filepath
+-     *            must be a valid path to an AWS credential property file.
+-     */
+-    public void setCredentialFile(String filepath)
+-        throws FileNotFoundException, IOException;
+-
+-    /**
+-     * Returns the internal metric queue size to be used for the default AWS SDK
+-     * metric collector; or null if the default is to be used.
+-     */
+-    public Integer getMetricQueueSize();
+-
+-    /**
+-     * Sets the metric queue size to be used for the default AWS SDK metric
+-     * collector; or null if the default is to be used.
+-     */
+-    public void setMetricQueueSize(Integer metricQueueSize);
+-
+-    /**
+-     * Returns the internal metric queue timeout in millisecond to be used for
+-     * the default AWS SDK metric collector; or null if the default is to be
+-     * used. Use Integer instead of Long as it seems jconsole does not handle
+-     * Long properly.
+-     */
+-    public Integer getQueuePollTimeoutMilli();
+-
+-    /**
+-     * Sets the queue poll time in millisecond to be used for the default AWS
+-     * SDK metric collector; or null if the default is to be used. Use Integer
+-     * instead of Long as it seems jconsole does not handle Long properly.
+-     */
+-    public void setQueuePollTimeoutMilli(Integer timeoutMilli);
+-
+-    /**
+-     * Returns the metric name space.
+-     */
+-    public String getMetricNameSpace();
+-
+-    /**
+-     * Sets the metric name space.
+-     * 
+-     * @throws IllegalArgumentException
+-     *             if the given name space is either null or blank.
+-     */
+-    public void setMetricNameSpace(String metricNameSpace);
+-
+-    /**
+-     * Returns the JVM metric name. If the returned value is either null or
+-     * blank, no JVM level metrics will be generated.
+-     */
+-    public String getJvmMetricName();
+-
+-    /**
+-     * Sets the JVM metric name to enable per-JVM level metrics generation. If
+-     * the given value is either null or blank, no JVM level metrics will be
+-     * generated.
+-     */
+-    public void setJvmMetricName(String jvmMetricName);
+-
+-    /**
+-     * Returns the host name for metric purposes. If the returned value is
+-     * either null or blank, the host name will be automatically detected via
+-     * {@link InetAddress}.
+-     */
+-    public String getHostMetricName();
+-
+-    /**
+-     * Sets the host name to enable per-host level metrics generation. If
+-     * the given value is either null or blank but the per-host metric is
+-     * enabled, the host name will be automatically detected via
+-     * {@link InetAddress}.
+-     */
+-    public void setHostMetricName(String hostMetricName);
+-
+-    /**
+-     * Returns true if single metric name space is to be used; false otherwise.
+-     */
+-    public boolean isSingleMetricNamespace();
+-
+-    /**
+-     * Used to set whether a single metric name space is to be used.
+-     */
+-    public void setSingleMetricNamespace(boolean singleMetricNamespace);
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/metrics/MetricCollector.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/MetricCollector.java
+--- ./src/main/java/com/amazonaws/metrics/MetricCollector.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/MetricCollector.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,67 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.metrics;
+-
+-
+-/**
+- * Metric Collector SPI.  This is a class instead of interface so in case of
+- * adding new methods in the future we can do that safetly without breaking
+- * any existing clients that implements this SPI.
+- */
+-public abstract class MetricCollector 
+-{
+-    /**
+-     * Can be used to serve as a factory for the request metric collector.
+-     */
+-    public static interface Factory {
+-        /**
+-         * Returns an instance of the collector; or null if if failed to create
+-         * one.
+-         */
+-        public MetricCollector getInstance();
+-    }
+-    /**
+-     * Starts the request metric collector.
+-     * 
+-     * @return true if the collector is successfully started; false otherwise.
+-     */
+-    public abstract boolean start();
+-
+-    /** 
+-     * Stops the request metric collector.
+-     *
+-     * @return true if the collector is successfully stopped; false if the
+-     *         collector is not running and therefore the call has no effect.
+-     */
+-    public abstract boolean stop();
+-    /** Returns true if this collector is enabled; false otherwise. */
+-    public abstract boolean isEnabled();
+-    public abstract RequestMetricCollector getRequestMetricCollector();
+-    public abstract ServiceMetricCollector getServiceMetricCollector();
+-
+-    /** A convenient instance of a no-op request metric collector. */
+-    public static final MetricCollector NONE = new MetricCollector() {
+-        @Override public boolean start() { return true; }
+-        @Override public boolean stop() { return true; }
+-        /** Always returns false. */
+-        @Override public boolean isEnabled() { return false; }
+-        @Override public RequestMetricCollector getRequestMetricCollector() {
+-            return RequestMetricCollector.NONE;
+-        }
+-        @Override public ServiceMetricCollector getServiceMetricCollector() {
+-            return ServiceMetricCollector.NONE;
+-        }
+-    };
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/metrics/MetricFilterInputStream.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/MetricFilterInputStream.java
+--- ./src/main/java/com/amazonaws/metrics/MetricFilterInputStream.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/MetricFilterInputStream.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,60 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.metrics;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import com.amazonaws.internal.SdkFilterInputStream;
+-
+-/**
+- * Used to capture the input stream throughput metrics, but excluding the
+- * {@link #read()} API.
+- * 

+- * Note this class is only relevant
+- * when metric is enabled. Otherwise it should not even be involved in the call
+- * stack to minimize runtime overhead.
+- */
+-public class MetricFilterInputStream extends SdkFilterInputStream {
+-    private final ByteThroughputHelper helper;
+-
+-    public MetricFilterInputStream(ThroughputMetricType type, InputStream in) {
+-        super(in);
+-        helper = new ByteThroughputHelper(type);
+-    }
+-
+-    @Override
+-    public int read(byte b[], int off, int len) throws IOException {
+-        abortIfNeeded();
+-        long startNano = helper.startTiming();
+-        int bytesRead = in.read(b, off, len);
+-        if (bytesRead > 0) {
+-            helper.increment(bytesRead, startNano);
+-        }
+-        return bytesRead;
+-    }
+-
+-    @Override
+-    public void close() throws IOException {
+-        helper.reportMetrics();
+-        in.close();
+-        abortIfNeeded();
+-    }
+-
+-    @Override
+-    public final boolean isMetricActivated() {
+-        return true;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/metrics/MetricInputStreamEntity.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/MetricInputStreamEntity.java
+--- ./src/main/java/com/amazonaws/metrics/MetricInputStreamEntity.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/MetricInputStreamEntity.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,106 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.metrics;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.io.OutputStream;
+-
+-import org.apache.http.entity.ContentType;
+-import org.apache.http.entity.InputStreamEntity;
+-
+-import com.amazonaws.internal.MetricAware;
+-
+-/**
+- * Used to help capture the throughput metrics.
+- * 

+- * Note this class is only relevant
+- * when metric is enabled. Otherwise it should not even be involved in the call
+- * stack to minimize runtime overhead.
+- */
+-public class MetricInputStreamEntity extends InputStreamEntity {
+-    private final static int BUFFER_SIZE = 2048;
+-    private final ByteThroughputHelper helper;
+-
+-    public MetricInputStreamEntity(ThroughputMetricType metricType,
+-            InputStream instream, long length) {
+-        super(instream, length);
+-        helper = new ByteThroughputHelper(metricType);
+-    }
+-
+-    public MetricInputStreamEntity(ThroughputMetricType metricType,
+-            final InputStream instream, long length,
+-            final ContentType contentType) {
+-        super(instream, length, contentType);
+-        helper = new ByteThroughputHelper(metricType);
+-    }
+-
+-    @Override
+-    public void writeTo(final OutputStream outstream) throws IOException {
+-        if (outstream instanceof MetricAware) {
+-            // hchar: There is currently no implementation of output stream that
+-            // has metric gathering capability but there could be!
+-            // So the code here is for future proof purposes.
+-            MetricAware aware = (MetricAware)outstream;
+-            if (aware.isMetricActivated()) {
+-                // let the underlying output stream takes care of byte counting
+-                super.writeTo(outstream);
+-                return;
+-            }
+-        }
+-        writeToWithMetrics(outstream);
+-    }
+-
+-    /**
+-     * Copied from {{@link InputStreamEntity#writeTo(OutputStream)} but modified
+-     * to capture metrics for the output stream.
+-     */
+-    private void writeToWithMetrics(final OutputStream outstream) throws IOException {
+-        if (outstream == null) {
+-            throw new IllegalArgumentException("Output stream may not be null");
+-        }
+-        final InputStream content = getContent();
+-        final long length = getContentLength();
+-        InputStream instream = content;
+-        try {
+-            byte[] buffer = new byte[BUFFER_SIZE];
+-            int l;
+-            if (length < 0) {
+-                // consume until EOF
+-                while ((l = instream.read(buffer)) != -1) {
+-                    long startNano = helper.startTiming();
+-                    outstream.write(buffer, 0, l);
+-                    helper.increment(l, startNano);
+-                }
+-            } else {
+-                // consume no more than length
+-                long remaining = length;
+-                while (remaining > 0) {
+-                    l = instream.read(buffer, 0, (int)Math.min(BUFFER_SIZE, remaining));
+-                    if (l == -1) {
+-                        break;
+-                    }
+-                    long startNano = helper.startTiming();
+-                    outstream.write(buffer, 0, l);
+-                    helper.increment(l, startNano);
+-                    remaining -= l;
+-                }
+-            }
+-        } finally {
+-            helper.reportMetrics();
+-            instream.close();
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/metrics/MetricType.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/MetricType.java
+--- ./src/main/java/com/amazonaws/metrics/MetricType.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/MetricType.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,27 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.metrics;
+-
+-/**
+- * Metric type.
+- */
+-public interface MetricType {
+-    /**
+-     * Non-null name of the metric type. Used to uniquely identify the metric
+-     * type. Therefore, the name returned must be globally unique across all
+-     * metric types that implement this interface.
+-     */
+-    public String name();
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/metrics/package-info.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/package-info.java
+--- ./src/main/java/com/amazonaws/metrics/package-info.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/package-info.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,120 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-/**
+- * Classes used to support the AWS SDK metrics API.
+- * 
+- * When the default metric collection system is enabled, 
+- * the default AWS SDK implementation
+- * captures a set of predefined core metrics that are grouped under three major 
+- * categories:  AWS Request Metrics, AWS Service Metrics, and Machine Metrics.
+- * 
Nomenclature

+- * 
    
+- * 
  • Physical Http Request - an http request initiated by the http client library used by AWS Java SDK . No retry is involved, or at least not initiated from the JVM.
    • 
+- * 
  • Logical Http Request - an http request initiated from the AWS Java SDK by executing the underlying http client library. A logical request may involve multiple physical requests due to retries.
    • 
+- * 
  • Service Client type - the specific subtype of AmazonWebServiceClient, such as AmazonS3Client, AmazonDynamoDBClient, etc.
    • 
+- * 
  • Request type - the specific subtype of AmazonWebServiceRequest, such as PutItemRequest, PutObjectRequest, etc.
    • 
+- * 
  • Http Client Library - the Apache HttpComponents client library
    • 
+- * 

+- * 
+- * 
AWS Request Metrics

+- * 
    
+- * 
  1. ClientExecuteTime - Total number of milliseconds taken for a 
+- * request/response including the time taken to execute the request handlers,
+- * round trip to AWS, and the time taken to execute the response handlers.
+- * Captured on a per request type level.
    2. 
+- * 
  2. Exception - Number of logical request failure. Captured both on a per service 
+- * client type level and a per request type level.
    3. 
+- * 
  3. HttpClientPoolAvailableCount - Number of idle persistent connections of
+- * the underlying httpclient.
+- * This metric is collected from the respective PoolStats before the connection of a request is obtained.
    4. 
+- * 
  4. HttpClientPoolLeasedCount - Number of persistent connections tracked by 
+- * the underlying httpclient connection manager currently being used to execute
+- * requests.
+- * This metric is collected from the respective PoolStats before the connection of a request is obtained.
    5. 
+- * 
  5. HttpClientPoolPendingCount - Number of connection requests being blocked
+- * awaiting a free connection of the underlying httpclient.
+- * This metric is collected from the respective PoolStats. before the connection of a request is obtained
    6. 
+- * 
  6. HttpRequestTime - Number of milliseconds taken for a logical request/response 
+- * round trip to AWS. Captured on a per request type level.
    7. 
+- * 
  7. HttpClientSendRequestTime - Number of milliseconds taken for a physical request
+- * to get sent to AWS. Captured on a per request type level.
    8. 
+- * 
  8. HttpClientReceiveResponseTime - Number of milliseconds taken for a physical response
+- * to get received from AWS. Captured on a per request type level.
    9. 
+- * 
  9. HttpClientRetryCount - Number of retries per physical request. Captured on a per service 
+- * client type level. 
    10. 
+- * 
  10. RequestCount - Number of logical requests. Captured on a per service 
+- * client type level. 
    11. 
+- * 
  11. RetryCount - Number of retries per logical request. Captured on a per service 
+- * client type level. 
    12. 
+- * 
  12. ThrottleException - Number of times of a request has been throttled by the service.
    13. 
+- * 
  13. DynamoDBConsumedCapacity - Number of Amazon DynamoDB capacity units consumed.
+- * Captured on a per request type level, and is only available if the request
+- * has been specified with the necessary "ReturnConsumedCapacity" parameter.
+- * 
    14. 
+- * 

+- * 
AWS Service Metrics

+- * 
    
+- * 
  1. HttpClientGetConnectionTime - Total number of milliseconds taken for the
+- * underlying http client library to get a connection.
+- * 
  2. S3DownloadThroughput - Number of bytes downloaded from S3 per second.
    3. 
+- * 
  3. S3DownloadByteCount - Number of bytes downloaded from S3.
    4. 
+- * 
  4. S3UploadThroughput - Number of bytes uploaded to S3 per second.
    5. 
+- * 
  5. S3UploadByteCount - Number of bytes uploaded to S3.
    6. 
+- * 

+- * 
Machine Metrics

+- * 
Memory

+- * 
    
+- * 
  1. TotalMemory - Total amount of memory currently available to the JVM for
+- * current and future objects, measured in bytes. This value may vary over 
+- * time, depending on the host environment.
    2. 
+- * 
  2. FreeMemory - An approximation to the total amount of memory currently 
+- * available to the JVM for future allocated objects, measured in bytes.
    3. 
+- * 
  3. UsedMemory - TotalMemory minus FreeMemory.
    4. 
+- * 
  4. SpareMemory - The maximum amount of memory that the JVM will attempt to
+- * use, measured in bytes, minus UsedMemory. 
    5. 
+- * 

+- * 
Threads

+- * 
    
+- * 
  1. ThreadCount - The current number of live threads including both daemon 
+- * and non-daemon threads.
    2. 
+- * 
  2. DeadLockThreadCount - The number of threads that are deadlocked waiting 
+- * for object monitors or ownable synchronizers, if any. Threads are deadlocked
+- *  in a cycle waiting for a lock of these two types if each thread owns one 
+- *  lock while trying to acquire another lock already held by another thread in
+- *   the cycle. No metrics is generated when the value is zero.
    3. 
+- * 
  3. DaemonThreadCount - The current number of live daemon threads. No metrics
+- *  is generated when the value is zero.
    4. 
+- * 
  4. PeakThreadCount - The peak live thread count since the JVM started or 
+- * since the peak was reset.
    5. 
+- * 
  5. TotalStartedThreadCount - The total number of threads created and also 
+- * started since the JVM started.
    6. 
+- * 

+- * 
File Descriptors

+- * 
    
+- * 
  1. OpenFileDescriptorCount - Number of opened file descriptors of the 
+- * operating system.
    2. 
+- * 
  2. SpareFileDescriptorCount - Maximum number of file descriptors of the 
+- * operating system minus OpenFileDescriptorCount.
    3. 
+- * 

+- */
+-package com.amazonaws.metrics;
+-
+diff -Nau8r ./src/main/java/com/amazonaws/metrics/RequestMetricCollector.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/RequestMetricCollector.java
+--- ./src/main/java/com/amazonaws/metrics/RequestMetricCollector.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/RequestMetricCollector.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,51 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.metrics;
+-
+-import com.amazonaws.Request;
+-import com.amazonaws.Response;
+-
+-/**
+- * A service provider interface that can be used to implement an AWS SDK
+- * request/response metric collector.
+- * 
+- * @see AwsSdkMetrics
+- */
+-public abstract class RequestMetricCollector {
+-    /**
+-     * Can be used to serve as a factory for the request metric collector.
+-     */
+-    public static interface Factory {
+-        /**
+-         * Returns an instance of the collector; or null if if failed to create
+-         * one.
+-         */
+-        public RequestMetricCollector getRequestMetricCollector();
+-    }
+-    /** 
+-     * Used to collect the metric at the end of a request/response cycle.
+-     *
+-     * @see Request#getAWSRequestMetrics()
+-     */
+-    public abstract void collectMetrics(Request request, Response response);
+-    public boolean isEnabled() { return true; }
+-
+-    /** A convenient instance of a no-op request metric collector. */
+-    public static final RequestMetricCollector NONE = new RequestMetricCollector() {
+-        @Override public void collectMetrics(Request request, Response response) {}
+-        @Override public boolean isEnabled() { return false; }
+-    };
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/metrics/RequestMetricType.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/RequestMetricType.java
+--- ./src/main/java/com/amazonaws/metrics/RequestMetricType.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/RequestMetricType.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,23 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.metrics;
+-
+-/**
+- * Request metric type.
+- */
+-public interface RequestMetricType extends MetricType {
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/metrics/ServiceLatencyProvider.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/ServiceLatencyProvider.java
+--- ./src/main/java/com/amazonaws/metrics/ServiceLatencyProvider.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/ServiceLatencyProvider.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,63 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.metrics;
+-
+-import org.apache.commons.logging.LogFactory;
+-
+-import com.amazonaws.annotation.NotThreadSafe;
+-import com.amazonaws.util.TimingInfo;
+-
+-/**
+- * Latency metric information provider.
+- */
+-@NotThreadSafe
+-public class ServiceLatencyProvider {
+-    private final long startNano = System.nanoTime();
+-    private long endNano = startNano;
+-    private final ServiceMetricType serviceMetricType;
+-
+-    public ServiceLatencyProvider(ServiceMetricType type) { 
+-        this.serviceMetricType = type;
+-    }
+-    public ServiceMetricType getServiceMetricType() { return serviceMetricType; }
+-
+-    /**
+-     * Ends the timing.  Must not be called more than once.
+-     */
+-    public ServiceLatencyProvider endTiming() {
+-        if (endNano != startNano) {
+-            throw new IllegalStateException();
+-        }
+-        endNano = System.nanoTime();
+-        return this; 
+-    }
+-
+-    public double getDurationMilli() {
+-        if (endNano == startNano) {
+-            LogFactory.getLog(getClass()).debug(
+-                    "Likely to be a missing invocation of endTiming().");
+-        }
+-        return TimingInfo.durationMilliOf(startNano, endNano); 
+-    }
+-    
+-    public String getProviderId() { return super.toString(); }
+-
+-    @Override
+-    public String toString() {
+-        return String.format(
+-                "providerId=%s, serviceMetricType=%s, startNano=%d, endNano=%d", 
+-                getProviderId(), serviceMetricType, startNano, endNano);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/metrics/ServiceMetricCollector.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/ServiceMetricCollector.java
+--- ./src/main/java/com/amazonaws/metrics/ServiceMetricCollector.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/ServiceMetricCollector.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,46 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.metrics;
+-
+-/**
+- * A service provider interface that can be used to implement an AWS SDK
+- * general purpose metric collector.
+- */
+-public abstract class ServiceMetricCollector {
+-    public static interface Factory {
+-        /**
+-         * Returns an instance of the collector; or null if if failed to create
+-         * one.
+-         */
+-        public ServiceMetricCollector getServiceMetricCollector();
+-    }
+-    /**
+-     * Collects metrics on the number of bytes written or read and the respective
+-     * duration.
+-     */
+-    public abstract void collectByteThroughput(ByteThroughputProvider provider);
+-    /**
+-     * Collects metrics for non-request specific latencies.
+-     */
+-    public abstract void collectLatency(ServiceLatencyProvider provider);
+-
+-    public boolean isEnabled() { return true; }
+-    /** A convenient instance of a no-op service metric collector. */
+-    public static final ServiceMetricCollector NONE = new ServiceMetricCollector() {
+-        @Override public void collectByteThroughput(ByteThroughputProvider provider) {}
+-        @Override public void collectLatency(ServiceLatencyProvider provider) {}
+-        @Override public boolean isEnabled() { return false; }
+-    };
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/metrics/ServiceMetricType.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/ServiceMetricType.java
+--- ./src/main/java/com/amazonaws/metrics/ServiceMetricType.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/ServiceMetricType.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,29 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.metrics;
+-
+-/**
+- * Service specific Metric type (eg S3, DynamoDB, etc.)
+- */
+-public interface ServiceMetricType extends MetricType {
+-    public String getServiceName();
+-
+-    public static final String UPLOAD_THROUGHPUT_NAME_SUFFIX = "UploadThroughput";
+-    public static final String UPLOAD_BYTE_COUNT_NAME_SUFFIX = "UploadByteCount";
+-    public static final String DOWNLOAD_THROUGHPUT_NAME_SUFFIX = "DownloadThroughput";
+-    public static final String DOWNLOAD_BYTE_COUNT_NAME_SUFFIX = "DownloadByteCount";
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/metrics/SimpleMetricType.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/SimpleMetricType.java
+--- ./src/main/java/com/amazonaws/metrics/SimpleMetricType.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/SimpleMetricType.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,28 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.metrics;
+-
+-public abstract class SimpleMetricType implements MetricType {
+-    @Override public abstract String name();
+-
+-    @Override public final int hashCode() { return name().hashCode(); }
+-    @Override public final boolean equals(Object o) {
+-        if (!(o instanceof MetricType))
+-            return false;
+-        MetricType that = (MetricType)o;
+-        return this.name().equals(that.name());
+-    }
+-    @Override public final String toString() { return name(); }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/metrics/SimpleServiceMetricType.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/SimpleServiceMetricType.java
+--- ./src/main/java/com/amazonaws/metrics/SimpleServiceMetricType.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/SimpleServiceMetricType.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,26 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.metrics;
+-
+-public class SimpleServiceMetricType extends SimpleMetricType implements ServiceMetricType {
+-    private final String name;
+-    private final String serviceName;
+-    public SimpleServiceMetricType(String name, String serviceName) {
+-        this.name = name;
+-        this.serviceName = serviceName;
+-    }
+-    @Override public String name() { return name; }
+-    @Override public String getServiceName() { return serviceName; }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/metrics/SimpleThroughputMetricType.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/SimpleThroughputMetricType.java
+--- ./src/main/java/com/amazonaws/metrics/SimpleThroughputMetricType.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/SimpleThroughputMetricType.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,27 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.metrics;
+-
+-public class SimpleThroughputMetricType extends SimpleServiceMetricType implements ThroughputMetricType {
+-    private final ServiceMetricType byteCountMetricType;
+-    public SimpleThroughputMetricType(String name, String serviceName, String byteCountMetricName) {
+-        super(name, serviceName);
+-        this.byteCountMetricType = new SimpleServiceMetricType(byteCountMetricName, serviceName);
+-    }
+-
+-    @Override public ServiceMetricType getByteCountMetricType() {
+-        return byteCountMetricType;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/metrics/ThroughputMetricType.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/ThroughputMetricType.java
+--- ./src/main/java/com/amazonaws/metrics/ThroughputMetricType.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/metrics/ThroughputMetricType.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,19 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.metrics;
+-
+-public interface ThroughputMetricType extends ServiceMetricType {
+-    public ServiceMetricType getByteCountMetricType();
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/partitions/endpoints.json /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/partitions/endpoints.json
+--- ./src/main/java/com/amazonaws/partitions/endpoints.json	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/partitions/endpoints.json	1969-12-31 16:00:00.000000000 -0800
+@@ -1,2555 +0,0 @@
+-{
+-  "partitions" : [ {
+-    "defaults" : {
+-      "hostname" : "{service}.{region}.{dnsSuffix}",
+-      "protocols" : [ "https" ],
+-      "signatureVersions" : [ "v4" ]
+-    },
+-    "dnsSuffix" : "amazonaws.com",
+-    "partition" : "aws",
+-    "partitionName" : "AWS Standard",
+-    "regionRegex" : "^(us|eu|ap|sa|ca)\\-\\w+\\-\\d+$",
+-    "regions" : {
+-      "ap-northeast-1" : {
+-        "description" : "Asia Pacific (Tokyo)"
+-      },
+-      "ap-northeast-2" : {
+-        "description" : "Asia Pacific (Seoul)"
+-      },
+-      "ap-south-1" : {
+-        "description" : "Asia Pacific (Mumbai)"
+-      },
+-      "ap-southeast-1" : {
+-        "description" : "Asia Pacific (Singapore)"
+-      },
+-      "ap-southeast-2" : {
+-        "description" : "Asia Pacific (Sydney)"
+-      },
+-      "ca-central-1" : {
+-        "description" : "Canada (Central)"
+-      },
+-      "eu-central-1" : {
+-        "description" : "EU (Frankfurt)"
+-      },
+-      "eu-west-1" : {
+-        "description" : "EU (Ireland)"
+-      },
+-      "eu-west-2" : {
+-        "description" : "EU (London)"
+-      },
+-      "eu-west-3" : {
+-        "description" : "EU (Paris)"
+-      },
+-      "sa-east-1" : {
+-        "description" : "South America (Sao Paulo)"
+-      },
+-      "us-east-1" : {
+-        "description" : "US East (N. Virginia)"
+-      },
+-      "us-east-2" : {
+-        "description" : "US East (Ohio)"
+-      },
+-      "us-west-1" : {
+-        "description" : "US West (N. California)"
+-      },
+-      "us-west-2" : {
+-        "description" : "US West (Oregon)"
+-      }
+-    },
+-    "services" : {
+-      "a4b" : {
+-        "endpoints" : {
+-          "us-east-1" : { }
+-        }
+-      },
+-      "acm" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "api.pricing" : {
+-        "defaults" : {
+-          "credentialScope" : {
+-            "service" : "pricing"
+-          }
+-        },
+-        "endpoints" : {
+-          "ap-south-1" : { },
+-          "us-east-1" : { }
+-        }
+-      },
+-      "apigateway" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "application-autoscaling" : {
+-        "defaults" : {
+-          "credentialScope" : {
+-            "service" : "application-autoscaling"
+-          },
+-          "hostname" : "autoscaling.{region}.amazonaws.com",
+-          "protocols" : [ "http", "https" ]
+-        },
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "appstream2" : {
+-        "defaults" : {
+-          "credentialScope" : {
+-            "service" : "appstream"
+-          },
+-          "protocols" : [ "https" ]
+-        },
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "athena" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "autoscaling" : {
+-        "defaults" : {
+-          "protocols" : [ "http", "https" ]
+-        },
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "autoscaling-plans" : {
+-        "defaults" : {
+-          "credentialScope" : {
+-            "service" : "autoscaling-plans"
+-          },
+-          "hostname" : "autoscaling.{region}.amazonaws.com",
+-          "protocols" : [ "http", "https" ]
+-        },
+-        "endpoints" : {
+-          "ap-southeast-1" : { },
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "batch" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "budgets" : {
+-        "endpoints" : {
+-          "aws-global" : {
+-            "credentialScope" : {
+-              "region" : "us-east-1"
+-            },
+-            "hostname" : "budgets.amazonaws.com"
+-          }
+-        },
+-        "isRegionalized" : false,
+-        "partitionEndpoint" : "aws-global"
+-      },
+-      "ce" : {
+-        "endpoints" : {
+-          "aws-global" : {
+-            "credentialScope" : {
+-              "region" : "us-east-1"
+-            },
+-            "hostname" : "ce.us-east-1.amazonaws.com"
+-          }
+-        },
+-        "isRegionalized" : false,
+-        "partitionEndpoint" : "aws-global"
+-      },
+-      "cloud9" : {
+-        "endpoints" : {
+-          "ap-southeast-1" : { },
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "clouddirectory" : {
+-        "endpoints" : {
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "cloudformation" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "cloudfront" : {
+-        "endpoints" : {
+-          "aws-global" : {
+-            "credentialScope" : {
+-              "region" : "us-east-1"
+-            },
+-            "hostname" : "cloudfront.amazonaws.com",
+-            "protocols" : [ "http", "https" ]
+-          }
+-        },
+-        "isRegionalized" : false,
+-        "partitionEndpoint" : "aws-global"
+-      },
+-      "cloudhsm" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "cloudhsmv2" : {
+-        "defaults" : {
+-          "credentialScope" : {
+-            "service" : "cloudhsm"
+-          }
+-        },
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "cloudsearch" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "cloudtrail" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "codebuild" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "codecommit" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "codedeploy" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "codepipeline" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "codestar" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "cognito-identity" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "cognito-idp" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "cognito-sync" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "comprehend" : {
+-        "defaults" : {
+-          "protocols" : [ "https" ]
+-        },
+-        "endpoints" : {
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "config" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "cur" : {
+-        "endpoints" : {
+-          "us-east-1" : { }
+-        }
+-      },
+-      "data.iot" : {
+-        "defaults" : {
+-          "credentialScope" : {
+-            "service" : "iotdata"
+-          },
+-          "protocols" : [ "https" ]
+-        },
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "datapipeline" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "dax" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "eu-west-1" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "devicefarm" : {
+-        "endpoints" : {
+-          "us-west-2" : { }
+-        }
+-      },
+-      "directconnect" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "discovery" : {
+-        "endpoints" : {
+-          "us-west-2" : { }
+-        }
+-      },
+-      "dms" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "ds" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "dynamodb" : {
+-        "defaults" : {
+-          "protocols" : [ "http", "https" ]
+-        },
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "local" : {
+-            "credentialScope" : {
+-              "region" : "us-east-1"
+-            },
+-            "hostname" : "localhost:8000",
+-            "protocols" : [ "http" ]
+-          },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "ec2" : {
+-        "defaults" : {
+-          "protocols" : [ "http", "https" ]
+-        },
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "ecr" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "ecs" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "elasticache" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "elasticbeanstalk" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "elasticfilesystem" : {
+-        "endpoints" : {
+-          "ap-southeast-2" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "elasticloadbalancing" : {
+-        "defaults" : {
+-          "protocols" : [ "https" ]
+-        },
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "elasticmapreduce" : {
+-        "defaults" : {
+-          "protocols" : [ "http", "https" ],
+-          "sslCommonName" : "{region}.{service}.{dnsSuffix}"
+-        },
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : {
+-            "sslCommonName" : "{service}.{region}.{dnsSuffix}"
+-          },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : {
+-            "sslCommonName" : "{service}.{region}.{dnsSuffix}"
+-          },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "elastictranscoder" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "email" : {
+-        "endpoints" : {
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "entitlement.marketplace" : {
+-        "defaults" : {
+-          "credentialScope" : {
+-            "service" : "aws-marketplace"
+-          }
+-        },
+-        "endpoints" : {
+-          "us-east-1" : { }
+-        }
+-      },
+-      "es" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "events" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "firehose" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "gamelift" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "glacier" : {
+-        "defaults" : {
+-          "protocols" : [ "http", "https" ]
+-        },
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "glue" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "greengrass" : {
+-        "defaults" : {
+-          "protocols" : [ "https" ]
+-        },
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "eu-central-1" : { },
+-          "us-east-1" : { },
+-          "us-west-2" : { }
+-        },
+-        "isRegionalized" : true
+-      },
+-      "guardduty" : {
+-        "defaults" : {
+-          "protocols" : [ "https" ]
+-        },
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        },
+-        "isRegionalized" : true
+-      },
+-      "health" : {
+-        "endpoints" : {
+-          "us-east-1" : { }
+-        }
+-      },
+-      "iam" : {
+-        "endpoints" : {
+-          "aws-global" : {
+-            "credentialScope" : {
+-              "region" : "us-east-1"
+-            },
+-            "hostname" : "iam.amazonaws.com"
+-          }
+-        },
+-        "isRegionalized" : false,
+-        "partitionEndpoint" : "aws-global"
+-      },
+-      "importexport" : {
+-        "endpoints" : {
+-          "aws-global" : {
+-            "credentialScope" : {
+-              "region" : "us-east-1",
+-              "service" : "IngestionService"
+-            },
+-            "hostname" : "importexport.amazonaws.com",
+-            "signatureVersions" : [ "v2", "v4" ]
+-          }
+-        },
+-        "isRegionalized" : false,
+-        "partitionEndpoint" : "aws-global"
+-      },
+-      "inspector" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-2" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "iot" : {
+-        "defaults" : {
+-          "credentialScope" : {
+-            "service" : "execute-api"
+-          }
+-        },
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "kinesis" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "kinesisanalytics" : {
+-        "endpoints" : {
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "kinesisvideo" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "kms" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "lambda" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "lightsail" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "logs" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "machinelearning" : {
+-        "endpoints" : {
+-          "eu-west-1" : { },
+-          "us-east-1" : { }
+-        }
+-      },
+-      "marketplacecommerceanalytics" : {
+-        "endpoints" : {
+-          "us-east-1" : { }
+-        }
+-      },
+-      "mediaconvert" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "medialive" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "mediapackage" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-3" : { },
+-          "us-east-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "metering.marketplace" : {
+-        "defaults" : {
+-          "credentialScope" : {
+-            "service" : "aws-marketplace"
+-          }
+-        },
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "mgh" : {
+-        "endpoints" : {
+-          "us-west-2" : { }
+-        }
+-      },
+-      "mobileanalytics" : {
+-        "endpoints" : {
+-          "us-east-1" : { }
+-        }
+-      },
+-      "models.lex" : {
+-        "defaults" : {
+-          "credentialScope" : {
+-            "service" : "lex"
+-          }
+-        },
+-        "endpoints" : {
+-          "eu-west-1" : { },
+-          "us-east-1" : { }
+-        }
+-      },
+-      "monitoring" : {
+-        "defaults" : {
+-          "protocols" : [ "http", "https" ]
+-        },
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "mturk-requester" : {
+-        "endpoints" : {
+-          "sandbox" : {
+-            "hostname" : "mturk-requester-sandbox.us-east-1.amazonaws.com"
+-          },
+-          "us-east-1" : { }
+-        },
+-        "isRegionalized" : false
+-      },
+-      "opsworks" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "opsworks-cm" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "organizations" : {
+-        "endpoints" : {
+-          "aws-global" : {
+-            "credentialScope" : {
+-              "region" : "us-east-1"
+-            },
+-            "hostname" : "organizations.us-east-1.amazonaws.com"
+-          }
+-        },
+-        "isRegionalized" : false,
+-        "partitionEndpoint" : "aws-global"
+-      },
+-      "pinpoint" : {
+-        "defaults" : {
+-          "credentialScope" : {
+-            "service" : "mobiletargeting"
+-          }
+-        },
+-        "endpoints" : {
+-          "us-east-1" : { }
+-        }
+-      },
+-      "polly" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "rds" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : {
+-            "sslCommonName" : "{service}.{dnsSuffix}"
+-          },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "redshift" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "rekognition" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "resource-groups" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "route53" : {
+-        "endpoints" : {
+-          "aws-global" : {
+-            "credentialScope" : {
+-              "region" : "us-east-1"
+-            },
+-            "hostname" : "route53.amazonaws.com"
+-          }
+-        },
+-        "isRegionalized" : false,
+-        "partitionEndpoint" : "aws-global"
+-      },
+-      "route53domains" : {
+-        "endpoints" : {
+-          "us-east-1" : { }
+-        }
+-      },
+-      "runtime.lex" : {
+-        "defaults" : {
+-          "credentialScope" : {
+-            "service" : "lex"
+-          }
+-        },
+-        "endpoints" : {
+-          "eu-west-1" : { },
+-          "us-east-1" : { }
+-        }
+-      },
+-      "runtime.sagemaker" : {
+-        "endpoints" : {
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "s3" : {
+-        "defaults" : {
+-          "protocols" : [ "http", "https" ],
+-          "signatureVersions" : [ "s3v4" ]
+-        },
+-        "endpoints" : {
+-          "ap-northeast-1" : {
+-            "hostname" : "s3.ap-northeast-1.amazonaws.com",
+-            "signatureVersions" : [ "s3", "s3v4" ]
+-          },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : {
+-            "hostname" : "s3.ap-southeast-1.amazonaws.com",
+-            "signatureVersions" : [ "s3", "s3v4" ]
+-          },
+-          "ap-southeast-2" : {
+-            "hostname" : "s3.ap-southeast-2.amazonaws.com",
+-            "signatureVersions" : [ "s3", "s3v4" ]
+-          },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : {
+-            "hostname" : "s3.eu-west-1.amazonaws.com",
+-            "signatureVersions" : [ "s3", "s3v4" ]
+-          },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "s3-external-1" : {
+-            "credentialScope" : {
+-              "region" : "us-east-1"
+-            },
+-            "hostname" : "s3-external-1.amazonaws.com",
+-            "signatureVersions" : [ "s3", "s3v4" ]
+-          },
+-          "sa-east-1" : {
+-            "hostname" : "s3.sa-east-1.amazonaws.com",
+-            "signatureVersions" : [ "s3", "s3v4" ]
+-          },
+-          "us-east-1" : {
+-            "hostname" : "s3.amazonaws.com",
+-            "signatureVersions" : [ "s3", "s3v4" ]
+-          },
+-          "us-east-2" : { },
+-          "us-west-1" : {
+-            "hostname" : "s3.us-west-1.amazonaws.com",
+-            "signatureVersions" : [ "s3", "s3v4" ]
+-          },
+-          "us-west-2" : {
+-            "hostname" : "s3.us-west-2.amazonaws.com",
+-            "signatureVersions" : [ "s3", "s3v4" ]
+-          }
+-        },
+-        "isRegionalized" : true,
+-        "partitionEndpoint" : "us-east-1"
+-      },
+-      "sagemaker" : {
+-        "endpoints" : {
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "sdb" : {
+-        "defaults" : {
+-          "protocols" : [ "http", "https" ],
+-          "signatureVersions" : [ "v2" ]
+-        },
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "eu-west-1" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : {
+-            "hostname" : "sdb.amazonaws.com"
+-          },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "serverlessrepo" : {
+-        "defaults" : {
+-          "protocols" : [ "https" ]
+-        },
+-        "endpoints" : {
+-          "ap-northeast-1" : {
+-            "protocols" : [ "https" ]
+-          },
+-          "ap-northeast-2" : {
+-            "protocols" : [ "https" ]
+-          },
+-          "ap-south-1" : {
+-            "protocols" : [ "https" ]
+-          },
+-          "ap-southeast-1" : {
+-            "protocols" : [ "https" ]
+-          },
+-          "ap-southeast-2" : {
+-            "protocols" : [ "https" ]
+-          },
+-          "ca-central-1" : {
+-            "protocols" : [ "https" ]
+-          },
+-          "eu-central-1" : {
+-            "protocols" : [ "https" ]
+-          },
+-          "eu-west-1" : {
+-            "protocols" : [ "https" ]
+-          },
+-          "eu-west-2" : {
+-            "protocols" : [ "https" ]
+-          },
+-          "sa-east-1" : {
+-            "protocols" : [ "https" ]
+-          },
+-          "us-east-1" : {
+-            "protocols" : [ "https" ]
+-          },
+-          "us-east-2" : {
+-            "protocols" : [ "https" ]
+-          },
+-          "us-west-1" : {
+-            "protocols" : [ "https" ]
+-          },
+-          "us-west-2" : {
+-            "protocols" : [ "https" ]
+-          }
+-        }
+-      },
+-      "servicecatalog" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "servicediscovery" : {
+-        "endpoints" : {
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "shield" : {
+-        "defaults" : {
+-          "protocols" : [ "https" ],
+-          "sslCommonName" : "Shield.us-east-1.amazonaws.com"
+-        },
+-        "endpoints" : {
+-          "us-east-1" : { }
+-        },
+-        "isRegionalized" : false
+-      },
+-      "sms" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "snowball" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "sns" : {
+-        "defaults" : {
+-          "protocols" : [ "http", "https" ]
+-        },
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "sqs" : {
+-        "defaults" : {
+-          "protocols" : [ "http", "https" ],
+-          "sslCommonName" : "{region}.queue.{dnsSuffix}"
+-        },
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : {
+-            "sslCommonName" : "queue.{dnsSuffix}"
+-          },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "ssm" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "states" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "storagegateway" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "streams.dynamodb" : {
+-        "defaults" : {
+-          "credentialScope" : {
+-            "service" : "dynamodb"
+-          },
+-          "protocols" : [ "http", "https" ]
+-        },
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "local" : {
+-            "credentialScope" : {
+-              "region" : "us-east-1"
+-            },
+-            "hostname" : "localhost:8000",
+-            "protocols" : [ "http" ]
+-          },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "sts" : {
+-        "defaults" : {
+-          "credentialScope" : {
+-            "region" : "us-east-1"
+-          },
+-          "hostname" : "sts.amazonaws.com"
+-        },
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : {
+-            "credentialScope" : {
+-              "region" : "ap-northeast-2"
+-            },
+-            "hostname" : "sts.ap-northeast-2.amazonaws.com"
+-          },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "aws-global" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-1-fips" : {
+-            "credentialScope" : {
+-              "region" : "us-east-1"
+-            },
+-            "hostname" : "sts-fips.us-east-1.amazonaws.com"
+-          },
+-          "us-east-2" : { },
+-          "us-east-2-fips" : {
+-            "credentialScope" : {
+-              "region" : "us-east-2"
+-            },
+-            "hostname" : "sts-fips.us-east-2.amazonaws.com"
+-          },
+-          "us-west-1" : { },
+-          "us-west-1-fips" : {
+-            "credentialScope" : {
+-              "region" : "us-west-1"
+-            },
+-            "hostname" : "sts-fips.us-west-1.amazonaws.com"
+-          },
+-          "us-west-2" : { },
+-          "us-west-2-fips" : {
+-            "credentialScope" : {
+-              "region" : "us-west-2"
+-            },
+-            "hostname" : "sts-fips.us-west-2.amazonaws.com"
+-          }
+-        },
+-        "partitionEndpoint" : "aws-global"
+-      },
+-      "support" : {
+-        "endpoints" : {
+-          "us-east-1" : { }
+-        }
+-      },
+-      "swf" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "tagging" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "eu-west-3" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "translate" : {
+-        "defaults" : {
+-          "protocols" : [ "https" ]
+-        },
+-        "endpoints" : {
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "waf" : {
+-        "endpoints" : {
+-          "aws-global" : {
+-            "credentialScope" : {
+-              "region" : "us-east-1"
+-            },
+-            "hostname" : "waf.amazonaws.com"
+-          }
+-        },
+-        "isRegionalized" : false,
+-        "partitionEndpoint" : "aws-global"
+-      },
+-      "waf-regional" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "workdocs" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "workmail" : {
+-        "defaults" : {
+-          "protocols" : [ "https" ]
+-        },
+-        "endpoints" : {
+-          "eu-west-1" : { },
+-          "us-east-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "workspaces" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "us-east-1" : { },
+-          "us-west-2" : { }
+-        }
+-      },
+-      "xray" : {
+-        "endpoints" : {
+-          "ap-northeast-1" : { },
+-          "ap-northeast-2" : { },
+-          "ap-south-1" : { },
+-          "ap-southeast-1" : { },
+-          "ap-southeast-2" : { },
+-          "ca-central-1" : { },
+-          "eu-central-1" : { },
+-          "eu-west-1" : { },
+-          "eu-west-2" : { },
+-          "sa-east-1" : { },
+-          "us-east-1" : { },
+-          "us-east-2" : { },
+-          "us-west-1" : { },
+-          "us-west-2" : { }
+-        }
+-      }
+-    }
+-  }, {
+-    "defaults" : {
+-      "hostname" : "{service}.{region}.{dnsSuffix}",
+-      "protocols" : [ "https" ],
+-      "signatureVersions" : [ "v4" ]
+-    },
+-    "dnsSuffix" : "amazonaws.com.cn",
+-    "partition" : "aws-cn",
+-    "partitionName" : "AWS China",
+-    "regionRegex" : "^cn\\-\\w+\\-\\d+$",
+-    "regions" : {
+-      "cn-north-1" : {
+-        "description" : "China (Beijing)"
+-      },
+-      "cn-northwest-1" : {
+-        "description" : "China (Ningxia)"
+-      }
+-    },
+-    "services" : {
+-      "apigateway" : {
+-        "endpoints" : {
+-          "cn-north-1" : { }
+-        }
+-      },
+-      "application-autoscaling" : {
+-        "defaults" : {
+-          "credentialScope" : {
+-            "service" : "application-autoscaling"
+-          },
+-          "hostname" : "autoscaling.{region}.amazonaws.com",
+-          "protocols" : [ "http", "https" ]
+-        },
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "autoscaling" : {
+-        "defaults" : {
+-          "protocols" : [ "http", "https" ]
+-        },
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "cloudformation" : {
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "cloudtrail" : {
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "codedeploy" : {
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "cognito-identity" : {
+-        "endpoints" : {
+-          "cn-north-1" : { }
+-        }
+-      },
+-      "config" : {
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "directconnect" : {
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "dynamodb" : {
+-        "defaults" : {
+-          "protocols" : [ "http", "https" ]
+-        },
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "ec2" : {
+-        "defaults" : {
+-          "protocols" : [ "http", "https" ]
+-        },
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "ecr" : {
+-        "endpoints" : {
+-          "cn-north-1" : { }
+-        }
+-      },
+-      "ecs" : {
+-        "endpoints" : {
+-          "cn-north-1" : { }
+-        }
+-      },
+-      "elasticache" : {
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "elasticbeanstalk" : {
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "elasticloadbalancing" : {
+-        "defaults" : {
+-          "protocols" : [ "https" ]
+-        },
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "elasticmapreduce" : {
+-        "defaults" : {
+-          "protocols" : [ "http", "https" ]
+-        },
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "es" : {
+-        "endpoints" : {
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "events" : {
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "glacier" : {
+-        "defaults" : {
+-          "protocols" : [ "http", "https" ]
+-        },
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "iam" : {
+-        "endpoints" : {
+-          "aws-cn-global" : {
+-            "credentialScope" : {
+-              "region" : "cn-north-1"
+-            },
+-            "hostname" : "iam.cn-north-1.amazonaws.com.cn"
+-          }
+-        },
+-        "isRegionalized" : false,
+-        "partitionEndpoint" : "aws-cn-global"
+-      },
+-      "iot" : {
+-        "defaults" : {
+-          "credentialScope" : {
+-            "service" : "execute-api"
+-          }
+-        },
+-        "endpoints" : {
+-          "cn-north-1" : { }
+-        }
+-      },
+-      "kinesis" : {
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "lambda" : {
+-        "endpoints" : {
+-          "cn-north-1" : { }
+-        }
+-      },
+-      "logs" : {
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "monitoring" : {
+-        "defaults" : {
+-          "protocols" : [ "http", "https" ]
+-        },
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "rds" : {
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "redshift" : {
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "s3" : {
+-        "defaults" : {
+-          "protocols" : [ "http", "https" ],
+-          "signatureVersions" : [ "s3v4" ]
+-        },
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "sms" : {
+-        "endpoints" : {
+-          "cn-north-1" : { }
+-        }
+-      },
+-      "snowball" : {
+-        "endpoints" : {
+-          "cn-north-1" : { }
+-        }
+-      },
+-      "sns" : {
+-        "defaults" : {
+-          "protocols" : [ "http", "https" ]
+-        },
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "sqs" : {
+-        "defaults" : {
+-          "protocols" : [ "http", "https" ],
+-          "sslCommonName" : "{region}.queue.{dnsSuffix}"
+-        },
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "ssm" : {
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "storagegateway" : {
+-        "endpoints" : {
+-          "cn-north-1" : { }
+-        }
+-      },
+-      "streams.dynamodb" : {
+-        "defaults" : {
+-          "credentialScope" : {
+-            "service" : "dynamodb"
+-          },
+-          "protocols" : [ "http", "https" ]
+-        },
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "sts" : {
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "swf" : {
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      },
+-      "tagging" : {
+-        "endpoints" : {
+-          "cn-north-1" : { },
+-          "cn-northwest-1" : { }
+-        }
+-      }
+-    }
+-  }, {
+-    "defaults" : {
+-      "hostname" : "{service}.{region}.{dnsSuffix}",
+-      "protocols" : [ "https" ],
+-      "signatureVersions" : [ "v4" ]
+-    },
+-    "dnsSuffix" : "amazonaws.com",
+-    "partition" : "aws-us-gov",
+-    "partitionName" : "AWS GovCloud (US)",
+-    "regionRegex" : "^us\\-gov\\-\\w+\\-\\d+$",
+-    "regions" : {
+-      "us-gov-west-1" : {
+-        "description" : "AWS GovCloud (US)"
+-      }
+-    },
+-    "services" : {
+-      "acm" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "apigateway" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "autoscaling" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : {
+-            "protocols" : [ "http", "https" ]
+-          }
+-        }
+-      },
+-      "cloudformation" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "cloudhsm" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "cloudtrail" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "codedeploy" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "config" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "directconnect" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "dms" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "dynamodb" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { },
+-          "us-gov-west-1-fips" : {
+-            "credentialScope" : {
+-              "region" : "us-gov-west-1"
+-            },
+-            "hostname" : "dynamodb.us-gov-west-1.amazonaws.com"
+-          }
+-        }
+-      },
+-      "ec2" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "ecr" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "ecs" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "elasticache" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "elasticbeanstalk" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "elasticloadbalancing" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : {
+-            "protocols" : [ "http", "https" ]
+-          }
+-        }
+-      },
+-      "elasticmapreduce" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : {
+-            "protocols" : [ "http", "https" ]
+-          }
+-        }
+-      },
+-      "es" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "events" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "glacier" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : {
+-            "protocols" : [ "http", "https" ]
+-          }
+-        }
+-      },
+-      "iam" : {
+-        "endpoints" : {
+-          "aws-us-gov-global" : {
+-            "credentialScope" : {
+-              "region" : "us-gov-west-1"
+-            },
+-            "hostname" : "iam.us-gov.amazonaws.com"
+-          }
+-        },
+-        "isRegionalized" : false,
+-        "partitionEndpoint" : "aws-us-gov-global"
+-      },
+-      "kinesis" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "kms" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "lambda" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "logs" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "metering.marketplace" : {
+-        "defaults" : {
+-          "credentialScope" : {
+-            "service" : "aws-marketplace"
+-          }
+-        },
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "monitoring" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "polly" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "rds" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "redshift" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "rekognition" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "s3" : {
+-        "defaults" : {
+-          "signatureVersions" : [ "s3", "s3v4" ]
+-        },
+-        "endpoints" : {
+-          "fips-us-gov-west-1" : {
+-            "credentialScope" : {
+-              "region" : "us-gov-west-1"
+-            },
+-            "hostname" : "s3-fips-us-gov-west-1.amazonaws.com"
+-          },
+-          "us-gov-west-1" : {
+-            "hostname" : "s3.us-gov-west-1.amazonaws.com",
+-            "protocols" : [ "http", "https" ]
+-          }
+-        }
+-      },
+-      "sms" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "snowball" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "sns" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : {
+-            "protocols" : [ "http", "https" ]
+-          }
+-        }
+-      },
+-      "sqs" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : {
+-            "protocols" : [ "http", "https" ],
+-            "sslCommonName" : "{region}.queue.{dnsSuffix}"
+-          }
+-        }
+-      },
+-      "ssm" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "streams.dynamodb" : {
+-        "defaults" : {
+-          "credentialScope" : {
+-            "service" : "dynamodb"
+-          }
+-        },
+-        "endpoints" : {
+-          "us-gov-west-1" : { },
+-          "us-gov-west-1-fips" : {
+-            "credentialScope" : {
+-              "region" : "us-gov-west-1"
+-            },
+-            "hostname" : "dynamodb.us-gov-west-1.amazonaws.com"
+-          }
+-        }
+-      },
+-      "sts" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "swf" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      },
+-      "tagging" : {
+-        "endpoints" : {
+-          "us-gov-west-1" : { }
+-        }
+-      }
+-    }
+-  } ],
+-  "version" : 3
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/partitions/model/CredentialScope.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/partitions/model/CredentialScope.java
+--- ./src/main/java/com/amazonaws/partitions/model/CredentialScope.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/partitions/model/CredentialScope.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,63 +0,0 @@
+-/*
+- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.partitions.model;
+-
+-/**
+- * credential scope associated with an endpoint.
+- */
+-public class CredentialScope {
+-
+-    /**
+-     * region string to be used when signing a request for an endpoint.
+-     */
+-    private String region;
+-
+-    /**
+-     * service name string to be used when signing a request for an endpoint
+-     */
+-    private String service;
+-
+-    /**
+-     * Returns the region string to be used when signing a request for an
+-     * endpoint.
+-     */
+-    public String getRegion() {
+-        return region;
+-    }
+-
+-    /**
+-     * Sets the region string to be used when signing a request for an
+-     * endpoint.
+-     */
+-    public void setRegion(String region) {
+-        this.region = region;
+-    }
+-
+-    /**
+-     * Returns the service name string to be used when signing a request for an
+-     * endpoint.
+-     */
+-    public String getService() {
+-        return service;
+-    }
+-
+-    /**
+-     * Sets the service name string to be used when signing a request for an
+-     * endpoint.
+-     */
+-    public void setService(String service) {
+-        this.service = service;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/partitions/model/Endpoint.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/partitions/model/Endpoint.java
+--- ./src/main/java/com/amazonaws/partitions/model/Endpoint.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/partitions/model/Endpoint.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,187 +0,0 @@
+-/*
+- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.partitions.model;
+-
+-import com.amazonaws.Protocol;
+-import com.fasterxml.jackson.annotation.JsonProperty;
+-
+-import java.util.Set;
+-
+-/**
+- * Endpoint configuration.
+- */
+-public class Endpoint {
+-
+-    /**
+-     * endpoint string.
+-     */
+-    private String hostName;
+-
+-    /**
+-     * credential scope for the endpoint.
+-     */
+-    private CredentialScope credentialScope;
+-
+-    /**
+-     * supported schemes for the endpoint.
+-     */
+-    private Set protocols;
+-
+-    /**
+-     * supported signature versions of the endpoint.
+-     */
+-    private Set signatureVersions;
+-
+-    /**
+-     * ssl common name for the endpoint.
+-     */
+-    private String sslCommonName;
+-
+-    /**
+-     * Merges the given endpoints and returns the merged one.
+-     */
+-    public static Endpoint merge(Endpoint defaults, Endpoint override) {
+-
+-        if (defaults == null) {
+-            defaults = new Endpoint();
+-        }
+-
+-        if (override == null) {
+-            override = new Endpoint();
+-        }
+-
+-        final Endpoint merged = new Endpoint();
+-
+-        merged.setCredentialScope(override.getCredentialScope() != null
+-                ? override.getCredentialScope()
+-                : defaults.getCredentialScope());
+-
+-        merged.setHostName(override.getHostName() != null
+-                ? override.getHostName()
+-                : defaults.getHostName());
+-
+-        merged.setSslCommonName(override.getSslCommonName() != null
+-                ? override.getSslCommonName()
+-                : defaults.getSslCommonName());
+-
+-        merged.setProtocols(override.getProtocols() != null
+-                ? override.getProtocols()
+-                : defaults.getProtocols());
+-
+-        merged.setSignatureVersions(override.getSignatureVersions() != null
+-                ? override.getSignatureVersions()
+-                : defaults.getSignatureVersions()
+-        );
+-
+-        return merged;
+-
+-    }
+-
+-    /**
+-     * returns the endpoint string.
+-     */
+-    public String getHostName() {
+-        return hostName;
+-    }
+-
+-    /**
+-     * sets the endpoint string.
+-     */
+-    @JsonProperty(value = "hostname")
+-    public void setHostName(String hostName) {
+-        this.hostName = hostName;
+-    }
+-
+-    /**
+-     * returns credential scope for the endpoint.
+-     */
+-    public CredentialScope getCredentialScope() {
+-        return credentialScope;
+-    }
+-
+-    /**
+-     * sets the credential scope for the endpoint.
+-     */
+-    @JsonProperty(value = "credentialScope")
+-    public void setCredentialScope(CredentialScope credentialScope) {
+-        this.credentialScope = credentialScope;
+-    }
+-
+-    /**
+-     * returns the supported schemes for the endpoint.
+-     */
+-    public Set getProtocols() {
+-        return protocols;
+-    }
+-
+-    /**
+-     * sets the supported schemes for the endpoint.
+-     */
+-    @JsonProperty(value = "protocols")
+-    public void setProtocols(Set protocols) {
+-        this.protocols = protocols;
+-    }
+-
+-    /**
+-     * returns the supported signature versions of the endpoint.
+-     */
+-    public Set getSignatureVersions() {
+-        return signatureVersions;
+-    }
+-
+-    /**
+-     * returns the supported signature versions of the endpoint.
+-     */
+-    @JsonProperty(value = "signatureVersions")
+-    public void setSignatureVersions(Set signatureVersions) {
+-        this.signatureVersions = signatureVersions;
+-    }
+-
+-    /**
+-     * returns the ssl common name for the endpoint.
+-     */
+-    public String getSslCommonName() {
+-        return sslCommonName;
+-    }
+-
+-    /**
+-     * sets the ssl common name for the endpoint.
+-     */
+-    @JsonProperty(value = "sslCommonName")
+-    public void setSslCommonName(String sslCommonName) {
+-        this.sslCommonName = sslCommonName;
+-    }
+-
+-    /**
+-     * A convienient methods that returns true if the endpoint support HTTPS
+-     * scheme. Returns false otherwise.
+-     */
+-    public boolean hasHttpsSupport() {
+-        return isProtocolSupported(Protocol.HTTPS);
+-    }
+-
+-    /**
+-     * A convienient methods that returns true if the endpoint support HTTP
+-     * scheme. Returns false otherwise.
+-     */
+-    public boolean hasHttpSupport() {
+-        return isProtocolSupported(Protocol.HTTP);
+-    }
+-
+-    private boolean isProtocolSupported(Protocol protocol) {
+-        return protocols != null && protocols.contains(protocol.toString());
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/partitions/model/Partition.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/partitions/model/Partition.java
+--- ./src/main/java/com/amazonaws/partitions/model/Partition.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/partitions/model/Partition.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,180 +0,0 @@
+-/*
+- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.partitions.model;
+-
+-import com.amazonaws.util.ValidationUtils;
+-import com.fasterxml.jackson.annotation.JsonProperty;
+-
+-import java.util.Map;
+-import java.util.regex.Pattern;
+-
+-/**
+- * This class models a AWS partition and contains all metadata about it.
+- */
+-public class Partition {
+-
+-    /**
+-     * The name of the partition.
+-     */
+-    private final String partition;
+-
+-    /**
+-     * Supported regions.
+-     */
+-    private final Map regions;
+-
+-    /**
+-     * Supported services;
+-     */
+-    private final Map services;
+-
+-    /**
+-     * description of the partition.
+-     */
+-    private String partitionName;
+-
+-    /**
+-     * dns suffix for the endpoints in the partition.
+-     */
+-    private String dnsSuffix;
+-
+-    /**
+-     * region name regex for regions in the partition.
+-     */
+-    private String regionRegex;
+-
+-    /**
+-     * default endpoint configuration.
+-     */
+-    private Endpoint defaults;
+-
+-    public Partition(@JsonProperty(value = "partition") String partition,
+-                     @JsonProperty(value = "regions") Map
+-                             regions,
+-                     @JsonProperty(value = "services") Map services) {
+-        this.partition = ValidationUtils.assertNotNull(partition, "Partition");
+-        this.regions = regions;
+-        this.services = services;
+-    }
+-
+-    /**
+-     * Returns the name of the partition.
+-     */
+-    public String getPartition() {
+-        return partition;
+-    }
+-
+-    /**
+-     * Returns the description of the partition.
+-     */
+-    public String getPartitionName() {
+-        return partitionName;
+-    }
+-
+-    /**
+-     * Sets the description of the partition.
+-     */
+-    public void setPartitionName(String partitionName) {
+-        this.partitionName = partitionName;
+-    }
+-
+-    /**
+-     * Returns the dns suffix of the partition.
+-     */
+-    public String getDnsSuffix() {
+-        return dnsSuffix;
+-    }
+-
+-    /**
+-     * Sets the dns suffix of the partition.
+-     */
+-    public void setDnsSuffix(String dnsSuffix) {
+-        this.dnsSuffix = dnsSuffix;
+-    }
+-
+-    /**
+-     * Returns the regex for the regions in the partition.
+-     */
+-    public String getRegionRegex() {
+-        return regionRegex;
+-    }
+-
+-    /**
+-     * Sets the regex for the regions in the partition.
+-     */
+-    public void setRegionRegex(String regionRegex) {
+-        this.regionRegex = regionRegex;
+-    }
+-
+-    /**
+-     * Returns the default endpoint configuration of the partition.
+-     */
+-    public Endpoint getDefaults() {
+-        return defaults;
+-    }
+-
+-    /**
+-     * Sets the default endpoint configuration of the partition.
+-     */
+-    public void setDefaults(Endpoint defaults) {
+-        this.defaults = defaults;
+-    }
+-
+-    /**
+-     * Returns the set of regions associated with the partition.
+-     */
+-    public Map getRegions() {
+-        return regions;
+-    }
+-
+-    /**
+-     * Returns the set of services supported by the partition.
+-     */
+-    public Map getServices() {
+-        return services;
+-    }
+-
+-    /**
+-     * Returns true if the region is explicitly configured in the partition
+-     * or if the region matches the {@link #regionRegex} of the partition.
+-     */
+-    public boolean hasRegion(String region) {
+-        return regions.containsKey(region) || matchesRegionRegex(region) || hasServiceEndpoint
+-                (region);
+-    }
+-
+-    private boolean matchesRegionRegex(String region) {
+-        final Pattern p = Pattern.compile(regionRegex);
+-        return p.matcher(region).matches();
+-    }
+-
+-    /**
+-     * returns true if any of the services in the partition has a custom endpoint
+-     * like s3 having s3-external-1.
+-     * TODO Remove this support as part of next major version.
+-     * @Deprecated use the {@link com.amazonaws.AmazonWebServiceClient#setEndpoint(String)} method
+-     * for custom endpoints.
+-     */
+-    @Deprecated
+-    private boolean hasServiceEndpoint(String endpoint) {
+-        for(Service s : services.values()) {
+-            if (s.getEndpoints().containsKey(endpoint)) {
+-                return true;
+-            }
+-        }
+-        return false;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/partitions/model/Partitions.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/partitions/model/Partitions.java
+--- ./src/main/java/com/amazonaws/partitions/model/Partitions.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/partitions/model/Partitions.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,53 +0,0 @@
+-/**
+- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- * 

+- * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
+- * the License. A copy of the License is located at
+- * 

+- * http://aws.amazon.com/apache2.0
+- * 

+- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+- * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
+- * and limitations under the License.
+- */
+-package com.amazonaws.partitions.model;
+-
+-import com.amazonaws.util.ValidationUtils;
+-import com.fasterxml.jackson.annotation.JsonProperty;
+-
+-import java.util.List;
+-
+-/**
+- * Metadata of all partitions.
+- */
+-public class Partitions {
+-
+-    /**
+-     * the version of json schema for the partition metadata.
+-     */
+-    private final String version;
+-
+-    /**
+-     * list of partitions.
+-     */
+-    private final List partitions;
+-
+-    public Partitions(@JsonProperty(value = "version") String version, @JsonProperty(value = "partitions") List partitions) {
+-        this.version = ValidationUtils.assertNotNull(version, "version");
+-        this.partitions = ValidationUtils.assertNotNull(partitions, "version");
+-    }
+-
+-    /**
+-     * returns the version of the json schema for the partition metadata document.
+-     */
+-    public String getVersion() {
+-        return version;
+-    }
+-
+-    /**
+-     * returns the list of all partitions loaded from the partition metadata document.
+-     */
+-    public List getPartitions() {
+-        return partitions;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/partitions/model/Region.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/partitions/model/Region.java
+--- ./src/main/java/com/amazonaws/partitions/model/Region.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/partitions/model/Region.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,37 +0,0 @@
+-/*
+- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.partitions.model;
+-
+-import com.amazonaws.util.ValidationUtils;
+-import com.fasterxml.jackson.annotation.JsonProperty;
+-
+-/**
+- * Metadata about a region in partition.
+- */
+-public class Region {
+-
+-    /**
+-     * description of the region.
+-     */
+-    private final String description;
+-
+-    public Region(@JsonProperty(value = "description") String description) {
+-        this.description = ValidationUtils.assertNotNull(description, "Region description");;
+-    }
+-
+-    public String getDescription() {
+-        return description;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/partitions/model/Service.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/partitions/model/Service.java
+--- ./src/main/java/com/amazonaws/partitions/model/Service.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/partitions/model/Service.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,117 +0,0 @@
+-/*
+- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.partitions.model;
+-
+-import com.fasterxml.jackson.annotation.JsonProperty;
+-
+-import java.util.Collections;
+-import java.util.Map;
+-
+-/**
+- * Endpoint configuration for a service in a partition.
+- */
+-public class Service {
+-
+-    /**
+-     * endpoint configuration for every region in a partition.
+-     */
+-    private final Map endpoints;
+-
+-    /**
+-     * default endpoint configuration for a service across all regions in the
+-     * partition
+-     */
+-    private Endpoint defaults;
+-
+-    /**
+-     * the region name if the service is enabled partition wide.
+-     */
+-    private String partitionEndpoint;
+-
+-    /**
+-     * Returns true if the service is regionalized.
+-     */
+-    private boolean isRegionalized;
+-
+-    public Service(@JsonProperty(value = "endpoints") Map endpoints) {
+-        // Technically the endpoints member should never be null if the
+-        // endpoints file is properly formed, but this is currently not always
+-        // true. See TRE-739 for details
+-        this.endpoints = endpoints == null ? Collections.emptyMap() : endpoints;
+-    }
+-
+-    /**
+-     * Returns the endpoints configuration for all regions in a partition
+-     * that service supports.
+-     */
+-    public Map getEndpoints() {
+-        return endpoints;
+-    }
+-
+-    /**
+-     * returns the default endpoints configuration for all regions in a
+-     * partition.
+-     */
+-    public Endpoint getDefaults() {
+-        return defaults;
+-    }
+-
+-    /**
+-     * Sets the default endpoints configuration for all regions in a
+-     * partition.
+-     */
+-    public void setDefaults(Endpoint defaults) {
+-        this.defaults = defaults;
+-    }
+-
+-    /**
+-     * returns the region name if the service is enabled partition wide.
+-     */
+-    public String getPartitionEndpoint() {
+-        return partitionEndpoint;
+-    }
+-
+-    /**
+-     * sets the region name if the service is enabled partition wide.
+-     */
+-    @JsonProperty(value = "partitionEndpoint")
+-    public void setPartitionEndpoint(String partitionEndpoint) {
+-        this.partitionEndpoint = partitionEndpoint;
+-    }
+-
+-    /**
+-     * returns true if the service is regionalized.
+-     */
+-    public boolean isRegionalized() {
+-        return isRegionalized;
+-    }
+-
+-    /**
+-     * sets the regionalized property for a service..
+-     */
+-    @JsonProperty(value = "isRegionalized")
+-    public void setRegionalized(boolean regionalized) {
+-        isRegionalized = regionalized;
+-    }
+-
+-    /**
+-     * A convienient method that returns true if a service has a partition
+-     * wide endpoint available.
+-     */
+-    public boolean isPartitionWideEndpointAvailable() {
+-        return this.partitionEndpoint != null;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/partitions/PartitionMetadataProvider.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/partitions/PartitionMetadataProvider.java
+--- ./src/main/java/com/amazonaws/partitions/PartitionMetadataProvider.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/partitions/PartitionMetadataProvider.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,111 +0,0 @@
+-/*
+- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.partitions;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.partitions.model.Partition;
+-import com.amazonaws.regions.AbstractRegionMetadataProvider;
+-import com.amazonaws.regions.Region;
+-import com.amazonaws.util.ValidationUtils;
+-
+-import java.net.URI;
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.concurrent.ConcurrentHashMap;
+-
+-/**
+- * Region metadata provider based on partitions.
+- */
+-@SdkInternalApi
+-public class PartitionMetadataProvider extends AbstractRegionMetadataProvider {
+-
+-    private final Map partitionMap = new HashMap();
+-
+-    private final Map regionCache = new ConcurrentHashMap();
+-
+-    public PartitionMetadataProvider(List partitions) {
+-        ValidationUtils.assertNotNull(partitions, "partitions");
+-
+-        for (Partition p : partitions) {
+-            partitionMap.put(p.getPartition(), p);
+-        }
+-    }
+-
+-    @Override
+-    public List getRegions() {
+-        final List regions = new ArrayList();
+-
+-        for (Partition p : partitionMap.values()) {
+-            for (Map.Entry
+-                    entry : p.getRegions().entrySet()) {
+-                regions.add(new Region(new PartitionRegionImpl(entry.getKey(),
+-                        p)));
+-            }
+-        }
+-        return Collections.unmodifiableList(regions);
+-    }
+-
+-    @Override
+-    public Region getRegion(String regionName) {
+-
+-        if (regionName == null) return null;
+-
+-        final Region regionFromCache = getRegionFromCache(regionName);
+-
+-        if (regionFromCache != null) {
+-            return regionFromCache;
+-        }
+-
+-        return createNewRegion(regionName);
+-    }
+-
+-    private Region createNewRegion(String regionName) {
+-        for (Partition p : partitionMap.values()) {
+-            if (p.hasRegion(regionName)) {
+-                return cacheRegion(new PartitionRegionImpl(regionName, p));
+-            }
+-        }
+-        return null;
+-    }
+-
+-    private Region getRegionFromCache(String regionName) {
+-        return regionCache.get(regionName);
+-    }
+-
+-    private Region cacheRegion(PartitionRegionImpl regionImpl) {
+-        final Region region = new Region(regionImpl);
+-
+-        regionCache.put(region.getName(), region);
+-
+-        return region;
+-    }
+-
+-    @Override
+-    public List getRegionsForService(String serviceName) {
+-        final List allRegions = getRegions();
+-        final List serviceSupportedRegions = new ArrayList();
+-
+-        for (Region r : allRegions) {
+-            if (r.isServiceSupported(serviceName)) {
+-                serviceSupportedRegions.add(r);
+-            }
+-        }
+-        return serviceSupportedRegions;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/partitions/PartitionRegionImpl.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/partitions/PartitionRegionImpl.java
+--- ./src/main/java/com/amazonaws/partitions/PartitionRegionImpl.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/partitions/PartitionRegionImpl.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,219 +0,0 @@
+-/*
+- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.partitions;
+-
+-import com.amazonaws.partitions.model.Endpoint;
+-import com.amazonaws.partitions.model.Partition;
+-import com.amazonaws.partitions.model.Service;
+-import com.amazonaws.regions.RegionImpl;
+-import com.amazonaws.util.ValidationUtils;
+-
+-import java.util.ArrayList;
+-import java.util.Collection;
+-import java.util.Collections;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.concurrent.ConcurrentHashMap;
+-
+-/**
+- * A region implementation backed by the partition.
+- */
+-public class PartitionRegionImpl implements RegionImpl {
+-
+-    private static final String SERVICE = "{service}";
+-    private static final String REGION = "{region}";
+-    private static final String DNS_SUFFIX = "{dnsSuffix}";
+-
+-    /**
+-     * partition where the region is present.
+-     */
+-    private final Partition partition;
+-
+-    /**
+-     * the name of the region.
+-     */
+-    private final String region;
+-
+-    /**
+-     * endpoint cache for a service.
+-     */
+-    private final Map endpointCache = new ConcurrentHashMap();
+-
+-    public PartitionRegionImpl(String region, Partition p) {
+-        this.partition = ValidationUtils.assertNotNull(p, "partition");
+-        this.region = ValidationUtils.assertNotNull(region, "region");
+-    }
+-
+-    @Override
+-    public String getName() {
+-        return region;
+-    }
+-
+-    @Override
+-    public String getDomain() {
+-        return partition.getDnsSuffix();
+-    }
+-
+-    @Override
+-    public String getPartition() {
+-        return partition.getPartition();
+-    }
+-
+-    /**
+-     * Returns the endpoint for the given service.
+-     * If the region is not present under service configuration; but matches
+-     * the region regex, then this system tries to guess the endpoint and
+-     * returns it.
+-     */
+-    @Override
+-    public String getServiceEndpoint(String serviceName) {
+-        return getEndpointString(serviceName, getEndpoint(serviceName));
+-    }
+-
+-    /**
+-     * Returns the endpoint configuration for a given service.
+-     */
+-    private Endpoint getEndpoint(String serviceName) {
+-        Endpoint cachedEndpoint = endpointCache.get(serviceName);
+-
+-        if (cachedEndpoint == null) {
+-            cachedEndpoint = computeEndpoint(serviceName);
+-            if (cachedEndpoint == null) {
+-                return null;
+-            }
+-        }
+-
+-        endpointCache.put(serviceName, cachedEndpoint);
+-        return cachedEndpoint;
+-    }
+-
+-    private Endpoint computeEndpoint(String serviceName) {
+-
+-        Service service = partition.getServices().get(serviceName);
+-
+-
+-        if (service != null) {
+-            if (service.getEndpoints().containsKey(region)) {
+-
+-                Endpoint merged = Endpoint.merge(
+-                        partition.getDefaults(),
+-                        Endpoint.merge(service.getDefaults(),
+-                                service.getEndpoints().get(region)));
+-
+-                return merged;
+-
+-            } else if (service.isPartitionWideEndpointAvailable() && !service
+-                        .isRegionalized()) {
+-                // partition doesn't have any information about a service.
+-
+-                Endpoint merged = Endpoint.merge(
+-                        partition.getDefaults(),
+-                        Endpoint.merge(service.getDefaults(),
+-                                service.getEndpoints().get(
+-                                        service.getPartitionEndpoint())));
+-
+-                return merged;
+-
+-            } else {
+-                if (partition.getDefaults() != null
+-                        && partition.getDefaults().getHostName() != null) {
+-                    return partition.getDefaults();
+-                }
+-            }
+-        }
+-        return null;
+-    }
+-
+-    private String getEndpointString(String serviceName, Endpoint endpoint) {
+-        return endpoint == null
+-                ? null
+-                : endpoint.getHostName()
+-                .replace(SERVICE, serviceName)
+-                .replace(REGION, region)
+-                .replace(DNS_SUFFIX, partition.getDnsSuffix());
+-    }
+-
+-    /**
+-     * Returns true if the service is explicitly enabled for a region or a
+-     * service is partition wide enabled. Returns false otherwise.
+-     * 

+-     * For new regions that match the partition's region regex, if the
+-     * service is enabled partition wide then this method will return true.
+-     */
+-    @Override
+-    public boolean isServiceSupported(String serviceName) {
+-        return isServiceSupportedInRegion(serviceName) || isServicePartitionWide
+-                (serviceName);
+-    }
+-
+-    /**
+-     * This method returns true only if the metadata for the service contains the given
+-     * region in the list of supported regions.
+-     */
+-    private boolean isServiceSupportedInRegion(String serviceName) {
+-        return partition.getServices().get(serviceName) != null
+-                && partition.getServices().get(serviceName).getEndpoints()
+-                .containsKey(region);
+-    }
+-
+-    private boolean isServicePartitionWide(String serviceName) {
+-        return partition.getServices().get(serviceName) != null
+-                && partition.getServices().get(serviceName)
+-                .getPartitionEndpoint() != null;
+-    }
+-
+-    /**
+-     * Returns true if the service is explicitly enabled for https in this
+-     * region or a service is partition wide enabled. Returns false otherwise.
+-     * 

+-     * For new regions that match the partition's region regex, if the
+-     * service is enabled partition wide then this method will return true.
+-     */
+-    @Override
+-    public boolean hasHttpsEndpoint(String serviceName) {
+-
+-        if (!isServiceSupported(serviceName)) return false;
+-
+-        return getEndpoint(serviceName).hasHttpsSupport();
+-
+-    }
+-
+-    /**
+-     * Returns true if the service is explicitly enabled for http in this
+-     * region or a service is partition wide enabled. Returns false otherwise.
+-     * 

+-     * For new regions that match the partition's region regex, if the
+-     * service is enabled partition wide then this method will return true.
+-     */
+-    @Override
+-    public boolean hasHttpEndpoint(String serviceName) {
+-        if (!isServiceSupported(serviceName)) return false;
+-
+-        return getEndpoint(serviceName).hasHttpSupport();
+-    }
+-
+-    @Override
+-    public Collection getAvailableEndpoints() {
+-        final List endpoints = new ArrayList();
+-        for (String service : partition.getServices().keySet()) {
+-            if (isServiceSupported(service)) {
+-                endpoints.add(getServiceEndpoint(service));
+-            }
+-        }
+-        return Collections.unmodifiableCollection(endpoints);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/partitions/PartitionsLoader.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/partitions/PartitionsLoader.java
+--- ./src/main/java/com/amazonaws/partitions/PartitionsLoader.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/partitions/PartitionsLoader.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,101 +0,0 @@
+-/*
+- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.partitions;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.partitions.model.Partitions;
+-import com.amazonaws.regions.RegionMetadata;
+-import com.amazonaws.util.IOUtils;
+-import com.fasterxml.jackson.core.JsonParser;
+-import com.fasterxml.jackson.databind.DeserializationFeature;
+-import com.fasterxml.jackson.databind.MapperFeature;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-
+-/**
+- * Loads all the partition files into memory.
+- */
+-@SdkInternalApi
+-public class PartitionsLoader {
+-
+-    /**
+-     * class path from where all partition files are loaded.
+-     */
+-    public static final String PARTITIONS_RESOURCE_PATH =
+-            "com/amazonaws/partitions/endpoints.json";
+-
+-    /**
+-     * override class path from where all partition files are loaded.
+-     */
+-    public static final String PARTITIONS_OVERRIDE_RESOURCE_PATH =
+-            "com/amazonaws/partitions/override/endpoints.json";
+-
+-    /**
+-     * Jackson object mapper that is used for parsing the partition files.
+-     */
+-    private static final ObjectMapper mapper = new ObjectMapper()
+-            .disable(MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS)
+-            .disable(MapperFeature.ALLOW_FINAL_FIELDS_AS_MUTATORS)
+-            .enable(JsonParser.Feature.ALLOW_COMMENTS)
+-            .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+-
+-    /**
+-     * classloader to to be used for loading the partitions.
+-     */
+-    private final ClassLoader classLoader;
+-
+-    public PartitionsLoader() {
+-        this.classLoader = PartitionsLoader.class.getClassLoader();
+-    }
+-
+-    /**
+-     * Loads the partition files from the {@link #PARTITIONS_OVERRIDE_RESOURCE_PATH}. If no files are present, then
+-     * loads the partition files from the {@link #PARTITIONS_RESOURCE_PATH}
+-     * 

+-     * Builds the {@link RegionMetadata} from the partition files.
+-     */
+-    public PartitionMetadataProvider build() {
+-
+-        InputStream stream = classLoader
+-                .getResourceAsStream(PARTITIONS_OVERRIDE_RESOURCE_PATH);
+-
+-        if (stream != null) {
+-            return new PartitionMetadataProvider(loadPartitionFromStream(stream, PARTITIONS_OVERRIDE_RESOURCE_PATH).getPartitions());
+-        } else {
+-            stream = classLoader.getResourceAsStream(PARTITIONS_RESOURCE_PATH);
+-            if (stream == null) {
+-                throw new SdkClientException("Unable to load partition metadata from " + PARTITIONS_RESOURCE_PATH);
+-            }
+-            return new PartitionMetadataProvider(loadPartitionFromStream(stream, PARTITIONS_RESOURCE_PATH).getPartitions());
+-        }
+-    }
+-
+-    private Partitions loadPartitionFromStream(InputStream stream, String location) {
+-
+-        try {
+-
+-            return mapper.readValue(stream, Partitions.class);
+-
+-        } catch (IOException e) {
+-            throw new SdkClientException("Error while loading partitions " +
+-                    "file from " + location, e);
+-        } finally {
+-            IOUtils.closeQuietly(stream, null);
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/PredefinedClientConfigurations.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/PredefinedClientConfigurations.java
+--- ./src/main/java/com/amazonaws/PredefinedClientConfigurations.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/PredefinedClientConfigurations.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,48 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws;
+-
+-import com.amazonaws.retry.PredefinedRetryPolicies;
+-
+-/**
+- * Static factory methods for the default {@link ClientConfiguration} for a service. These defaults
+- * are used unless a different {@link ClientConfiguration} is explicitly provided in the constructor
+- * of the service client
+- */
+-public class PredefinedClientConfigurations {
+-
+-    /**
+-     * Factory method for default {@link ClientConfiguration} for all services unless otherwise
+-     * specified
+-     */
+-    public static ClientConfiguration defaultConfig() {
+-        return new ClientConfiguration();
+-    }
+-
+-    /**
+-     * Factory method for DynamoDB's default {@link ClientConfiguration}
+-     */
+-    public static ClientConfiguration dynamoDefault() {
+-        return new ClientConfiguration().withRetryPolicy(PredefinedRetryPolicies.DYNAMODB_DEFAULT);
+-    }
+-
+-    /**
+-     * Factory method for Simple Workflow's default {@link ClientConfiguration}
+-     */
+-    public static ClientConfiguration swfDefault() {
+-        return new ClientConfiguration().withMaxConnections(1000).withSocketTimeout(90000);
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/DefaultMarshallingType.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/DefaultMarshallingType.java
+--- ./src/main/java/com/amazonaws/protocol/DefaultMarshallingType.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/DefaultMarshallingType.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,33 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.protocol;
+-
+-/**
+- * A base implementation for {@link MarshallingType}s that are the default marshallers for their respective types. This will
+- * return "true" for {@link #isDefaultMarshallerForType(Class)} if the provided class is a subclass of this class's type.
+- */
+-final class DefaultMarshallingType implements MarshallingType {
+-    private final Class type;
+-
+-    protected DefaultMarshallingType(Class type) {
+-        this.type = type;
+-    }
+-
+-    @Override
+-    public boolean isDefaultMarshallerForType(Class type) {
+-        return this.type.isAssignableFrom(type);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/DefaultValueSupplier.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/DefaultValueSupplier.java
+--- ./src/main/java/com/amazonaws/protocol/DefaultValueSupplier.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/DefaultValueSupplier.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,33 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol;
+-
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-/**
+- * Interface to provide a default value for a null member during marshalling. Currently used for
+- * members that have the idempotency trait applied and for Glacier's account ID member (which defaults to '-' indicating
+- * the current account).
+- *
+- * @param  Type of the member to provide the default value for.
+- */
+-@SdkProtectedApi
+-public interface DefaultValueSupplier {
+-
+-    /**
+-     * @return The default value to use if the value is null.
+-     */
+-    T get();
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/internal/HeaderMarshallers.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/internal/HeaderMarshallers.java
+--- ./src/main/java/com/amazonaws/protocol/json/internal/HeaderMarshallers.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/internal/HeaderMarshallers.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,58 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol.json.internal;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-import java.util.Date;
+-
+-@SdkInternalApi
+-public class HeaderMarshallers {
+-
+-    public static final JsonMarshaller STRING = new SimpleHeaderMarshaller(
+-            ValueToStringConverters.FROM_STRING);
+-
+-    public static final JsonMarshaller JSON_VALUE = new SimpleHeaderMarshaller(
+-            ValueToStringConverters.FROM_JSON_VALUE_HEADER);
+-
+-    public static final JsonMarshaller INTEGER = new SimpleHeaderMarshaller(
+-            ValueToStringConverters.FROM_INTEGER);
+-
+-    public static final JsonMarshaller LONG = new SimpleHeaderMarshaller(ValueToStringConverters.FROM_LONG);
+-
+-    public static final JsonMarshaller DOUBLE = new SimpleHeaderMarshaller(
+-            ValueToStringConverters.FROM_DOUBLE);
+-
+-    public static final JsonMarshaller FLOAT = new SimpleHeaderMarshaller(ValueToStringConverters.FROM_FLOAT);
+-
+-    public static final JsonMarshaller BOOLEAN = new SimpleHeaderMarshaller(
+-            ValueToStringConverters.FROM_BOOLEAN);
+-
+-    public static final JsonMarshaller DATE = new SimpleHeaderMarshaller(ValueToStringConverters.FROM_DATE);
+-
+-    private static class SimpleHeaderMarshaller implements JsonMarshaller {
+-
+-        private final ValueToStringConverters.ValueToString converter;
+-
+-        private SimpleHeaderMarshaller(ValueToStringConverters.ValueToString converter) {
+-            this.converter = converter;
+-        }
+-
+-        @Override
+-        public void marshall(T val, JsonMarshallerContext context, String paramName) {
+-            context.request().addHeader(paramName, converter.convert(val));
+-        }
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/internal/JsonMarshallerContext.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/internal/JsonMarshallerContext.java
+--- ./src/main/java/com/amazonaws/protocol/json/internal/JsonMarshallerContext.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/internal/JsonMarshallerContext.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,139 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol.json.internal;
+-
+-import com.amazonaws.Request;
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.protocol.json.StructuredJsonGenerator;
+-import com.amazonaws.protocol.MarshallLocation;
+-import com.amazonaws.protocol.ProtocolMarshaller;
+-
+-/**
+- * Dependencies needed by implemenatations of {@link JsonMarshaller}.
+- */
+-@SdkInternalApi
+-public class JsonMarshallerContext {
+-
+-    private final StructuredJsonGenerator jsonGenerator;
+-    private final JsonProtocolMarshaller protocolHandler;
+-    private final MarshallerRegistry marshallerRegistry;
+-    private final Request request;
+-
+-    private JsonMarshallerContext(Builder builder) {
+-        this.jsonGenerator = builder.jsonGenerator;
+-        this.protocolHandler = builder.protocolHandler;
+-        this.marshallerRegistry = builder.marshallerRegistry;
+-        this.request = builder.request;
+-    }
+-
+-    /**
+-     * @return StructuredJsonGenerator used to produce the JSON document for a request.
+-     */
+-    public StructuredJsonGenerator jsonGenerator() {
+-        return jsonGenerator;
+-    }
+-
+-    /**
+-     * @return Implementation of {@link ProtocolMarshaller} that can be used to call back out to marshall structured data (i.e.
+-     * lists of objects).
+-     */
+-    public ProtocolMarshaller protocolHandler() {
+-        return protocolHandler;
+-    }
+-
+-    /**
+-     * @return Marshaller registry to obtain marshaller implementations for nested types (i.e. lists of objects or maps of string
+-     * to string).
+-     */
+-    public MarshallerRegistry marshallerRegistry() {
+-        return marshallerRegistry;
+-    }
+-
+-    /**
+-     * @return Mutable {@link Request} object that can be used to add headers, query params, modify request URI, etc.
+-     */
+-    public Request request() {
+-        return request;
+-    }
+-
+-    /**
+-     * Convenience method to marshall a nested object (may be simple or structured) at the given location.
+-     *
+-     * @param marshallLocation Current {@link MarshallLocation}
+-     * @param val              Value to marshall.
+-     */
+-    public void marshall(MarshallLocation marshallLocation, Object val) {
+-        marshallerRegistry().getMarshaller(marshallLocation, val).marshall(val, this, null);
+-    }
+-
+-    /**
+-     * Convenience method to marshall a nested object (may be simple or structured) at the given location.
+-     *
+-     * @param marshallLocation Current {@link MarshallLocation}
+-     * @param val              Value to marshall.
+-     * @param paramName        Name of parameter to marshall.
+-     */
+-    public void marshall(MarshallLocation marshallLocation, Object val, String paramName) {
+-        marshallerRegistry().getMarshaller(marshallLocation, val).marshall(val, this, paramName);
+-    }
+-
+-    /**
+-     * @return Builder instance to construct a {@link JsonMarshallerContext}.
+-     */
+-    public static Builder builder() {
+-        return new Builder();
+-    }
+-
+-    /**
+-     * Builder for a {@link JsonMarshallerContext}.
+-     */
+-    public static final class Builder {
+-
+-        private StructuredJsonGenerator jsonGenerator;
+-        private JsonProtocolMarshaller protocolHandler;
+-        private MarshallerRegistry marshallerRegistry;
+-        private Request request;
+-
+-        private Builder() {
+-        }
+-
+-        public Builder jsonGenerator(StructuredJsonGenerator jsonGenerator) {
+-            this.jsonGenerator = jsonGenerator;
+-            return this;
+-        }
+-
+-        public Builder protocolHandler(JsonProtocolMarshaller protocolHandler) {
+-            this.protocolHandler = protocolHandler;
+-            return this;
+-        }
+-
+-        public Builder marshallerRegistry(MarshallerRegistry marshallerRegistry) {
+-            this.marshallerRegistry = marshallerRegistry;
+-            return this;
+-        }
+-
+-        public Builder request(Request request) {
+-            this.request = request;
+-            return this;
+-        }
+-
+-        /**
+-         * @return An immutable {@link JsonMarshallerContext} object.
+-         */
+-        public JsonMarshallerContext build() {
+-            return new JsonMarshallerContext(this);
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/internal/JsonMarshaller.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/internal/JsonMarshaller.java
+--- ./src/main/java/com/amazonaws/protocol/json/internal/JsonMarshaller.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/internal/JsonMarshaller.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,42 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol.json.internal;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-
+-/**
+- * Interface to marshall data according to the JSON protocol specification.
+- *
+- * @param  Type to marshall.
+- */
+-@SdkInternalApi
+-public interface JsonMarshaller {
+-
+-    JsonMarshaller NULL = new JsonMarshaller() {
+-        @Override
+-        public void marshall(Void val, JsonMarshallerContext context, String paramName) {
+-        }
+-    };
+-
+-    /**
+-     * Marshall the data into the request.
+-     *
+-     * @param val       Data to marshall (may be null).
+-     * @param context   Dependencies needed for marshalling.
+-     * @param paramName Optional param/field name. May be null in certain situations.
+-     */
+-    void marshall(T val, JsonMarshallerContext context, String paramName);
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/internal/JsonProtocolMarshaller.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/internal/JsonProtocolMarshaller.java
+--- ./src/main/java/com/amazonaws/protocol/json/internal/JsonProtocolMarshaller.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/internal/JsonProtocolMarshaller.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,200 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is divalibuted
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol.json.internal;
+-
+-import com.amazonaws.AmazonWebServiceRequest;
+-import com.amazonaws.DefaultRequest;
+-import com.amazonaws.Request;
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.protocol.MarshallingInfo;
+-import com.amazonaws.protocol.MarshallingType;
+-import com.amazonaws.protocol.OperationInfo;
+-import com.amazonaws.protocol.ProtocolMarshaller;
+-import com.amazonaws.protocol.ProtocolRequestMarshaller;
+-import com.amazonaws.protocol.json.StructuredJsonGenerator;
+-import com.amazonaws.util.BinaryUtils;
+-import com.amazonaws.util.UriResourcePathUtils;
+-import java.io.ByteArrayInputStream;
+-import java.io.InputStream;
+-import java.nio.ByteBuffer;
+-
+-/**
+- * Implementation of {@link ProtocolMarshaller} for JSON based services. This includes JSON-RPC and REST-JSON.
+- *
+- * @param  Type of the original request object.
+- */
+-@SdkInternalApi
+-public class JsonProtocolMarshaller implements ProtocolRequestMarshaller {
+-
+-    private static final MarshallerRegistry DEFAULT_MARSHALLER_REGISTRY = createDefaultMarshallerRegistry();
+-
+-    private final StructuredJsonGenerator jsonGenerator;
+-    private final Request request;
+-    private final String contentType;
+-    private final boolean hasExplicitPayloadMember;
+-
+-    private final JsonMarshallerContext marshallerContext;
+-    private final MarshallerRegistry marshallerRegistry;
+-
+-    public JsonProtocolMarshaller(StructuredJsonGenerator jsonGenerator,
+-                                  String contentType,
+-                                  OperationInfo operationInfo,
+-                                  OrigRequest originalRequest,
+-                                  MarshallerRegistry.Builder marshallerRegistryOverrides) {
+-        this.jsonGenerator = jsonGenerator;
+-        this.contentType = contentType;
+-        this.hasExplicitPayloadMember = operationInfo.hasExplicitPayloadMember();
+-        this.request = fillBasicRequestParams(operationInfo, originalRequest);
+-        this.marshallerRegistry = DEFAULT_MARSHALLER_REGISTRY.merge(marshallerRegistryOverrides);
+-        this.marshallerContext = JsonMarshallerContext.builder()
+-                                                      .jsonGenerator(jsonGenerator)
+-                                                      .marshallerRegistry(marshallerRegistry)
+-                                                      .protocolHandler(this)
+-                                                      .request(request)
+-                                                      .build();
+-    }
+-
+-    private Request fillBasicRequestParams(OperationInfo operationInfo, OrigRequest originalRequest) {
+-        Request request = createRequest(operationInfo, originalRequest);
+-        request.setHttpMethod(operationInfo.httpMethodName());
+-        request.setResourcePath(UriResourcePathUtils.addStaticQueryParamtersToRequest(request, operationInfo.requestUri()));
+-        if (operationInfo.operationIdentifier() != null) {
+-            request.addHeader("X-Amz-Target", operationInfo.operationIdentifier());
+-        }
+-        return request;
+-    }
+-
+-    private DefaultRequest createRequest(OperationInfo operationInfo, OrigRequest originalRequest) {
+-        if (originalRequest instanceof AmazonWebServiceRequest) {
+-            return new DefaultRequest((AmazonWebServiceRequest) originalRequest, operationInfo.serviceName());
+-        } else {
+-            return new DefaultRequest(operationInfo.serviceName());
+-        }
+-    }
+-
+-    private static MarshallerRegistry createDefaultMarshallerRegistry() {
+-        return MarshallerRegistry.builder()
+-                                 .payloadMarshaller(MarshallingType.STRING, SimpleTypeJsonMarshallers.STRING)
+-                                 .payloadMarshaller(MarshallingType.JSON_VALUE, SimpleTypeJsonMarshallers.STRING)
+-                                 .payloadMarshaller(MarshallingType.INTEGER, SimpleTypeJsonMarshallers.INTEGER)
+-                                 .payloadMarshaller(MarshallingType.LONG, SimpleTypeJsonMarshallers.LONG)
+-                                 .payloadMarshaller(MarshallingType.DOUBLE, SimpleTypeJsonMarshallers.DOUBLE)
+-                                 .payloadMarshaller(MarshallingType.FLOAT, SimpleTypeJsonMarshallers.FLOAT)
+-                                 .payloadMarshaller(MarshallingType.BIG_DECIMAL, SimpleTypeJsonMarshallers.BIG_DECIMAL)
+-                                 .payloadMarshaller(MarshallingType.BOOLEAN, SimpleTypeJsonMarshallers.BOOLEAN)
+-                                 .payloadMarshaller(MarshallingType.DATE, SimpleTypeJsonMarshallers.DATE)
+-                                 .payloadMarshaller(MarshallingType.BYTE_BUFFER, SimpleTypeJsonMarshallers.BYTE_BUFFER)
+-                                 .payloadMarshaller(MarshallingType.STRUCTURED, SimpleTypeJsonMarshallers.STRUCTURED)
+-                                 .payloadMarshaller(MarshallingType.LIST, SimpleTypeJsonMarshallers.LIST)
+-                                 .payloadMarshaller(MarshallingType.MAP, SimpleTypeJsonMarshallers.MAP)
+-                                 .payloadMarshaller(MarshallingType.NULL, SimpleTypeJsonMarshallers.NULL)
+-
+-                                 .headerMarshaller(MarshallingType.STRING, HeaderMarshallers.STRING)
+-                                 .headerMarshaller(MarshallingType.JSON_VALUE, HeaderMarshallers.JSON_VALUE)
+-                                 .headerMarshaller(MarshallingType.INTEGER, HeaderMarshallers.INTEGER)
+-                                 .headerMarshaller(MarshallingType.LONG, HeaderMarshallers.LONG)
+-                                 .headerMarshaller(MarshallingType.DOUBLE, HeaderMarshallers.DOUBLE)
+-                                 .headerMarshaller(MarshallingType.FLOAT, HeaderMarshallers.FLOAT)
+-                                 .headerMarshaller(MarshallingType.BOOLEAN, HeaderMarshallers.BOOLEAN)
+-                                 .headerMarshaller(MarshallingType.DATE, HeaderMarshallers.DATE)
+-                                 .headerMarshaller(MarshallingType.NULL, JsonMarshaller.NULL)
+-
+-                                 .queryParamMarshaller(MarshallingType.STRING, QueryParamMarshallers.STRING)
+-                                 .queryParamMarshaller(MarshallingType.INTEGER, QueryParamMarshallers.INTEGER)
+-                                 .queryParamMarshaller(MarshallingType.LONG, QueryParamMarshallers.LONG)
+-                                 .queryParamMarshaller(MarshallingType.DOUBLE, QueryParamMarshallers.DOUBLE)
+-                                 .queryParamMarshaller(MarshallingType.FLOAT, QueryParamMarshallers.FLOAT)
+-                                 .queryParamMarshaller(MarshallingType.BOOLEAN, QueryParamMarshallers.BOOLEAN)
+-                                 .queryParamMarshaller(MarshallingType.DATE, QueryParamMarshallers.DATE)
+-                                 .queryParamMarshaller(MarshallingType.LIST, QueryParamMarshallers.LIST)
+-                                 .queryParamMarshaller(MarshallingType.MAP, QueryParamMarshallers.MAP)
+-                                 .queryParamMarshaller(MarshallingType.NULL, JsonMarshaller.NULL)
+-
+-                                 .pathParamMarshaller(MarshallingType.STRING, SimpleTypePathMarshallers.STRING)
+-                                 .pathParamMarshaller(MarshallingType.INTEGER, SimpleTypePathMarshallers.INTEGER)
+-                                 .pathParamMarshaller(MarshallingType.LONG, SimpleTypePathMarshallers.LONG)
+-                                 .pathParamMarshaller(MarshallingType.NULL, SimpleTypePathMarshallers.NULL)
+-
+-                                 .greedyPathParamMarshaller(MarshallingType.STRING, SimpleTypePathMarshallers.GREEDY_STRING)
+-                                 .greedyPathParamMarshaller(MarshallingType.NULL, SimpleTypePathMarshallers.NULL)
+-                                 .build();
+-    }
+-
+-    /**
+-     * If there is not an explicit payload member then we need to start the implicit JSON request object. All
+-     * members bound to the payload will be added as fields to this object.
+-     */
+-    @Override
+-    public void startMarshalling() {
+-        if (!hasExplicitPayloadMember) {
+-            jsonGenerator.writeStartObject();
+-        }
+-    }
+-
+-    @Override
+-    public  void marshall(V val, MarshallingInfo marshallingInfo) {
+-        doMarshall(resolveValue(val, marshallingInfo), marshallingInfo);
+-    }
+-
+-    /**
+-     * @return The original value if non-null, or if value is null and a {@link com.amazonaws.protocol.DefaultValueSupplier} is
+-     * present return the default value. Otherwise return null.
+-     */
+-    private  V resolveValue(V val, MarshallingInfo marshallingInfo) {
+-        return val == null && marshallingInfo.defaultValueSupplier() != null ? marshallingInfo.defaultValueSupplier().get() : val;
+-    }
+-
+-    private  void doMarshall(V val, MarshallingInfo marshallingInfo) {
+-        if (marshallingInfo.isBinary()) {
+-            marshallBinaryPayload(val);
+-        } else {
+-            marshallerRegistry.getMarshaller(marshallingInfo.marshallLocation(), marshallingInfo.marshallingType(), val)
+-                              .marshall(val, marshallerContext, marshallingInfo.marshallLocationName());
+-        }
+-    }
+-
+-    /**
+-     * Binary data should be placed as is, directly into the content.
+-     */
+-    private void marshallBinaryPayload(Object val) {
+-        if (val instanceof ByteBuffer) {
+-            request.setContent(BinaryUtils.toStream((ByteBuffer) val));
+-        } else if (val instanceof InputStream) {
+-            request.setContent((InputStream) val);
+-        }
+-    }
+-
+-    @Override
+-    public Request finishMarshalling() {
+-        // Content may already be set if the payload is binary data.
+-        if (request.getContent() == null) {
+-            // End the implicit request object if needed.
+-            if (!hasExplicitPayloadMember) {
+-                jsonGenerator.writeEndObject();
+-            }
+-
+-            byte[] content = jsonGenerator.getBytes();
+-            request.setContent(new ByteArrayInputStream(content));
+-            if (content.length > 0) {
+-                request.addHeader("Content-Length", Integer.toString(content.length));
+-            }
+-        }
+-        if (!request.getHeaders().containsKey("Content-Type")) {
+-            request.addHeader("Content-Type", contentType);
+-        }
+-        return request;
+-    }
+-
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/internal/MarshallerRegistry.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/internal/MarshallerRegistry.java
+--- ./src/main/java/com/amazonaws/protocol/json/internal/MarshallerRegistry.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/internal/MarshallerRegistry.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,181 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol.json.internal;
+-
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.protocol.MarshallLocation;
+-import com.amazonaws.protocol.MarshallingType;
+-import com.amazonaws.protocol.StructuredPojo;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.Map;
+-import java.util.Set;
+-
+-@SdkInternalApi
+-public class MarshallerRegistry {
+-
+-    private final Map>> marshallers;
+-    private final Set> marshallingTypes;
+-    private final Map, MarshallingType> marshallingTypeCache;
+-
+-    private MarshallerRegistry(Builder builder) {
+-        this.marshallers = builder.marshallers;
+-        this.marshallingTypes = builder.marshallingTypes;
+-        this.marshallingTypeCache = new HashMap, MarshallingType>(marshallingTypes.size());
+-
+-    }
+-
+-    public  JsonMarshaller getMarshaller(MarshallLocation marshallLocation, T val) {
+-        return getMarshaller(marshallLocation, toMarshallingType(val));
+-    }
+-
+-    public  JsonMarshaller getMarshaller(MarshallLocation marshallLocation, MarshallingType marshallingType, T val) {
+-        return getMarshaller(marshallLocation,
+-                             val == null ? MarshallingType.NULL : marshallingType);
+-    }
+-
+-    @SuppressWarnings("unchecked")
+-    private  JsonMarshaller getMarshaller(MarshallLocation marshallLocation, MarshallingType marshallingType) {
+-        return (JsonMarshaller) marshallers.get(marshallLocation).get(marshallingType);
+-    }
+-
+-    @SuppressWarnings("unchecked")
+-    public  MarshallingType toMarshallingType(T val) {
+-        if (val == null) {
+-            return (MarshallingType) MarshallingType.NULL;
+-        } else if (val instanceof StructuredPojo) {
+-            // We don't want to cache every single POJO type so we make a special case of it here.
+-            return (MarshallingType) MarshallingType.STRUCTURED;
+-        } else if (!marshallingTypeCache.containsKey(val.getClass())) {
+-            return (MarshallingType) populateMarshallingTypeCache(val.getClass());
+-        }
+-        return (MarshallingType) marshallingTypeCache.get(val.getClass());
+-    }
+-
+-    private MarshallingType populateMarshallingTypeCache(Class clzz) {
+-        synchronized (marshallingTypeCache) {
+-            if (!marshallingTypeCache.containsKey(clzz)) {
+-                for (MarshallingType marshallingType : marshallingTypes) {
+-                    if (marshallingType.isDefaultMarshallerForType(clzz)) {
+-                        marshallingTypeCache.put(clzz, marshallingType);
+-                        return marshallingType;
+-                    }
+-                }
+-                throw new SdkClientException("MarshallingType not found for class " + clzz);
+-            }
+-        }
+-        return marshallingTypeCache.get(clzz);
+-    }
+-
+-    /**
+-     * Merge the given overrides with 'this' registry. Overrides are higher precedence than 'this' registry. Both 'this'
+-     * registry and the override registry are immutable so a new registry object is returned. If the marshallerRegistryOverrides
+-     * are null then this method just returns the current registry since there is nothing to merge.
+-     *
+-     * @param marshallerRegistryOverrides Override registry.
+-     * @return New {@link MarshallerRegistry} with marshallers merged.
+-     */
+-    public MarshallerRegistry merge(MarshallerRegistry.Builder marshallerRegistryOverrides) {
+-        if(marshallerRegistryOverrides == null) {
+-            return this;
+-        }
+-        Builder merged = MarshallerRegistry.builder();
+-        merged.copyMarshallersFromRegistry(this.marshallers);
+-        merged.copyMarshallersFromRegistry(marshallerRegistryOverrides.marshallers);
+-        return merged.build();
+-    }
+-
+-    /**
+-     * @return Builder instance to construct a {@link MarshallerRegistry}.
+-     */
+-    public static Builder builder() {
+-        return new Builder();
+-    }
+-
+-    /**
+-     * Builder for a {@link MarshallerRegistry}.
+-     */
+-    public static final class Builder {
+-
+-        private final Map>> marshallers
+-                = new HashMap>>();
+-        private final Set> marshallingTypes
+-                = new HashSet>();
+-
+-        private Builder() {
+-        }
+-
+-        public  Builder payloadMarshaller(MarshallingType marshallingType,
+-                                             JsonMarshaller marshaller) {
+-            return addMarshaller(MarshallLocation.PAYLOAD, marshallingType, marshaller);
+-        }
+-
+-        public  Builder headerMarshaller(MarshallingType marshallingType,
+-                                            JsonMarshaller marshaller) {
+-            return addMarshaller(MarshallLocation.HEADER, marshallingType, marshaller);
+-        }
+-
+-        public  Builder queryParamMarshaller(MarshallingType marshallingType,
+-                                                JsonMarshaller marshaller) {
+-            return addMarshaller(MarshallLocation.QUERY_PARAM, marshallingType, marshaller);
+-        }
+-
+-        public  Builder pathParamMarshaller(MarshallingType marshallingType,
+-                                               JsonMarshaller marshaller) {
+-            return addMarshaller(MarshallLocation.PATH, marshallingType, marshaller);
+-        }
+-
+-        public  Builder greedyPathParamMarshaller(MarshallingType marshallingType,
+-                                                     JsonMarshaller marshaller) {
+-            return addMarshaller(MarshallLocation.GREEDY_PATH, marshallingType, marshaller);
+-        }
+-
+-        public  Builder addMarshaller(MarshallLocation marshallLocation,
+-                                         MarshallingType marshallingType,
+-                                         JsonMarshaller marshaller) {
+-            marshallingTypes.add(marshallingType);
+-            if (!marshallers.containsKey(marshallLocation)) {
+-                marshallers.put(marshallLocation, new HashMap>());
+-            }
+-            marshallers.get(marshallLocation).put(marshallingType, marshaller);
+-            return this;
+-        }
+-
+-        /**
+-         * @return An immutable {@link MarshallerRegistry} object.
+-         */
+-        public MarshallerRegistry build() {
+-            return new MarshallerRegistry(this);
+-        }
+-
+-        /**
+-         * Fill this builder with marshallers from the source {@link MarshallerRegistry}. Will overwrite anything that is
+-         * registered with the same location and type.
+-         *
+-         * @param sourceMarshallers Marshallers to copy in.
+-         */
+-        private void copyMarshallersFromRegistry(
+-                Map>> sourceMarshallers) {
+-
+-            for (Map.Entry>> byLocationEntry :
+-                    sourceMarshallers.entrySet()) {
+-                for (Map.Entry> byTypeEntry : byLocationEntry.getValue().entrySet()) {
+-                    this.addMarshaller(byLocationEntry.getKey(), byTypeEntry.getKey(), byTypeEntry.getValue());
+-                }
+-            }
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/internal/NullAsEmptyBodyProtocolRequestMarshaller.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/internal/NullAsEmptyBodyProtocolRequestMarshaller.java
+--- ./src/main/java/com/amazonaws/protocol/json/internal/NullAsEmptyBodyProtocolRequestMarshaller.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/internal/NullAsEmptyBodyProtocolRequestMarshaller.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,55 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol.json.internal;
+-
+-import com.amazonaws.Request;
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.protocol.MarshallingInfo;
+-import com.amazonaws.protocol.ProtocolRequestMarshaller;
+-
+-/**
+- * AWS services expect an empty body when the payload member is null instead of an explicit JSON null.
+- * This implementation can be removed once CR-6541513 has been deployed to all services that use the payload trait.
+- *
+- * @param  Type of the original request object.
+- */
+-@SdkInternalApi
+-public class NullAsEmptyBodyProtocolRequestMarshaller implements ProtocolRequestMarshaller {
+-
+-    private final ProtocolRequestMarshaller delegate;
+-
+-    public NullAsEmptyBodyProtocolRequestMarshaller(ProtocolRequestMarshaller delegate) {
+-        this.delegate = delegate;
+-    }
+-
+-    @Override
+-    public void startMarshalling() {
+-        delegate.startMarshalling();
+-    }
+-
+-    @Override
+-    public  void marshall(V val, MarshallingInfo marshallingInfo) {
+-        // If the payload member is null then don't marshall it (since it will become an explicit null)
+-        if (marshallingInfo.isExplicitPayloadMember() && val == null) {
+-            return;
+-        }
+-        delegate.marshall(val, marshallingInfo);
+-    }
+-
+-    @Override
+-    public Request finishMarshalling() {
+-        return delegate.finishMarshalling();
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/internal/QueryParamMarshallers.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/internal/QueryParamMarshallers.java
+--- ./src/main/java/com/amazonaws/protocol/json/internal/QueryParamMarshallers.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/internal/QueryParamMarshallers.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,78 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol.json.internal;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.protocol.MarshallLocation;
+-
+-import java.util.Date;
+-import java.util.List;
+-import java.util.Map;
+-
+-@SdkInternalApi
+-public class QueryParamMarshallers {
+-
+-    public static final JsonMarshaller STRING = new SimpleQueryParamMarshaller(
+-            ValueToStringConverters.FROM_STRING);
+-
+-    public static final JsonMarshaller INTEGER = new SimpleQueryParamMarshaller(
+-            ValueToStringConverters.FROM_INTEGER);
+-
+-    public static final JsonMarshaller LONG = new SimpleQueryParamMarshaller(ValueToStringConverters.FROM_LONG);
+-
+-    public static final JsonMarshaller DOUBLE = new SimpleQueryParamMarshaller(
+-            ValueToStringConverters.FROM_DOUBLE);
+-
+-    public static final JsonMarshaller FLOAT = new SimpleQueryParamMarshaller(
+-            ValueToStringConverters.FROM_FLOAT);
+-
+-    public static final JsonMarshaller BOOLEAN = new SimpleQueryParamMarshaller(
+-            ValueToStringConverters.FROM_BOOLEAN);
+-
+-    public static final JsonMarshaller DATE = new SimpleQueryParamMarshaller(ValueToStringConverters.FROM_DATE);
+-
+-    public static final JsonMarshaller LIST = new JsonMarshaller() {
+-        @Override
+-        public void marshall(List list, JsonMarshallerContext context, String paramName) {
+-            for (Object listVal : list) {
+-                context.marshall(MarshallLocation.QUERY_PARAM, listVal, paramName);
+-            }
+-        }
+-    };
+-
+-    public static final JsonMarshaller MAP = new JsonMarshaller() {
+-
+-        @Override
+-        public void marshall(Map val, JsonMarshallerContext context, String paramName) {
+-            for (Map.Entry mapEntry : ((Map) val).entrySet()) {
+-                context.marshall(MarshallLocation.QUERY_PARAM, mapEntry.getValue(), mapEntry.getKey());
+-            }
+-        }
+-    };
+-
+-    private static class SimpleQueryParamMarshaller implements JsonMarshaller {
+-
+-        private final ValueToStringConverters.ValueToString converter;
+-
+-        private SimpleQueryParamMarshaller(ValueToStringConverters.ValueToString converter) {
+-            this.converter = converter;
+-        }
+-
+-        @Override
+-        public void marshall(T val, JsonMarshallerContext context, String paramName) {
+-            context.request().addParameter(paramName, converter.convert(val));
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/internal/SimpleTypeJsonMarshallers.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/internal/SimpleTypeJsonMarshallers.java
+--- ./src/main/java/com/amazonaws/protocol/json/internal/SimpleTypeJsonMarshallers.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/internal/SimpleTypeJsonMarshallers.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,205 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol.json.internal;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.internal.SdkInternalList;
+-import com.amazonaws.internal.SdkInternalMap;
+-import com.amazonaws.protocol.MarshallLocation;
+-import com.amazonaws.protocol.StructuredPojo;
+-import com.amazonaws.protocol.json.StructuredJsonGenerator;
+-import com.amazonaws.protocol.json.StructuredJsonMarshaller;
+-import java.math.BigDecimal;
+-import java.nio.ByteBuffer;
+-import java.util.Date;
+-import java.util.List;
+-import java.util.Map;
+-
+-@SdkInternalApi
+-public class SimpleTypeJsonMarshallers {
+-
+-    public static final JsonMarshaller NULL = new JsonMarshaller() {
+-        @Override
+-        public void marshall(Void val, JsonMarshallerContext context, String paramName) {
+-            // If paramName is non null then we are emitting a field of an object, in that
+-            // we just don't write the field. If param name is null then we are either in a container
+-            // or the thing being marshalled is the payload itself in which case we want to preserve
+-            // the JSON null.
+-            if (paramName == null) {
+-                context.jsonGenerator().writeNull();
+-            }
+-        }
+-    };
+-
+-    public static final JsonMarshaller STRING = new BaseJsonMarshaller() {
+-        @Override
+-        public void marshall(String val, StructuredJsonGenerator jsonGenerator, JsonMarshallerContext context) {
+-            jsonGenerator.writeValue(val);
+-        }
+-    };
+-
+-    public static final JsonMarshaller INTEGER = new BaseJsonMarshaller() {
+-        @Override
+-        public void marshall(Integer val, StructuredJsonGenerator jsonGenerator, JsonMarshallerContext context) {
+-            jsonGenerator.writeValue(val);
+-        }
+-    };
+-
+-    public static final JsonMarshaller LONG = new BaseJsonMarshaller() {
+-        @Override
+-        public void marshall(Long val, StructuredJsonGenerator jsonGenerator, JsonMarshallerContext context) {
+-            jsonGenerator.writeValue(val);
+-        }
+-    };
+-
+-    public static final JsonMarshaller FLOAT = new BaseJsonMarshaller() {
+-        @Override
+-        public void marshall(Float val, StructuredJsonGenerator jsonGenerator, JsonMarshallerContext context) {
+-            jsonGenerator.writeValue(val);
+-        }
+-    };
+-
+-    public static final JsonMarshaller BIG_DECIMAL = new BaseJsonMarshaller() {
+-        @Override
+-        public void marshall(BigDecimal val, StructuredJsonGenerator jsonGenerator, JsonMarshallerContext context) {
+-            jsonGenerator.writeValue(val);
+-        }
+-    };
+-
+-    public static final JsonMarshaller DOUBLE = new BaseJsonMarshaller() {
+-        @Override
+-        public void marshall(Double val, StructuredJsonGenerator jsonGenerator, JsonMarshallerContext context) {
+-            jsonGenerator.writeValue(val);
+-        }
+-    };
+-
+-    public static final JsonMarshaller BOOLEAN = new BaseJsonMarshaller() {
+-        @Override
+-        public void marshall(Boolean val, StructuredJsonGenerator jsonGenerator, JsonMarshallerContext context) {
+-            jsonGenerator.writeValue(val);
+-        }
+-    };
+-
+-    public static final JsonMarshaller DATE = new BaseJsonMarshaller() {
+-        @Override
+-        public void marshall(Date val, StructuredJsonGenerator jsonGenerator, JsonMarshallerContext context) {
+-            jsonGenerator.writeValue(val);
+-        }
+-    };
+-
+-    public static final JsonMarshaller BYTE_BUFFER = new BaseJsonMarshaller() {
+-        @Override
+-        public void marshall(ByteBuffer val, StructuredJsonGenerator jsonGenerator, JsonMarshallerContext context) {
+-            jsonGenerator.writeValue(val);
+-        }
+-    };
+-
+-    public static final JsonMarshaller STRUCTURED = new BaseJsonMarshaller() {
+-        @Override
+-        public void marshall(StructuredPojo val, StructuredJsonGenerator jsonGenerator, JsonMarshallerContext context) {
+-            jsonGenerator.writeStartObject();
+-            val.marshall(context.protocolHandler());
+-            jsonGenerator.writeEndObject();
+-
+-        }
+-    };
+-
+-    public static final JsonMarshaller LIST = new BaseJsonMarshaller() {
+-        @Override
+-        public void marshall(List list, StructuredJsonGenerator jsonGenerator, JsonMarshallerContext context) {
+-            jsonGenerator.writeStartArray();
+-            for (Object listValue : list) {
+-                context.marshall(MarshallLocation.PAYLOAD, listValue);
+-            }
+-            jsonGenerator.writeEndArray();
+-        }
+-
+-        @Override
+-        protected boolean shouldEmit(List list) {
+-            return !(list.isEmpty() && list instanceof SdkInternalList && ((SdkInternalList) list).isAutoConstruct());
+-        }
+-    };
+-
+-    /**
+-     * Marshalls a Map as a JSON object where each key becomes a field.
+-     */
+-    public static final JsonMarshaller MAP = new BaseJsonMarshaller() {
+-        @Override
+-        public void marshall(Map map, StructuredJsonGenerator jsonGenerator, JsonMarshallerContext context) {
+-            jsonGenerator.writeStartObject();
+-            for (Map.Entry entry : ((Map) map).entrySet()) {
+-                if (entry.getValue() != null) {
+-                    final Object value = entry.getValue();
+-                    jsonGenerator.writeFieldName(entry.getKey());
+-                    context.marshall(MarshallLocation.PAYLOAD, value);
+-                }
+-            }
+-            jsonGenerator.writeEndObject();
+-        }
+-
+-        @Override
+-        protected boolean shouldEmit(Map map) {
+-            return !(map.isEmpty() && map instanceof SdkInternalMap && ((SdkInternalMap) map).isAutoConstruct());
+-        }
+-    };
+-
+-    /**
+-     * Adapt a {@link StructuredJsonMarshaller} to a {@link JsonMarshaller}. {@link JsonMarshaller} has a lot of internal
+-     * stuff so we don't want to expose all that across module boundaries.
+-     *
+-     * @param toAdapt Marshaller to adapt.
+-     * @param      Type of thing being marshalled.
+-     * @return Adapted marshaller.
+-     */
+-    public static  JsonMarshaller adapt(final StructuredJsonMarshaller toAdapt) {
+-        return new BaseJsonMarshaller() {
+-            @Override
+-            public void marshall(T val, StructuredJsonGenerator jsonGenerator, JsonMarshallerContext context) {
+-                toAdapt.marshall(val, jsonGenerator);
+-            }
+-        };
+-    }
+-
+-    /**
+-     * Base marshaller that emits the field name if present. The field name may be null in cases like
+-     * marshalling something inside a list or if the object is the explicit payload member.
+-     *
+-     * @param  Type to marshall.
+-     */
+-    private abstract static class BaseJsonMarshaller implements JsonMarshaller {
+-
+-        @Override
+-        public final void marshall(T val, JsonMarshallerContext context, String paramName) {
+-            if (!shouldEmit(val)) {
+-                return;
+-            }
+-            if (paramName != null) {
+-                context.jsonGenerator().writeFieldName(paramName);
+-            }
+-            marshall(val, context.jsonGenerator(), context);
+-        }
+-
+-        public abstract void marshall(T val, StructuredJsonGenerator jsonGenerator, JsonMarshallerContext context);
+-
+-        /**
+-         * Hook to prevent emitting the field name. Used for maps and lists since we treat empty auto constructed
+-         * containers as null.
+-         */
+-        protected boolean shouldEmit(T val) {
+-            return true;
+-        }
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/internal/SimpleTypePathMarshallers.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/internal/SimpleTypePathMarshallers.java
+--- ./src/main/java/com/amazonaws/protocol/json/internal/SimpleTypePathMarshallers.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/internal/SimpleTypePathMarshallers.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,65 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol.json.internal;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.transform.PathMarshallers;
+-
+-@SdkInternalApi
+-public class SimpleTypePathMarshallers {
+-
+-    public static final JsonMarshaller STRING =
+-            new SimplePathMarshaller(ValueToStringConverters.FROM_STRING, PathMarshallers.NON_GREEDY);
+-
+-    public static final JsonMarshaller INTEGER =
+-            new SimplePathMarshaller(ValueToStringConverters.FROM_INTEGER, PathMarshallers.NON_GREEDY);
+-
+-    public static final JsonMarshaller LONG =
+-            new SimplePathMarshaller(ValueToStringConverters.FROM_LONG, PathMarshallers.NON_GREEDY);
+-
+-    /**
+-     * Marshallers for Strings bound to a greedy path param. No URL encoding is done on the string
+-     * so that it preserves the path structure.
+-     */
+-    public static final JsonMarshaller GREEDY_STRING =
+-            new SimplePathMarshaller(ValueToStringConverters.FROM_STRING, PathMarshallers.GREEDY);
+-
+-    public static final JsonMarshaller NULL = new JsonMarshaller() {
+-        @Override
+-        public void marshall(Void val, JsonMarshallerContext context, String paramName) {
+-            throw new IllegalArgumentException(String.format("Parameter '%s' must not be null", paramName));
+-        }
+-    };
+-
+-    private static class SimplePathMarshaller implements JsonMarshaller {
+-
+-        private final ValueToStringConverters.ValueToString converter;
+-        private final PathMarshallers.PathMarshaller pathMarshaller;
+-
+-        private SimplePathMarshaller(ValueToStringConverters.ValueToString converter,
+-                                     PathMarshallers.PathMarshaller pathMarshaller) {
+-            this.converter = converter;
+-            this.pathMarshaller = pathMarshaller;
+-        }
+-
+-        @Override
+-        public void marshall(T val, JsonMarshallerContext context, String paramName) {
+-            context.request().setResourcePath(
+-                    pathMarshaller.marshall(context.request().getResourcePath(), paramName, converter.convert(val)));
+-        }
+-
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/internal/ValueToStringConverters.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/internal/ValueToStringConverters.java
+--- ./src/main/java/com/amazonaws/protocol/json/internal/ValueToStringConverters.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/internal/ValueToStringConverters.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,105 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol.json.internal;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.util.Base64;
+-import com.amazonaws.util.StringUtils;
+-import java.nio.charset.Charset;
+-import java.util.Date;
+-
+-/**
+- * Converts various types to Strings. Used for Query Param/Header/Path marshalling.
+- */
+-@SdkInternalApi
+-public class ValueToStringConverters {
+-
+-    /**
+-     * Simple interface to convert a type to a String.
+-     *
+-     * @param  Type to convert.
+-     */
+-    public interface ValueToString {
+-        String convert(T val);
+-    }
+-
+-    /**
+-     * Identity converter.
+-     */
+-    public static final ValueToString FROM_STRING = new ValueToString() {
+-        @Override
+-        public String convert(String val) {
+-            return val;
+-        }
+-    };
+-
+-    public static final ValueToString FROM_INTEGER = new ValueToString() {
+-        @Override
+-        public String convert(Integer val) {
+-            return StringUtils.fromInteger(val);
+-        }
+-    };
+-
+-    public static final ValueToString FROM_LONG = new ValueToString() {
+-        @Override
+-        public String convert(Long val) {
+-            return StringUtils.fromLong(val);
+-        }
+-    };
+-
+-    public static final ValueToString FROM_FLOAT = new ValueToString() {
+-        @Override
+-        public String convert(Float val) {
+-            return StringUtils.fromFloat(val);
+-        }
+-    };
+-
+-    public static final ValueToString FROM_DOUBLE = new ValueToString() {
+-        @Override
+-        public String convert(Double val) {
+-            return StringUtils.fromDouble(val);
+-        }
+-    };
+-
+-    /**
+-     * Marshalls boolean as a literal 'true' or 'false' string.
+-     */
+-    public static final ValueToString FROM_BOOLEAN = new ValueToString() {
+-        @Override
+-        public String convert(Boolean val) {
+-            return StringUtils.fromBoolean(val);
+-        }
+-    };
+-
+-    /**
+-     * Marshalls date to an ISO8601 date string.
+-     */
+-    public static final ValueToString FROM_DATE = new ValueToString() {
+-        @Override
+-        public String convert(Date val) {
+-            return StringUtils.fromDate(val);
+-        }
+-    };
+-
+-    /**
+-     * Converter for JSON value headers. JSON value headers are base-64 encoded.
+-     */
+-    public static final ValueToString FROM_JSON_VALUE_HEADER = new ValueToString() {
+-        @Override
+-        public String convert(String val) {
+-            return Base64.encodeAsString(val.getBytes(Charset.forName("utf-8")));
+-        }
+-    };
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/IonFactory.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/IonFactory.java
+--- ./src/main/java/com/amazonaws/protocol/json/IonFactory.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/IonFactory.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,88 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- * 
+- * Licensed under the Apache License, Version 2.0 (the "License"). You may not
+- * use this file except in compliance with the License. A copy of the License is
+- * located at
+- * 
+- * http://aws.amazon.com/apache2.0
+- * 
+- * or in the "license" file accompanying this file. This file is distributed on
+- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol.json;
+-
+-import java.io.File;
+-import java.io.FileInputStream;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.io.Reader;
+-import java.net.URL;
+-
+-import software.amazon.ion.IonSystem;
+-
+-import com.fasterxml.jackson.core.JsonFactory;
+-import com.fasterxml.jackson.core.JsonParseException;
+-import com.fasterxml.jackson.core.JsonParser;
+-
+-class IonFactory extends JsonFactory {
+-    private static final long serialVersionUID = 1;
+-
+-    private static final boolean SHOULD_CLOSE_READER_YES = true;
+-    private static final boolean SHOULD_CLOSE_READER_NO = false;
+-
+-    // TODO IonReaderBuilder will soon be available for constructing IonReaders
+-    // without an IonSystem. This should use an IonReaderBuilder.
+-    private transient final IonSystem ionSystem;
+-
+-    public IonFactory(IonSystem ionSystem) {
+-        this.ionSystem = ionSystem;
+-    }
+-
+-    @Override
+-    public JsonParser createParser(InputStream in) throws IOException, JsonParseException {
+-        return new IonParser(ionSystem.newReader(in), SHOULD_CLOSE_READER_NO);
+-    }
+-
+-    @Override
+-    public JsonParser createParser(byte[] data) throws IOException, JsonParseException {
+-        return new IonParser(ionSystem.newReader(data), SHOULD_CLOSE_READER_NO);
+-    }
+-
+-    @Override
+-    public JsonParser createParser(byte[] data, int offset, int length) throws IOException, JsonParseException {
+-        return new IonParser(ionSystem.newReader(data, offset, length), SHOULD_CLOSE_READER_NO);
+-    }
+-
+-    @Override
+-    public JsonParser createParser(char[] data) throws IOException, JsonParseException {
+-        throw new UnsupportedOperationException();
+-    }
+-
+-    @Override
+-    public JsonParser createParser(char[] data, int offset, int length) throws IOException, JsonParseException {
+-        throw new UnsupportedOperationException();
+-    }
+-
+-    @Override
+-    public JsonParser createParser(String data) throws IOException, JsonParseException {
+-        return new IonParser(ionSystem.newReader(data), SHOULD_CLOSE_READER_NO);
+-    }
+-
+-    @Override
+-    public JsonParser createParser(Reader data) throws IOException, JsonParseException {
+-        return new IonParser(ionSystem.newReader(data), SHOULD_CLOSE_READER_NO);
+-    }
+-
+-    @Override
+-    public JsonParser createParser(File data) throws IOException, JsonParseException {
+-        return new IonParser(ionSystem.newReader(new FileInputStream(data)), SHOULD_CLOSE_READER_YES);
+-    }
+-
+-    @Override
+-    public JsonParser createParser(URL data) throws IOException, JsonParseException {
+-        return new IonParser(ionSystem.newReader(data.openStream()), SHOULD_CLOSE_READER_YES);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/IonParser.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/IonParser.java
+--- ./src/main/java/com/amazonaws/protocol/json/IonParser.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/IonParser.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,399 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- * 
+- * Licensed under the Apache License, Version 2.0 (the "License"). You may not
+- * use this file except in compliance with the License. A copy of the License is
+- * located at
+- * 
+- * http://aws.amazon.com/apache2.0
+- * 
+- * or in the "license" file accompanying this file. This file is distributed on
+- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol.json;
+-
+-import java.io.IOException;
+-import java.math.BigDecimal;
+-import java.math.BigInteger;
+-import java.nio.ByteBuffer;
+-
+-import com.amazonaws.SdkClientException;
+-import com.fasterxml.jackson.core.Base64Variant;
+-import com.fasterxml.jackson.core.JsonLocation;
+-import com.fasterxml.jackson.core.JsonParseException;
+-import com.fasterxml.jackson.core.JsonParser;
+-import com.fasterxml.jackson.core.JsonStreamContext;
+-import com.fasterxml.jackson.core.JsonToken;
+-import com.fasterxml.jackson.core.JsonTokenId;
+-import com.fasterxml.jackson.core.ObjectCodec;
+-import com.fasterxml.jackson.core.Version;
+-
+-import software.amazon.ion.IonReader;
+-import software.amazon.ion.IonType;
+-
+-final class IonParser extends JsonParser {
+-    private enum State {
+-        BEFORE_VALUE,
+-        END_OF_CONTAINER,
+-        EOF,
+-        FIELD_NAME,
+-        VALUE
+-    }
+-
+-    private final IonReader reader;
+-    private final boolean shouldCloseReader;
+-
+-    private State state = State.BEFORE_VALUE;
+-    private JsonToken currentToken;
+-    private JsonToken lastClearedToken;
+-    private boolean shouldSkipContainer;
+-    private boolean closed;
+-
+-    public IonParser(IonReader reader, boolean shouldCloseReader) {
+-        super(Feature.collectDefaults());
+-        this.reader = reader;
+-        this.shouldCloseReader = shouldCloseReader;
+-    }
+-
+-    @Override
+-    public ObjectCodec getCodec() {
+-        throw new UnsupportedOperationException();
+-    }
+-
+-    @Override
+-    public void setCodec(ObjectCodec c) {
+-        throw new UnsupportedOperationException();
+-    }
+-
+-    @Override
+-    public Version version() {
+-        throw new UnsupportedOperationException();
+-    }
+-
+-    @Override
+-    public void close() throws IOException {
+-        if (shouldCloseReader) {
+-            reader.close();
+-        } else if (Feature.AUTO_CLOSE_SOURCE.enabledIn(_features)) {
+-            reader.close();
+-        }
+-        closed = true;
+-    }
+-
+-    @Override
+-    public JsonToken nextToken() throws IOException, JsonParseException {
+-        currentToken = doNextToken();
+-        return currentToken;
+-    }
+-
+-    private JsonToken doNextToken() {
+-        for (;;) {
+-            switch (state) {
+-                case BEFORE_VALUE:
+-                    IonType currentType = reader.next();
+-
+-                    if (currentType == null) {
+-                        boolean topLevel = reader.getDepth() == 0;
+-                        if (topLevel) {
+-                            state = State.EOF;
+-                            continue;
+-                        } else {
+-                            state = State.END_OF_CONTAINER;
+-                            return reader.isInStruct()
+-                                    ? JsonToken.END_OBJECT
+-                                    : JsonToken.END_ARRAY;
+-                        }
+-                    }
+-
+-                    if (reader.isInStruct()) {
+-                        state = State.FIELD_NAME;
+-                        return JsonToken.FIELD_NAME;
+-                    } else {
+-                        state = State.VALUE;
+-                        return getJsonToken();
+-                    }
+-
+-                case END_OF_CONTAINER:
+-                    reader.stepOut();
+-                    state = State.BEFORE_VALUE;
+-                    continue;
+-
+-                case EOF:
+-                    return null;
+-
+-                case FIELD_NAME:
+-                    state = State.VALUE;
+-                    return getJsonToken();
+-
+-                case VALUE:
+-                    state = State.BEFORE_VALUE;
+-                    if (IonType.isContainer(reader.getType()) && !reader.isNullValue() && !shouldSkipContainer) {
+-                        reader.stepIn();
+-                    }
+-                    shouldSkipContainer = false;
+-                    continue;
+-            }
+-        }
+-    }
+-
+-    @Override
+-    public JsonToken nextValue() throws IOException, JsonParseException {
+-        JsonToken token = nextToken();
+-        return (token == JsonToken.FIELD_NAME)
+-                ? nextToken()
+-                : token;
+-    }
+-
+-    @Override
+-    public JsonParser skipChildren() throws IOException, JsonParseException {
+-        IonType currentType = reader.getType();
+-        if (IonType.isContainer(currentType)) {
+-            shouldSkipContainer = true;
+-            currentToken = currentType == IonType.STRUCT
+-                    ? JsonToken.END_OBJECT
+-                    : JsonToken.END_ARRAY;
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public boolean isClosed() {
+-        return closed;
+-    }
+-
+-    @Override
+-    public JsonToken getCurrentToken() {
+-        return currentToken;
+-    }
+-
+-    @Override
+-    public int getCurrentTokenId() {
+-        return currentToken == null
+-                ? JsonTokenId.ID_NO_TOKEN
+-                : currentToken.id();
+-    }
+-
+-    @Override
+-    public boolean hasCurrentToken() {
+-        return currentToken != null;
+-    }
+-
+-    @Override
+-    public boolean hasTokenId(int id) {
+-        return getCurrentTokenId() == id;
+-    }
+-
+-    @Override
+-    public boolean hasToken(JsonToken t) {
+-        return currentToken == t;
+-    }
+-
+-    @Override
+-    public String getCurrentName() throws IOException {
+-        return reader.getFieldName();
+-    }
+-
+-    @Override
+-    public JsonStreamContext getParsingContext() {
+-        throw new UnsupportedOperationException();
+-    }
+-
+-    @Override
+-    public JsonLocation getTokenLocation() {
+-        throw new UnsupportedOperationException();
+-    }
+-
+-    @Override
+-    public JsonLocation getCurrentLocation() {
+-        throw new UnsupportedOperationException();
+-    }
+-
+-    @Override
+-    public void clearCurrentToken() {
+-        lastClearedToken = currentToken;
+-        currentToken = null;
+-    }
+-
+-    @Override
+-    public JsonToken getLastClearedToken() {
+-        return lastClearedToken;
+-    }
+-
+-    @Override
+-    public void overrideCurrentName(String name) {
+-        throw new UnsupportedOperationException();
+-    }
+-
+-    @Override
+-    public String getText() throws IOException {
+-        if (state == State.FIELD_NAME) {
+-            return reader.getFieldName();
+-        }
+-        if (IonType.isText(reader.getType())) {
+-            return reader.stringValue();
+-        }
+-        if (currentToken == null)
+-        {
+-            // start or end of stream
+-            return null;
+-        }
+-        if (currentToken.isNumeric()) {
+-            return getNumberValue().toString();
+-        }
+-        return currentToken.asString();
+-    }
+-
+-    @Override
+-    public char[] getTextCharacters() throws IOException {
+-        throw new UnsupportedOperationException();
+-    }
+-
+-    @Override
+-    public int getTextLength() throws IOException {
+-        throw new UnsupportedOperationException();
+-    }
+-
+-    @Override
+-    public int getTextOffset() throws IOException {
+-        throw new UnsupportedOperationException();
+-    }
+-
+-    @Override
+-    public boolean hasTextCharacters() {
+-        return false;
+-    }
+-
+-    @Override
+-    public Number getNumberValue() throws IOException {
+-        NumberType numberType = getNumberType();
+-        if (numberType == null) {
+-            throw new SdkClientException(String.format("Unable to get number value for non-numeric token %s", reader.getType()));
+-        }
+-        switch (numberType) {
+-            case BIG_DECIMAL:
+-                return reader.bigDecimalValue();
+-            case BIG_INTEGER:
+-                return reader.bigIntegerValue();
+-            case DOUBLE:
+-                return reader.doubleValue();
+-            default:
+-                throw new SdkClientException(String.format("Unable to get number value for number type %s", numberType));
+-        }
+-    }
+-
+-    @Override
+-    public NumberType getNumberType() throws IOException {
+-        switch (reader.getType()) {
+-            case DECIMAL:
+-                return NumberType.BIG_DECIMAL;
+-            case FLOAT:
+-                return NumberType.DOUBLE;
+-            case INT:
+-                return NumberType.BIG_INTEGER;
+-            default:
+-                return null;
+-        }
+-    }
+-
+-    @Override
+-    public int getIntValue() throws IOException {
+-        return reader.intValue();
+-    }
+-
+-    @Override
+-    public long getLongValue() throws IOException {
+-        return reader.longValue();
+-    }
+-
+-    @Override
+-    public BigInteger getBigIntegerValue() throws IOException {
+-        return reader.bigIntegerValue();
+-    }
+-
+-    @Override
+-    public float getFloatValue() throws IOException {
+-        return (float) reader.doubleValue();
+-    }
+-
+-    @Override
+-    public double getDoubleValue() throws IOException {
+-        return reader.doubleValue();
+-    }
+-
+-    @Override
+-    public BigDecimal getDecimalValue() throws IOException {
+-        return reader.decimalValue();
+-    }
+-
+-    @Override
+-    public Object getEmbeddedObject() throws IOException {
+-        if (currentToken != JsonToken.VALUE_EMBEDDED_OBJECT) {
+-            return null;
+-        }
+-        IonType currentType = reader.getType();
+-        switch (currentType) {
+-            case BLOB:
+-            case CLOB:
+-                return ByteBuffer.wrap(reader.newBytes());
+-            case TIMESTAMP:
+-                return reader.timestampValue().dateValue();
+-            default:
+-                throw new SdkClientException(String.format("Cannot return embedded object for Ion type %s", currentType));
+-        }
+-    }
+-
+-    @Override
+-    public byte[] getBinaryValue(Base64Variant bv) throws IOException {
+-        throw new UnsupportedOperationException();
+-    }
+-
+-    @Override
+-    public String getValueAsString(String defaultValue) throws IOException {
+-        // The documentation is ambiguous about whether field names should
+-        // return their text or the default value. To conform with the
+-        // CBORParser, they will get the default value here.
+-        if (currentToken != JsonToken.VALUE_STRING) {
+-            if (currentToken == null || currentToken == JsonToken.VALUE_NULL || !currentToken.isScalarValue()) {
+-                return defaultValue;
+-            }
+-        }
+-        return getText();
+-    }
+-
+-    private JsonToken getJsonToken() {
+-        if (reader.isNullValue()) {
+-            return JsonToken.VALUE_NULL;
+-        }
+-
+-        IonType currentType = reader.getType();
+-        switch (currentType) {
+-            case BLOB:
+-            case CLOB:
+-                return JsonToken.VALUE_EMBEDDED_OBJECT;
+-            case BOOL:
+-                return reader.booleanValue() ? JsonToken.VALUE_TRUE : JsonToken.VALUE_FALSE;
+-            case DECIMAL:
+-                return JsonToken.VALUE_NUMBER_FLOAT;
+-            case FLOAT:
+-                return JsonToken.VALUE_NUMBER_FLOAT;
+-            case INT:
+-                return JsonToken.VALUE_NUMBER_INT;
+-            case LIST:
+-                return JsonToken.START_ARRAY;
+-            case SEXP:
+-                return JsonToken.START_ARRAY;
+-            case STRING:
+-                return JsonToken.VALUE_STRING;
+-            case STRUCT:
+-                return JsonToken.START_OBJECT;
+-            case SYMBOL:
+-                return JsonToken.VALUE_STRING;
+-            case TIMESTAMP:
+-                return JsonToken.VALUE_EMBEDDED_OBJECT;
+-            default:
+-                throw new SdkClientException(String.format("Unhandled Ion type %s", currentType));
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/JsonClientMetadata.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/JsonClientMetadata.java
+--- ./src/main/java/com/amazonaws/protocol/json/JsonClientMetadata.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/JsonClientMetadata.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,107 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol.json;
+-
+-import com.amazonaws.AmazonServiceException;
+-import com.amazonaws.annotation.NotThreadSafe;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.List;
+-
+-/**
+- * Wrapper object to provide additional metadata about a client and protocol to {@link
+- * SdkJsonProtocolFactory}
+- */
+-@NotThreadSafe
+-@SdkProtectedApi
+-public class JsonClientMetadata {
+-
+-    private final List errorsMetadata = new ArrayList();
+-
+-    private String protocolVersion;
+-
+-    private String contentTypeOverride;
+-
+-    private boolean supportsCbor;
+-
+-    private boolean supportsIon;
+-
+-    /**
+-     * Base class is initialized to {@link AmazonServiceException} for backwards compatibility.
+-     */
+-    private Class baseServiceExceptionClass = AmazonServiceException.class;
+-
+-    public JsonClientMetadata addErrorMetadata(JsonErrorShapeMetadata errorShapeMetadata) {
+-        this.errorsMetadata.add(errorShapeMetadata);
+-        return this;
+-    }
+-
+-    public JsonClientMetadata addAllErrorMetadata(JsonErrorShapeMetadata... errorShapeMetadata) {
+-        Collections.addAll(errorsMetadata, errorShapeMetadata);
+-        return this;
+-    }
+-
+-    public List getErrorShapeMetadata() {
+-        return errorsMetadata;
+-    }
+-
+-    public String getProtocolVersion() {
+-        return protocolVersion;
+-    }
+-
+-    public JsonClientMetadata withProtocolVersion(String protocolVersion) {
+-        this.protocolVersion = protocolVersion;
+-        return this;
+-    }
+-
+-    public String getContentTypeOverride() {
+-        return contentTypeOverride;
+-    }
+-
+-    public JsonClientMetadata withContentTypeOverride(String contentType) {
+-        this.contentTypeOverride = contentType;
+-        return this;
+-    }
+-
+-    public boolean isSupportsCbor() {
+-        return supportsCbor;
+-    }
+-
+-    public JsonClientMetadata withSupportsCbor(boolean supportsCbor) {
+-        this.supportsCbor = supportsCbor;
+-        return this;
+-    }
+-
+-    public Class getBaseServiceExceptionClass() {
+-        return baseServiceExceptionClass;
+-    }
+-
+-    public boolean isSupportsIon() {
+-        return supportsIon;
+-    }
+-
+-    public JsonClientMetadata withSupportsIon(boolean supportsIon) {
+-        this.supportsIon = supportsIon;
+-        return this;
+-    }
+-
+-    public JsonClientMetadata withBaseServiceExceptionClass(
+-            Class baseServiceExceptionClass) {
+-        this.baseServiceExceptionClass = baseServiceExceptionClass;
+-        return this;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/JsonContent.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/JsonContent.java
+--- ./src/main/java/com/amazonaws/protocol/json/JsonContent.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/JsonContent.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,86 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol.json;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.http.HttpResponse;
+-import com.amazonaws.util.IOUtils;
+-import com.fasterxml.jackson.core.JsonFactory;
+-import com.fasterxml.jackson.core.JsonParser;
+-import com.fasterxml.jackson.databind.JsonNode;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-
+-/**
+- * Simple struct like class to hold both the raw json string content and it's parsed JsonNode
+- */
+-@SdkInternalApi
+-public class JsonContent {
+-
+-    private static final Log LOG = LogFactory.getLog(JsonContent.class);
+-
+-    private final byte[] rawContent;
+-    private final JsonNode jsonNode;
+-
+-    /**
+-     * Static factory method to create a JsonContent object from the contents of the HttpResponse
+-     * provided
+-     */
+-    public static JsonContent createJsonContent(HttpResponse httpResponse,
+-                                                JsonFactory jsonFactory) {
+-        byte[] rawJsonContent = null;
+-        try {
+-            if (httpResponse.getContent() != null) {
+-                rawJsonContent = IOUtils.toByteArray(httpResponse.getContent());
+-            }
+-        } catch (Exception e) {
+-            LOG.debug("Unable to read HTTP response content", e);
+-        }
+-        return new JsonContent(rawJsonContent, new ObjectMapper(jsonFactory)
+-                .configure(JsonParser.Feature.ALLOW_COMMENTS, true));
+-    }
+-
+-    public JsonContent(byte[] rawJsonContent, JsonNode jsonNode) {
+-        this.rawContent = rawJsonContent;
+-        this.jsonNode = jsonNode;
+-    }
+-
+-    private JsonContent(byte[] rawJsonContent, ObjectMapper mapper) {
+-        this.rawContent = rawJsonContent;
+-        this.jsonNode = parseJsonContent(rawJsonContent, mapper);
+-    }
+-
+-    private static JsonNode parseJsonContent(byte[] rawJsonContent, ObjectMapper mapper) {
+-        if (rawJsonContent == null) {
+-            return mapper.createObjectNode();
+-        }
+-        try {
+-            return mapper.readTree(rawJsonContent);
+-        } catch (Exception e) {
+-            LOG.debug("Unable to parse HTTP response content", e);
+-            return mapper.createObjectNode();
+-        }
+-    }
+-
+-    public byte[] getRawContent() {
+-        return rawContent;
+-    }
+-
+-    public JsonNode getJsonNode() {
+-        return jsonNode;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/JsonContentTypeResolverImpl.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/JsonContentTypeResolverImpl.java
+--- ./src/main/java/com/amazonaws/protocol/json/JsonContentTypeResolverImpl.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/JsonContentTypeResolverImpl.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,37 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol.json;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-
+-/**
+- * Prefers an explicit content type if provided. Otherwise computes the correct content type based
+- * on the wire format used and the version of the protocol.
+- */
+-@SdkInternalApi
+-class JsonContentTypeResolverImpl implements JsonContentTypeResolver {
+-
+-    private final String prefix;
+-
+-    JsonContentTypeResolverImpl(String prefix) {
+-        this.prefix = prefix;
+-    }
+-
+-    @Override
+-    public String resolveContentType(JsonClientMetadata metadata) {
+-        return metadata.getContentTypeOverride() != null ? metadata.getContentTypeOverride() :
+-                prefix + metadata.getProtocolVersion();
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/JsonContentTypeResolver.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/JsonContentTypeResolver.java
+--- ./src/main/java/com/amazonaws/protocol/json/JsonContentTypeResolver.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/JsonContentTypeResolver.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,52 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol.json;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-
+-/**
+- * Interface to compute the content type to send in requests for JSON based protocols.
+- */
+-@SdkInternalApi
+-interface JsonContentTypeResolver {
+-
+-    /**
+-     * Content type resolver implementation for Ion-enabled services.
+-     */
+-    JsonContentTypeResolver ION_BINARY = new JsonContentTypeResolverImpl("application/x-amz-ion-");
+-
+-    /**
+-     * Content type resolver implementation for debugging Ion-enabled services.
+-     */
+-    JsonContentTypeResolver ION_TEXT = new JsonContentTypeResolverImpl("text/x-amz-ion-");
+-
+-    /**
+-     * Content type resolver implementation for CBOR enabled services.
+-     */
+-    JsonContentTypeResolver CBOR = new JsonContentTypeResolverImpl("application/x-amz-cbor-");
+-
+-    /**
+-     * Content type resolver implementation for plain text JSON services.
+-     */
+-    JsonContentTypeResolver JSON = new JsonContentTypeResolverImpl("application/x-amz-json-");
+-
+-    /**
+-     * Computes content type to send in requests.
+-     *
+-     * @param metadata Metadata about the client making the request.
+-     * @return Correct content type to send in request based on metadata about the client.
+-     */
+-    String resolveContentType(JsonClientMetadata metadata);
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/JsonErrorResponseMetadata.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/JsonErrorResponseMetadata.java
+--- ./src/main/java/com/amazonaws/protocol/json/JsonErrorResponseMetadata.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/JsonErrorResponseMetadata.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,58 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol.json;
+-
+-import com.amazonaws.annotation.NotThreadSafe;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-import java.util.List;
+-
+-/**
+- * Contains various metadata needed to create an appropriate {@link com.amazonaws.http.JsonErrorResponseHandler}
+- * for the client.
+- */
+-@NotThreadSafe
+-@SdkProtectedApi
+-public class JsonErrorResponseMetadata {
+-
+-    /**
+-     * Custom error code field name in exceptional responses. Currently only used by glacier. If not
+-     * set the default error code parser will be used.
+-     */
+-    private String customErrorCodeFieldName;
+-
+-    /**
+-     * Error shapes scoped to a specific operation.
+-     */
+-    private List errorShapes;
+-
+-    public String getCustomErrorCodeFieldName() {
+-        return customErrorCodeFieldName;
+-    }
+-
+-    public JsonErrorResponseMetadata withCustomErrorCodeFieldName(String errorCodeFieldName) {
+-        this.customErrorCodeFieldName = errorCodeFieldName;
+-        return this;
+-    }
+-
+-    public List getErrorShapes() {
+-        return errorShapes;
+-    }
+-
+-    public JsonErrorResponseMetadata withErrorShapes(List errorShapes) {
+-        this.errorShapes = errorShapes;
+-        return this;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/JsonErrorShapeMetadata.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/JsonErrorShapeMetadata.java
+--- ./src/main/java/com/amazonaws/protocol/json/JsonErrorShapeMetadata.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/JsonErrorShapeMetadata.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,61 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol.json;
+-
+-import com.amazonaws.annotation.NotThreadSafe;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-/**
+- * Wrapper object to provide additional metadata about a client's error shapes to {@link
+- * SdkJsonProtocolFactory}
+- */
+-@NotThreadSafe
+-@SdkProtectedApi
+-public class JsonErrorShapeMetadata {
+-
+-    private String errorCode;
+-
+-    private Integer httpStatusCode;
+-
+-    private Class modeledClass;
+-
+-
+-    public String getErrorCode() {
+-        return errorCode;
+-    }
+-
+-    public JsonErrorShapeMetadata withErrorCode(String errorCode) {
+-        this.errorCode = errorCode;
+-        return this;
+-    }
+-
+-    public Integer getHttpStatusCode() {
+-        return httpStatusCode;
+-    }
+-
+-    public JsonErrorShapeMetadata withHttpStatusCode(Integer httpStatusCode) {
+-        this.httpStatusCode = httpStatusCode;
+-        return this;
+-    }
+-
+-    public Class getModeledClass() {
+-        return modeledClass;
+-    }
+-
+-    public JsonErrorShapeMetadata withModeledClass(Class modeledClass) {
+-        this.modeledClass = modeledClass;
+-        return this;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/JsonOperationMetadata.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/JsonOperationMetadata.java
+--- ./src/main/java/com/amazonaws/protocol/json/JsonOperationMetadata.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/JsonOperationMetadata.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,52 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol.json;
+-
+-
+-import com.amazonaws.annotation.NotThreadSafe;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.transform.JsonUnmarshallerContext;
+-import com.amazonaws.transform.Unmarshaller;
+-
+-/**
+- * Contains various information needed to create a {@link com.amazonaws.http.JsonResponseHandler}
+- * for the client.
+- */
+-@NotThreadSafe
+-@SdkProtectedApi
+-public class JsonOperationMetadata {
+-
+-    private boolean hasStreamingSuccessResponse;
+-    private boolean isPayloadJson;
+-
+-    public boolean isHasStreamingSuccessResponse() {
+-        return hasStreamingSuccessResponse;
+-    }
+-
+-    public JsonOperationMetadata withHasStreamingSuccessResponse(
+-            boolean hasStreamingSuccessResponse) {
+-        this.hasStreamingSuccessResponse = hasStreamingSuccessResponse;
+-        return this;
+-    }
+-
+-    public boolean isPayloadJson() {
+-        return isPayloadJson;
+-    }
+-
+-    public JsonOperationMetadata withPayloadJson(boolean payloadJson) {
+-        isPayloadJson = payloadJson;
+-        return this;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/JsonProtocolMarshallerBuilder.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/JsonProtocolMarshallerBuilder.java
+--- ./src/main/java/com/amazonaws/protocol/json/JsonProtocolMarshallerBuilder.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/JsonProtocolMarshallerBuilder.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,105 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol.json;
+-
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.protocol.MarshallLocation;
+-import com.amazonaws.protocol.MarshallingType;
+-import com.amazonaws.protocol.OperationInfo;
+-import com.amazonaws.protocol.ProtocolMarshaller;
+-import com.amazonaws.protocol.ProtocolRequestMarshaller;
+-import com.amazonaws.protocol.json.internal.JsonProtocolMarshaller;
+-import com.amazonaws.protocol.json.internal.MarshallerRegistry;
+-import com.amazonaws.protocol.json.internal.NullAsEmptyBodyProtocolRequestMarshaller;
+-import com.amazonaws.protocol.json.internal.SimpleTypeJsonMarshallers;
+-
+-/**
+- * Builder to create an appropriate implementation of {@link ProtocolMarshaller} for JSON based services.
+- *
+- * @param  Type of the original request object.
+- */
+-@SdkProtectedApi
+-public class JsonProtocolMarshallerBuilder {
+-
+-    private StructuredJsonGenerator jsonGenerator;
+-    private String contentType;
+-    private OperationInfo operationInfo;
+-    private boolean sendExplicitNullForPayload;
+-    private T originalRequest;
+-    private MarshallerRegistry.Builder marshallerRegistry;
+-
+-    public static  JsonProtocolMarshallerBuilder standard() {
+-        return new JsonProtocolMarshallerBuilder();
+-    }
+-
+-    public JsonProtocolMarshallerBuilder jsonGenerator(StructuredJsonGenerator jsonGenerator) {
+-        this.jsonGenerator = jsonGenerator;
+-        return this;
+-    }
+-
+-    public JsonProtocolMarshallerBuilder contentType(String contentType) {
+-        this.contentType = contentType;
+-        return this;
+-    }
+-
+-    public JsonProtocolMarshallerBuilder operationInfo(OperationInfo operationInfo) {
+-        this.operationInfo = operationInfo;
+-        return this;
+-    }
+-
+-    /**
+-     * @param sendExplicitNullForPayload True if an explicit JSON null should be sent as the body when the
+-     *                                   payload member is null. See {@link NullAsEmptyBodyProtocolRequestMarshaller}.
+-     */
+-    public JsonProtocolMarshallerBuilder sendExplicitNullForPayload(boolean sendExplicitNullForPayload) {
+-        this.sendExplicitNullForPayload = sendExplicitNullForPayload;
+-        return this;
+-    }
+-
+-    public JsonProtocolMarshallerBuilder originalRequest(T originalRequest) {
+-        this.originalRequest = originalRequest;
+-        return this;
+-    }
+-
+-    /**
+-     * Registers an override for the marshaller registry.
+-     *
+-     * @param marshallLocation Location to override marshaller for.
+-     * @param marshallingType  Type to override marshaller for.
+-     * @param marshaller       Marshaller to use for the given location and type.
+-     * @param       Type of thing being marshalled.
+-     * @return This builder for method chaining.
+-     */
+-    public  JsonProtocolMarshallerBuilder marshallerOverride(MarshallLocation marshallLocation,
+-                                                                           MarshallingType marshallingType,
+-                                                                           StructuredJsonMarshaller marshaller) {
+-        if (marshallerRegistry == null) {
+-            this.marshallerRegistry = MarshallerRegistry.builder();
+-        }
+-        marshallerRegistry.addMarshaller(marshallLocation, marshallingType, SimpleTypeJsonMarshallers.adapt(marshaller));
+-        return this;
+-    }
+-
+-    public ProtocolRequestMarshaller build() {
+-        final ProtocolRequestMarshaller protocolMarshaller = new JsonProtocolMarshaller(jsonGenerator,
+-                                                                                              contentType,
+-                                                                                              operationInfo,
+-                                                                                              originalRequest,
+-                                                                                              marshallerRegistry);
+-        return sendExplicitNullForPayload ? protocolMarshaller :
+-                new NullAsEmptyBodyProtocolRequestMarshaller(protocolMarshaller);
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/SdkCborGenerator.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/SdkCborGenerator.java
+--- ./src/main/java/com/amazonaws/protocol/json/SdkCborGenerator.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/SdkCborGenerator.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,77 +0,0 @@
+-/*
+- *
+- * Copyright (c) 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- *
+- */
+-package com.amazonaws.protocol.json;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.fasterxml.jackson.core.JsonFactory;
+-import com.fasterxml.jackson.dataformat.cbor.CBORGenerator;
+-
+-import java.io.IOException;
+-import java.util.Date;
+-
+-import static com.amazonaws.SDKGlobalConfiguration.AWS_CBOR_DISABLE_ENV_VAR;
+-import static com.amazonaws.SDKGlobalConfiguration.AWS_CBOR_DISABLE_SYSTEM_PROPERTY;
+-
+-/**
+- * Thin wrapper around Jackson's JSON generator for CBOR.
+- */
+-@SdkInternalApi
+-class SdkCborGenerator extends SdkJsonGenerator {
+-
+-    private static final int CBOR_TAG_TIMESTAP = 1;
+-
+-    public SdkCborGenerator(JsonFactory factory, String contentType) {
+-        super(factory, contentType);
+-    }
+-
+-    /**
+-     * Jackson doesn't have native support for timestamp. As per the RFC 7049
+-     * (https://tools.ietf.org/html/rfc7049#section-2.4.1) we will need to
+-     * write a tag and write the epoch.
+-     */
+-    @Override
+-    public StructuredJsonGenerator writeValue(Date date) {
+-
+-        if (!(getGenerator() instanceof CBORGenerator)) {
+-            throw new IllegalStateException("SdkCborGenerator is not created with a CBORGenerator.");
+-        }
+-
+-        CBORGenerator generator = (CBORGenerator) getGenerator();
+-        try {
+-            generator.writeTag(CBOR_TAG_TIMESTAP);
+-            generator.writeNumber(date.getTime());
+-        } catch (IOException e) {
+-            throw new JsonGenerationException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public byte[] getBytes() {
+-        try {
+-            return super.getBytes();
+-        } catch (NoSuchMethodError e) {
+-            throw new RuntimeException(
+-                    "Jackson jackson-core/jackson-dataformat-cbor incompatible library version detected.\nYou have two possible resolutions:\n" +
+-                            "\t\t1) Ensure the com.fasterxml.jackson.core:jackson-core & com.fasterxml.jackson.dataformat:jackson-dataformat-cbor libraries " +
+-                            "on your classpath have the same version number\n" +
+-                            "\t\t2) Disable CBOR wire-protocol by passing the -D" + AWS_CBOR_DISABLE_SYSTEM_PROPERTY + " property or setting the " +
+-                            AWS_CBOR_DISABLE_ENV_VAR + " environment variable (warning this may affect performance)",
+-                    e);
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/SdkIonGenerator.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/SdkIonGenerator.java
+--- ./src/main/java/com/amazonaws/protocol/json/SdkIonGenerator.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/SdkIonGenerator.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,240 +0,0 @@
+-/*
+- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol.json;
+-
+-import java.io.ByteArrayOutputStream;
+-import java.io.IOException;
+-import java.math.BigDecimal;
+-import java.math.BigInteger;
+-import java.nio.ByteBuffer;
+-import java.util.Date;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.util.BinaryUtils;
+-import software.amazon.ion.IonType;
+-import software.amazon.ion.IonWriter;
+-import software.amazon.ion.Timestamp;
+-import software.amazon.ion.system.IonWriterBuilder;
+-
+-@SdkInternalApi
+-abstract class SdkIonGenerator implements StructuredJsonGenerator {
+-    private final String contentType;
+-    protected final IonWriter writer;
+-
+-    private SdkIonGenerator(IonWriter writer, String contentType) {
+-        this.writer = writer;
+-        this.contentType = contentType;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeStartArray() {
+-        try {
+-            writer.stepIn(IonType.LIST);
+-        } catch (IOException e) {
+-            throw new SdkClientException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeNull() {
+-        try {
+-            writer.writeNull();
+-        } catch (IOException e) {
+-            throw new SdkClientException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeEndArray() {
+-        try {
+-            writer.stepOut();
+-        } catch (IOException e) {
+-            throw new SdkClientException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeStartObject() {
+-        try {
+-            writer.stepIn(IonType.STRUCT);
+-        } catch (IOException e) {
+-            throw new SdkClientException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeEndObject() {
+-        try {
+-            writer.stepOut();
+-        } catch (IOException e) {
+-            throw new SdkClientException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeFieldName(String fieldName) {
+-        writer.setFieldName(fieldName);
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeValue(String val) {
+-        try {
+-            writer.writeString(val);
+-        } catch (IOException e) {
+-            throw new SdkClientException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeValue(boolean bool) {
+-        try {
+-            writer.writeBool(bool);
+-        } catch (IOException e) {
+-            throw new SdkClientException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeValue(long val) {
+-        try {
+-            writer.writeInt(val);
+-        } catch (IOException e) {
+-            throw new SdkClientException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeValue(double val) {
+-        try {
+-            writer.writeFloat(val);
+-        } catch (IOException e) {
+-            throw new SdkClientException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeValue(float val) {
+-        try {
+-            writer.writeFloat(val);
+-        } catch (IOException e) {
+-            throw new SdkClientException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeValue(short val) {
+-        try {
+-            writer.writeInt(val);
+-        } catch (IOException e) {
+-            throw new SdkClientException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeValue(int val) {
+-        try {
+-            writer.writeInt(val);
+-        } catch (IOException e) {
+-            throw new SdkClientException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeValue(ByteBuffer bytes) {
+-        try {
+-            writer.writeBlob(BinaryUtils.copyAllBytesFrom(bytes));
+-        } catch (IOException e) {
+-            throw new SdkClientException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeValue(Date date) {
+-        try {
+-            writer.writeTimestamp(Timestamp.forDateZ(date));
+-        } catch (IOException e) {
+-            throw new SdkClientException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeValue(BigDecimal value) {
+-        try {
+-            writer.writeDecimal(value);
+-        } catch (IOException e) {
+-            throw new SdkClientException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeValue(BigInteger value) {
+-        try {
+-            writer.writeInt(value);
+-        } catch (IOException e) {
+-            throw new SdkClientException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public abstract byte[] getBytes();
+-
+-    @Override
+-    public String getContentType() {
+-        return contentType;
+-    }
+-
+-    public static SdkIonGenerator create(IonWriterBuilder builder, String contentType) {
+-        ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+-        IonWriter writer = builder.build(bytes);
+-        return new ByteArraySdkIonGenerator(bytes, writer, contentType);
+-    }
+-
+-    private static class ByteArraySdkIonGenerator extends SdkIonGenerator {
+-        private final ByteArrayOutputStream bytes;
+-
+-        public ByteArraySdkIonGenerator(ByteArrayOutputStream bytes, IonWriter writer, String contentType) {
+-            super(writer, contentType);
+-            this.bytes = bytes;
+-        }
+-
+-        @Override
+-        public byte[] getBytes() {
+-            try {
+-                writer.finish();
+-            } catch (IOException e) {
+-                throw new SdkClientException(e);
+-            }
+-            return bytes.toByteArray();
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/SdkJsonGenerator.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/SdkJsonGenerator.java
+--- ./src/main/java/com/amazonaws/protocol/json/SdkJsonGenerator.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/SdkJsonGenerator.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,280 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol.json;
+-
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.util.BinaryUtils;
+-import com.amazonaws.util.DateUtils;
+-import com.fasterxml.jackson.core.JsonFactory;
+-import com.fasterxml.jackson.core.JsonGenerator;
+-
+-import java.io.ByteArrayOutputStream;
+-import java.io.IOException;
+-import java.math.BigDecimal;
+-import java.math.BigInteger;
+-import java.nio.ByteBuffer;
+-import java.util.Date;
+-
+-/**
+- * Thin wrapper around Jackson's JSON generator.
+- */
+-@SdkInternalApi
+-public class SdkJsonGenerator implements StructuredJsonGenerator {
+-
+-    /**
+-     * Default buffer size for the BAOS. Chosen somewhat arbitrarily. Should be large enough to
+-     * prevent frequent resizings but small enough to avoid wasted allocations for small requests.
+-     */
+-    private static final int DEFAULT_BUFFER_SIZE = 1024;
+-
+-    /**
+-     * Indicates an issue writing JSON content.
+-     */
+-    public static class JsonGenerationException extends SdkClientException {
+-
+-        public JsonGenerationException(Throwable t) {
+-            super(t);
+-        }
+-    }
+-
+-    private final ByteArrayOutputStream baos = new ByteArrayOutputStream(DEFAULT_BUFFER_SIZE);
+-
+-    private final JsonGenerator generator;
+-
+-    private final String contentType;
+-
+-    public SdkJsonGenerator(JsonFactory factory, String contentType) {
+-        try {
+-            /**
+-             * A {@link JsonGenerator} created is by default enabled with
+-             * UTF-8 encoding
+-             */
+-            this.generator = factory.createGenerator(baos);
+-            this.contentType = contentType;
+-        } catch (IOException e) {
+-            throw new JsonGenerationException(e);
+-        }
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeStartArray() {
+-        try {
+-            generator.writeStartArray();
+-        } catch (IOException e) {
+-            throw new JsonGenerationException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeEndArray() {
+-        try {
+-            generator.writeEndArray();
+-        } catch (IOException e) {
+-            throw new JsonGenerationException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeNull() {
+-        try {
+-            generator.writeNull();
+-        } catch (IOException e) {
+-            throw new JsonGenerationException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeStartObject() {
+-        try {
+-            generator.writeStartObject();
+-        } catch (IOException e) {
+-            throw new JsonGenerationException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeEndObject() {
+-        try {
+-            generator.writeEndObject();
+-        } catch (IOException e) {
+-            throw new JsonGenerationException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeFieldName(String fieldName) {
+-        try {
+-            generator.writeFieldName(fieldName);
+-        } catch (IOException e) {
+-            throw new JsonGenerationException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeValue(String val) {
+-        try {
+-            generator.writeString(val);
+-        } catch (IOException e) {
+-            throw new JsonGenerationException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeValue(boolean bool) {
+-        try {
+-            generator.writeBoolean(bool);
+-        } catch (IOException e) {
+-            throw new JsonGenerationException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeValue(long val) {
+-        try {
+-            generator.writeNumber(val);
+-        } catch (IOException e) {
+-            throw new JsonGenerationException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeValue(double val) {
+-        try {
+-            generator.writeNumber(val);
+-        } catch (IOException e) {
+-            throw new JsonGenerationException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeValue(float val) {
+-        try {
+-            generator.writeNumber(val);
+-        } catch (IOException e) {
+-            throw new JsonGenerationException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeValue(short val) {
+-        try {
+-            generator.writeNumber(val);
+-        } catch (IOException e) {
+-            throw new JsonGenerationException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeValue(int val) {
+-        try {
+-            generator.writeNumber(val);
+-        } catch (IOException e) {
+-            throw new JsonGenerationException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeValue(ByteBuffer bytes) {
+-        try {
+-            generator.writeBinary(BinaryUtils.copyBytesFrom(bytes));
+-        } catch (IOException e) {
+-            throw new JsonGenerationException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeValue(Date date) {
+-        try {
+-            generator.writeNumber(DateUtils.formatServiceSpecificDate(date));
+-        } catch (IOException e) {
+-            throw new JsonGenerationException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeValue(BigDecimal value) {
+-        try {
+-            /**
+-             * Note that this is not how the backend represents BigDecimal types. On the wire
+-             * it's normally a JSON number but this causes problems with certain JSON implementations
+-             * that parse JSON numbers as floating points automatically. (See API-433)
+-             */
+-            generator.writeString(value.toString());
+-        } catch (IOException e) {
+-            throw new JsonGenerationException(e);
+-        }
+-        return this;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator writeValue(BigInteger value) {
+-        try {
+-            generator.writeNumber(value);
+-        } catch (IOException e) {
+-            throw new JsonGenerationException(e);
+-        }
+-        return this;
+-    }
+-
+-    /**
+-     * Closes the generator and flushes to write. Must be called when finished writing JSON
+-     * content.
+-     */
+-    private void close() {
+-        try {
+-            generator.close();
+-        } catch (IOException e) {
+-            throw new JsonGenerationException(e);
+-        }
+-    }
+-
+-    /**
+-     * Get the JSON content as a UTF-8 encoded byte array. It is recommended to hold onto the array
+-     * reference rather then making repeated calls to this method as a new array will be created
+-     * each time.
+-     *
+-     * @return Array of UTF-8 encoded bytes that make up the generated JSON.
+-     */
+-    @Override
+-    public byte[] getBytes() {
+-        close();
+-        return baos.toByteArray();
+-    }
+-
+-    @Override
+-    public String getContentType() {
+-        return contentType;
+-    }
+-
+-    protected JsonGenerator getGenerator() {
+-        return generator;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/SdkJsonMarshallerFactory.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/SdkJsonMarshallerFactory.java
+--- ./src/main/java/com/amazonaws/protocol/json/SdkJsonMarshallerFactory.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/SdkJsonMarshallerFactory.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,37 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol.json;
+-
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-/**
+- * Factory interface for creating dependencies needed by generated marshallers for JSON services.
+- *
+- * @deprecated By {@link com.amazonaws.protocol.ProtocolRequestMarshaller}
+- */
+-@Deprecated
+-@SdkProtectedApi
+-public interface SdkJsonMarshallerFactory {
+-
+-    /**
+-     * Returns the {@link SdkJsonGenerator} to be used for marshalling the request.
+-     */
+-    StructuredJsonGenerator createGenerator();
+-
+-    /**
+-     * @return Content type to send in requests.
+-     */
+-    String getContentType();
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/SdkJsonProtocolFactory.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/SdkJsonProtocolFactory.java
+--- ./src/main/java/com/amazonaws/protocol/json/SdkJsonProtocolFactory.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/SdkJsonProtocolFactory.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,154 +0,0 @@
+-/*
+- *
+- * Copyright (c) 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- *
+- */
+-
+-package com.amazonaws.protocol.json;
+-
+-import com.amazonaws.AmazonServiceException;
+-import com.amazonaws.AmazonWebServiceResponse;
+-import com.amazonaws.SDKGlobalConfiguration;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.annotation.ThreadSafe;
+-import com.amazonaws.http.HttpResponseHandler;
+-import com.amazonaws.protocol.OperationInfo;
+-import com.amazonaws.protocol.Protocol;
+-import com.amazonaws.protocol.ProtocolRequestMarshaller;
+-import com.amazonaws.transform.JsonErrorUnmarshaller;
+-import com.amazonaws.transform.JsonUnmarshallerContext;
+-import com.amazonaws.transform.Unmarshaller;
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-/**
+- * Factory to generate the various JSON protocol handlers and generators depending on the wire protocol to be used for
+- * communicating with the AWS service.
+- */
+-@ThreadSafe
+-@SdkProtectedApi
+-public class SdkJsonProtocolFactory implements SdkJsonMarshallerFactory {
+-
+-    private final JsonClientMetadata metadata;
+-
+-    private final List errorUnmarshallers = new ArrayList();
+-
+-    public SdkJsonProtocolFactory(JsonClientMetadata metadata) {
+-        this.metadata = metadata;
+-        createErrorUnmarshallers();
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator createGenerator() {
+-        return getSdkFactory().createWriter(getContentType());
+-    }
+-
+-    @Override
+-    public String getContentType() {
+-        return getContentTypeResolver().resolveContentType(metadata);
+-    }
+-
+-    public  ProtocolRequestMarshaller createProtocolMarshaller(OperationInfo operationInfo, T origRequest) {
+-        return JsonProtocolMarshallerBuilder.standard()
+-                .jsonGenerator(createGenerator(operationInfo))
+-                .contentType(getContentType())
+-                .operationInfo(operationInfo)
+-                .originalRequest(origRequest)
+-                .sendExplicitNullForPayload(false)
+-                .build();
+-    }
+-
+-    private StructuredJsonGenerator createGenerator(OperationInfo operationInfo) {
+-        if (operationInfo.hasPayloadMembers() || operationInfo.protocol() == Protocol.AWS_JSON) {
+-            return createGenerator();
+-        } else {
+-            return StructuredJsonGenerator.NO_OP;
+-        }
+-    }
+-
+-    /**
+-     * Returns the response handler to be used for handling a successful response.
+-     *
+-     * @param operationMetadata Additional context information about an operation to create the appropriate response handler.
+-     */
+-    public  HttpResponseHandler> createResponseHandler(
+-            JsonOperationMetadata operationMetadata,
+-            Unmarshaller responseUnmarshaller) {
+-        return getSdkFactory().createResponseHandler(operationMetadata, responseUnmarshaller);
+-    }
+-
+-    /**
+-     * Creates a response handler for handling a error response (non 2xx response).
+-     */
+-    public HttpResponseHandler createErrorResponseHandler(
+-            JsonErrorResponseMetadata errorResponsMetadata) {
+-        return getSdkFactory().createErrorResponseHandler(errorUnmarshallers, errorResponsMetadata
+-                .getCustomErrorCodeFieldName());
+-    }
+-
+-    @SuppressWarnings("unchecked")
+-    private void createErrorUnmarshallers() {
+-        for (JsonErrorShapeMetadata errorMetadata : metadata.getErrorShapeMetadata()) {
+-            errorUnmarshallers.add(new JsonErrorUnmarshaller(
+-                    (Class) errorMetadata.getModeledClass(),
+-                    errorMetadata.getErrorCode()));
+-
+-        }
+-        errorUnmarshallers.add(new JsonErrorUnmarshaller(
+-                (Class) metadata.getBaseServiceExceptionClass(),
+-                null));
+-    }
+-
+-    /**
+-     * @return Instance of {@link SdkStructuredJsonFactory} to use in creating handlers.
+-     */
+-    private SdkStructuredJsonFactory getSdkFactory() {
+-        if (isCborEnabled()) {
+-            return SdkStructuredCborFactory.SDK_CBOR_FACTORY;
+-        } else if (isIonEnabled()) {
+-            return isIonBinaryEnabled()
+-                    ? SdkStructuredIonFactory.SDK_ION_BINARY_FACTORY
+-                    : SdkStructuredIonFactory.SDK_ION_TEXT_FACTORY;
+-        } else {
+-            return SdkStructuredPlainJsonFactory.SDK_JSON_FACTORY;
+-        }
+-    }
+-
+-    /**
+-     * @return Content type resolver implementation to use.
+-     */
+-    private JsonContentTypeResolver getContentTypeResolver() {
+-        if (isCborEnabled()) {
+-            return JsonContentTypeResolver.CBOR;
+-        } else if (isIonEnabled()) {
+-            return isIonBinaryEnabled()
+-                    ? JsonContentTypeResolver.ION_BINARY
+-                    : JsonContentTypeResolver.ION_TEXT;
+-        } else {
+-            return JsonContentTypeResolver.JSON;
+-        }
+-    }
+-
+-    private boolean isCborEnabled() {
+-        return metadata.isSupportsCbor() && !SDKGlobalConfiguration.isCborDisabled();
+-    }
+-
+-    private boolean isIonEnabled() {
+-        return metadata.isSupportsIon();
+-    }
+-
+-    boolean isIonBinaryEnabled() {
+-        return !SDKGlobalConfiguration.isIonBinaryDisabled();
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/SdkStructuredCborFactory.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/SdkStructuredCborFactory.java
+--- ./src/main/java/com/amazonaws/protocol/json/SdkStructuredCborFactory.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/SdkStructuredCborFactory.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,81 +0,0 @@
+-/*
+- *
+- * Copyright (c) 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- *
+- */
+-
+-package com.amazonaws.protocol.json;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.transform.JsonUnmarshallerContext;
+-import com.amazonaws.transform.SimpleTypeCborUnmarshallers.BigDecimalCborUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeCborUnmarshallers.BigIntegerCborUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeCborUnmarshallers.BooleanCborUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeCborUnmarshallers.ByteBufferCborUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeCborUnmarshallers.ByteCborUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeCborUnmarshallers.DateCborUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeCborUnmarshallers.DoubleCborUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeCborUnmarshallers.FloatCborUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeCborUnmarshallers.IntegerCborUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeCborUnmarshallers.LongCborUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeCborUnmarshallers.ShortCborUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeCborUnmarshallers.StringCborUnmarshaller;
+-import com.amazonaws.transform.Unmarshaller;
+-import com.amazonaws.util.ImmutableMapParameter;
+-import com.fasterxml.jackson.core.JsonFactory;
+-import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
+-import java.math.BigDecimal;
+-import java.math.BigInteger;
+-import java.nio.ByteBuffer;
+-import java.util.Collections;
+-import java.util.Date;
+-import java.util.Map;
+-
+-/**
+- * Creates generators and protocol handlers for CBOR wire format.
+- */
+-@SdkInternalApi
+-class SdkStructuredCborFactory {
+-
+-    private static final JsonFactory CBOR_FACTORY = new CBORFactory();
+-
+-    /**
+-     * cbor unmarshallers for scalar types.
+-     */
+-    private static final Map, Unmarshaller> CBOR_SCALAR_UNMARSHALLERS =
+-            new ImmutableMapParameter.Builder, Unmarshaller>()
+-            .put(String.class, StringCborUnmarshaller.getInstance())
+-            .put(Double.class, DoubleCborUnmarshaller.getInstance())
+-            .put(Integer.class, IntegerCborUnmarshaller.getInstance())
+-            .put(BigInteger.class, BigIntegerCborUnmarshaller.getInstance())
+-            .put(BigDecimal.class, BigDecimalCborUnmarshaller.getInstance())
+-            .put(Boolean.class, BooleanCborUnmarshaller.getInstance())
+-            .put(Float.class, FloatCborUnmarshaller.getInstance())
+-            .put(Long.class, LongCborUnmarshaller.getInstance())
+-            .put(Byte.class, ByteCborUnmarshaller.getInstance())
+-            .put(Date.class, DateCborUnmarshaller.getInstance())
+-            .put(ByteBuffer.class, ByteBufferCborUnmarshaller.getInstance())
+-            .put(Short.class, ShortCborUnmarshaller.getInstance()).build();
+-
+-    public static final SdkStructuredJsonFactory SDK_CBOR_FACTORY = new SdkStructuredJsonFactoryImpl(
+-            CBOR_FACTORY, CBOR_SCALAR_UNMARSHALLERS,
+-            Collections.>emptyMap()) {
+-        @Override
+-        protected StructuredJsonGenerator createWriter(JsonFactory jsonFactory,
+-                                                       String contentType) {
+-            return new SdkCborGenerator(jsonFactory, contentType);
+-        }
+-    };
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/SdkStructuredIonFactory.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/SdkStructuredIonFactory.java
+--- ./src/main/java/com/amazonaws/protocol/json/SdkStructuredIonFactory.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/SdkStructuredIonFactory.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,95 +0,0 @@
+-/*
+- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol.json;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.internal.http.CompositeErrorCodeParser;
+-import com.amazonaws.internal.http.ErrorCodeParser;
+-import com.amazonaws.internal.http.IonErrorCodeParser;
+-import com.amazonaws.internal.http.JsonErrorCodeParser;
+-import com.amazonaws.transform.JsonUnmarshallerContext;
+-import com.amazonaws.transform.SimpleTypeIonUnmarshallers.BigDecimalIonUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeIonUnmarshallers.BigIntegerIonUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeIonUnmarshallers.BooleanIonUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeIonUnmarshallers.ByteBufferIonUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeIonUnmarshallers.ByteIonUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeIonUnmarshallers.DateIonUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeIonUnmarshallers.DoubleIonUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeIonUnmarshallers.FloatIonUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeIonUnmarshallers.IntegerIonUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeIonUnmarshallers.LongIonUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeIonUnmarshallers.ShortIonUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeIonUnmarshallers.StringIonUnmarshaller;
+-import com.amazonaws.transform.Unmarshaller;
+-import com.amazonaws.util.ImmutableMapParameter;
+-import com.fasterxml.jackson.core.JsonFactory;
+-import java.math.BigDecimal;
+-import java.math.BigInteger;
+-import java.nio.ByteBuffer;
+-import java.util.Collections;
+-import java.util.Date;
+-import java.util.Map;
+-import software.amazon.ion.IonSystem;
+-import software.amazon.ion.system.IonBinaryWriterBuilder;
+-import software.amazon.ion.system.IonSystemBuilder;
+-import software.amazon.ion.system.IonTextWriterBuilder;
+-import software.amazon.ion.system.IonWriterBuilder;
+-
+-@SdkInternalApi
+-class SdkStructuredIonFactory extends SdkStructuredJsonFactoryImpl {
+-    private static final IonSystem ION_SYSTEM = IonSystemBuilder.standard().build();
+-    private static final JsonFactory JSON_FACTORY = new IonFactory(ION_SYSTEM);
+-    private static final Map, Unmarshaller> UNMARSHALLERS =
+-            new ImmutableMapParameter.Builder, Unmarshaller>()
+-            .put(BigDecimal.class, BigDecimalIonUnmarshaller.getInstance())
+-            .put(BigInteger.class, BigIntegerIonUnmarshaller.getInstance())
+-            .put(Boolean.class, BooleanIonUnmarshaller.getInstance())
+-            .put(ByteBuffer.class, ByteBufferIonUnmarshaller.getInstance())
+-            .put(Byte.class, ByteIonUnmarshaller.getInstance())
+-            .put(Date.class, DateIonUnmarshaller.getInstance())
+-            .put(Double.class, DoubleIonUnmarshaller.getInstance())
+-            .put(Float.class, FloatIonUnmarshaller.getInstance())
+-            .put(Integer.class, IntegerIonUnmarshaller.getInstance())
+-            .put(Long.class, LongIonUnmarshaller.getInstance())
+-            .put(Short.class, ShortIonUnmarshaller.getInstance())
+-            .put(String.class, StringIonUnmarshaller.getInstance())
+-            .build();
+-
+-    private static final IonBinaryWriterBuilder BINARY_WRITER_BUILDER = IonBinaryWriterBuilder.standard().immutable();
+-    private static final IonTextWriterBuilder TEXT_WRITER_BUILDER = IonTextWriterBuilder.standard().immutable();
+-
+-    public static final SdkStructuredIonFactory SDK_ION_BINARY_FACTORY = new SdkStructuredIonFactory(BINARY_WRITER_BUILDER);
+-    public static final SdkStructuredIonFactory SDK_ION_TEXT_FACTORY = new SdkStructuredIonFactory(TEXT_WRITER_BUILDER);
+-
+-    private final IonWriterBuilder builder;
+-
+-    private SdkStructuredIonFactory(IonWriterBuilder builder) {
+-        super(JSON_FACTORY, UNMARSHALLERS,
+-              Collections.>emptyMap());
+-        this.builder = builder;
+-    }
+-
+-    @Override
+-    protected StructuredJsonGenerator createWriter(JsonFactory jsonFactory, String contentType) {
+-        return SdkIonGenerator.create(builder, contentType);
+-    }
+-
+-    @Override
+-    protected ErrorCodeParser getErrorCodeParser(String customErrorCodeFieldName) {
+-        return new CompositeErrorCodeParser(
+-                new IonErrorCodeParser(ION_SYSTEM),
+-                new JsonErrorCodeParser(customErrorCodeFieldName));
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/SdkStructuredJsonFactoryImpl.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/SdkStructuredJsonFactoryImpl.java
+--- ./src/main/java/com/amazonaws/protocol/json/SdkStructuredJsonFactoryImpl.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/SdkStructuredJsonFactoryImpl.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,79 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol.json;
+-
+-import com.amazonaws.http.JsonErrorResponseHandler;
+-import com.amazonaws.http.JsonResponseHandler;
+-import com.amazonaws.internal.http.ErrorCodeParser;
+-import com.amazonaws.internal.http.JsonErrorCodeParser;
+-import com.amazonaws.internal.http.JsonErrorMessageParser;
+-import com.amazonaws.transform.JsonErrorUnmarshaller;
+-import com.amazonaws.transform.JsonUnmarshallerContext;
+-import com.amazonaws.transform.JsonUnmarshallerContext.UnmarshallerType;
+-import com.amazonaws.transform.Unmarshaller;
+-import com.fasterxml.jackson.core.JsonFactory;
+-
+-import java.util.List;
+-import java.util.Map;
+-
+-/**
+- * Generic implementation of a structured JSON factory that is pluggable for different variants of
+- * JSON. See {@link SdkStructuredPlainJsonFactory#SDK_JSON_FACTORY} and {@link
+- * SdkStructuredCborFactory#SDK_CBOR_FACTORY}.
+- */
+-public abstract class SdkStructuredJsonFactoryImpl implements SdkStructuredJsonFactory {
+-
+-    private final JsonFactory jsonFactory;
+-    private final Map, Unmarshaller> unmarshallers;
+-    private final Map> customTypeMarshallers;
+-
+-    public SdkStructuredJsonFactoryImpl(JsonFactory jsonFactory,
+-                                        Map, Unmarshaller> unmarshallers,
+-                                        Map> customTypeMarshallers) {
+-        this.jsonFactory = jsonFactory;
+-        this.unmarshallers = unmarshallers;
+-        this.customTypeMarshallers = customTypeMarshallers;
+-    }
+-
+-    @Override
+-    public StructuredJsonGenerator createWriter(String contentType) {
+-        return createWriter(jsonFactory, contentType);
+-    }
+-
+-    protected abstract StructuredJsonGenerator createWriter(JsonFactory jsonFactory,
+-                                                            String contentType);
+-
+-    @Override
+-    public  JsonResponseHandler createResponseHandler(JsonOperationMetadata operationMetadata,
+-                                                            Unmarshaller responseUnmarshaller) {
+-        return new JsonResponseHandler(responseUnmarshaller, unmarshallers, customTypeMarshallers, jsonFactory,
+-                                       operationMetadata.isHasStreamingSuccessResponse(),
+-                                       operationMetadata.isPayloadJson());
+-    }
+-
+-    @Override
+-    public JsonErrorResponseHandler createErrorResponseHandler(
+-            final List errorUnmarshallers, String customErrorCodeFieldName) {
+-        return new JsonErrorResponseHandler(errorUnmarshallers,
+-                                            getErrorCodeParser(customErrorCodeFieldName),
+-                                            JsonErrorMessageParser.DEFAULT_ERROR_MESSAGE_PARSER,
+-                                            jsonFactory);
+-    }
+-
+-    protected ErrorCodeParser getErrorCodeParser(String customErrorCodeFieldName) {
+-        return new JsonErrorCodeParser(customErrorCodeFieldName);
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/SdkStructuredJsonFactory.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/SdkStructuredJsonFactory.java
+--- ./src/main/java/com/amazonaws/protocol/json/SdkStructuredJsonFactory.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/SdkStructuredJsonFactory.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,59 +0,0 @@
+-/*
+- * Copyright (c) 2016. Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.protocol.json;
+-
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.http.JsonErrorResponseHandler;
+-import com.amazonaws.http.JsonResponseHandler;
+-import com.amazonaws.transform.JsonErrorUnmarshaller;
+-import com.amazonaws.transform.JsonUnmarshallerContext;
+-import com.amazonaws.transform.Unmarshaller;
+-
+-import java.util.List;
+-
+-/**
+- * Common interface for creating generators (writers) and protocol handlers for JSON like protocols.
+- * Current implementations include {@link SdkStructuredPlainJsonFactory} and {@link
+- * SdkStructuredCborFactory}
+- */
+-@SdkProtectedApi
+-public interface SdkStructuredJsonFactory {
+-
+-    /**
+-     * Returns the {@link StructuredJsonGenerator} to be used for marshalling the request.
+-     *
+-     * @param contentType Content type to send for requests.
+-     */
+-    StructuredJsonGenerator createWriter(String contentType);
+-
+-    /**
+-     * Returns the response handler to be used for handling a successfull response.
+-     *
+-     * @param operationMetadata Additional context information about an operation to create the
+-     *                          appropriate response handler.
+-     */
+-     JsonResponseHandler createResponseHandler(JsonOperationMetadata operationMetadata,
+-                                                     Unmarshaller responseUnmarshaller);
+-
+-    /**
+-     * Returns the error response handler for handling a error response.
+-     *
+-     * @param errorUnmarshallers Response unmarshallers to unamrshall the error responses.
+-     */
+-    JsonErrorResponseHandler createErrorResponseHandler(
+-            List errorUnmarshallers, String customErrorCodeFieldName);
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/SdkStructuredPlainJsonFactory.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/SdkStructuredPlainJsonFactory.java
+--- ./src/main/java/com/amazonaws/protocol/json/SdkStructuredPlainJsonFactory.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/SdkStructuredPlainJsonFactory.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,91 +0,0 @@
+-/*
+- *
+- * Copyright (c) 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- *
+- */
+-
+-package com.amazonaws.protocol.json;
+-
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.annotation.SdkTestInternalApi;
+-import com.amazonaws.transform.JsonUnmarshallerContext;
+-import com.amazonaws.transform.JsonUnmarshallerContext.UnmarshallerType;
+-import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.BigDecimalJsonUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.BigIntegerJsonUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.BooleanJsonUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.ByteBufferJsonUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.ByteJsonUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.CharacterJsonUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.DateJsonUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.DoubleJsonUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.FloatJsonUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.IntegerJsonUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.JsonValueStringUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.LongJsonUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.ShortJsonUnmarshaller;
+-import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.StringJsonUnmarshaller;
+-import com.amazonaws.transform.Unmarshaller;
+-import com.amazonaws.util.ImmutableMapParameter;
+-import com.fasterxml.jackson.core.JsonFactory;
+-import java.math.BigDecimal;
+-import java.math.BigInteger;
+-import java.nio.ByteBuffer;
+-import java.util.Date;
+-import java.util.Map;
+-
+-/**
+- * Creates generators and protocol handlers for plain text JSON wire format.
+- */
+-@SdkProtectedApi
+-public class SdkStructuredPlainJsonFactory {
+-
+-    /**
+-     * Recommended to share JsonFactory instances per http://wiki.fasterxml
+-     * .com/JacksonBestPracticesPerformance
+-     */
+-    public static final JsonFactory JSON_FACTORY = new JsonFactory();
+-
+-    @SdkTestInternalApi
+-    public static final Map, Unmarshaller> JSON_SCALAR_UNMARSHALLERS =
+-            new ImmutableMapParameter.Builder, Unmarshaller>()
+-            .put(String.class, StringJsonUnmarshaller.getInstance())
+-            .put(Double.class, DoubleJsonUnmarshaller.getInstance())
+-            .put(Integer.class, IntegerJsonUnmarshaller.getInstance())
+-            .put(BigInteger.class, BigIntegerJsonUnmarshaller.getInstance())
+-            .put(BigDecimal.class, BigDecimalJsonUnmarshaller.getInstance())
+-            .put(Boolean.class, BooleanJsonUnmarshaller.getInstance())
+-            .put(Float.class, FloatJsonUnmarshaller.getInstance())
+-            .put(Long.class, LongJsonUnmarshaller.getInstance())
+-            .put(Byte.class, ByteJsonUnmarshaller.getInstance())
+-            .put(Date.class, DateJsonUnmarshaller.getInstance())
+-            .put(ByteBuffer.class, ByteBufferJsonUnmarshaller.getInstance())
+-            .put(Character.class, CharacterJsonUnmarshaller.getInstance())
+-            .put(Short.class, ShortJsonUnmarshaller.getInstance()).build();
+-
+-    @SdkTestInternalApi
+-    public static final Map> JSON_CUSTOM_TYPE_UNMARSHALLERS =
+-            new ImmutableMapParameter.Builder>()
+-                    .put(UnmarshallerType.JSON_VALUE, JsonValueStringUnmarshaller.getInstance())
+-                    .build();
+-
+-    public static final SdkStructuredJsonFactory SDK_JSON_FACTORY = new SdkStructuredJsonFactoryImpl(
+-            JSON_FACTORY, JSON_SCALAR_UNMARSHALLERS, JSON_CUSTOM_TYPE_UNMARSHALLERS) {
+-        @Override
+-        protected StructuredJsonGenerator createWriter(JsonFactory jsonFactory,
+-                                                       String contentType) {
+-            return new SdkJsonGenerator(jsonFactory, contentType);
+-        }
+-    };
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/StructuredJsonGenerator.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/StructuredJsonGenerator.java
+--- ./src/main/java/com/amazonaws/protocol/json/StructuredJsonGenerator.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/StructuredJsonGenerator.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,177 +0,0 @@
+-/*
+- *
+- * Copyright (c) 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- *
+- */
+-
+-package com.amazonaws.protocol.json;
+-
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-import java.math.BigDecimal;
+-import java.math.BigInteger;
+-import java.nio.ByteBuffer;
+-import java.util.Date;
+-
+-/**
+- * Interface for generating a JSON
+- */
+-@SdkProtectedApi
+-public interface StructuredJsonGenerator {
+-
+-    /**
+-     * No-op implementation that ignores all calls and returns empty bytes from getBytes.
+-     */
+-    StructuredJsonGenerator NO_OP = new StructuredJsonGenerator() {
+-
+-        private final byte[] EMPTY_BYTES = new byte[0];
+-
+-        @Override
+-        public StructuredJsonGenerator writeStartArray() {
+-            return this;
+-        }
+-
+-        @Override
+-        public StructuredJsonGenerator writeEndArray() {
+-            return this;
+-        }
+-
+-        @Override
+-        public StructuredJsonGenerator writeNull() {
+-            return this;
+-        }
+-
+-        @Override
+-        public StructuredJsonGenerator writeStartObject() {
+-            return this;
+-        }
+-
+-        @Override
+-        public StructuredJsonGenerator writeEndObject() {
+-            return this;
+-        }
+-
+-        @Override
+-        public StructuredJsonGenerator writeFieldName(String fieldName) {
+-            return this;
+-        }
+-
+-        @Override
+-        public StructuredJsonGenerator writeValue(String val) {
+-            return this;
+-        }
+-
+-        @Override
+-        public StructuredJsonGenerator writeValue(boolean bool) {
+-            return this;
+-        }
+-
+-        @Override
+-        public StructuredJsonGenerator writeValue(long val) {
+-            return this;
+-        }
+-
+-        @Override
+-        public StructuredJsonGenerator writeValue(double val) {
+-            return this;
+-        }
+-
+-        @Override
+-        public StructuredJsonGenerator writeValue(float val) {
+-            return this;
+-        }
+-
+-        @Override
+-        public StructuredJsonGenerator writeValue(short val) {
+-            return this;
+-        }
+-
+-        @Override
+-        public StructuredJsonGenerator writeValue(int val) {
+-            return this;
+-        }
+-
+-        @Override
+-        public StructuredJsonGenerator writeValue(ByteBuffer bytes) {
+-            return this;
+-        }
+-
+-        @Override
+-        public StructuredJsonGenerator writeValue(Date date) {
+-            return this;
+-        }
+-
+-        @Override
+-        public StructuredJsonGenerator writeValue(BigDecimal value) {
+-            return this;
+-        }
+-
+-        @Override
+-        public StructuredJsonGenerator writeValue(BigInteger value) {
+-            return this;
+-        }
+-
+-        @Override
+-        public byte[] getBytes() {
+-            return EMPTY_BYTES;
+-        }
+-
+-        @Override
+-        public String getContentType() {
+-            return null;
+-        }
+-    };
+-
+-    StructuredJsonGenerator writeStartArray();
+-
+-    StructuredJsonGenerator writeEndArray();
+-
+-    StructuredJsonGenerator writeNull();
+-
+-    StructuredJsonGenerator writeStartObject();
+-
+-    StructuredJsonGenerator writeEndObject();
+-
+-    StructuredJsonGenerator writeFieldName(String fieldName);
+-
+-    StructuredJsonGenerator writeValue(String val);
+-
+-    StructuredJsonGenerator writeValue(boolean bool);
+-
+-    StructuredJsonGenerator writeValue(long val);
+-
+-    StructuredJsonGenerator writeValue(double val);
+-
+-    StructuredJsonGenerator writeValue(float val);
+-
+-    StructuredJsonGenerator writeValue(short val);
+-
+-    StructuredJsonGenerator writeValue(int val);
+-
+-    StructuredJsonGenerator writeValue(ByteBuffer bytes);
+-
+-    StructuredJsonGenerator writeValue(Date date);
+-
+-    StructuredJsonGenerator writeValue(BigDecimal value);
+-
+-    StructuredJsonGenerator writeValue(BigInteger value);
+-
+-    byte[] getBytes();
+-
+-    /**
+-     * New clients use {@link SdkJsonProtocolFactory#getContentType()}.
+-     */
+-    @Deprecated
+-    String getContentType();
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/json/StructuredJsonMarshaller.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/StructuredJsonMarshaller.java
+--- ./src/main/java/com/amazonaws/protocol/json/StructuredJsonMarshaller.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/json/StructuredJsonMarshaller.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,35 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.protocol.json;
+-
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-/**
+- * Interface to marshall an object to the JSON payload using a {@link StructuredJsonGenerator}.
+- *
+- * @param  Type of object to marshall.
+- */
+-@SdkProtectedApi
+-public interface StructuredJsonMarshaller {
+-
+-    /**
+-     * Marshalls the value using the {@link StructuredJsonGenerator}.
+-     *
+-     * @param val           Object to marshall.
+-     * @param jsonGenerator {@link StructuredJsonGenerator} with methods to write various types to the JSON document.
+-     */
+-    void marshall(T val, StructuredJsonGenerator jsonGenerator);
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/MarshallingInfo.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/MarshallingInfo.java
+--- ./src/main/java/com/amazonaws/protocol/MarshallingInfo.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/MarshallingInfo.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,146 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol;
+-
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-/**
+- * Metadata about the marshalling requirements of a given member. Includes things like where to put the
+- * data (payload, query, etc), the location name it's bound to (JSON field name, query param name, etc)
+- * and additional directives about how to transform it (i.e. is it binary data, should it be auto generated, etc).
+- */
+-@SdkProtectedApi
+-public class MarshallingInfo {
+-
+-    private final MarshallingType marshallingType;
+-    private final String marshallLocationName;
+-    private final MarshallLocation marshallLocation;
+-    private final boolean isExplicitPayloadMember;
+-    private final boolean isBinary;
+-    private final DefaultValueSupplier defaultValueSupplier;
+-
+-    private MarshallingInfo(Builder builder) {
+-        this.marshallingType = builder.marshallingType;
+-        this.marshallLocationName = builder.marshallLocationName;
+-        this.marshallLocation = builder.marshallLocation;
+-        this.isExplicitPayloadMember = builder.isExplicitPayloadMember;
+-        this.isBinary = builder.isBinary;
+-        this.defaultValueSupplier = builder.defaultValueSupplier;
+-    }
+-
+-    /**
+-     * @return MarshallingType for this member.
+-     */
+-    public MarshallingType marshallingType() {
+-        return marshallingType;
+-    }
+-
+-    /**
+-     * @return Marshall location name. This may represent different things depending on where the data is meant to be marshalled
+-     * to. For data bound to the payload, this may be the JSON field name, for data bound to the query params this will be the
+-     * parameter name, for data bound to the path this will be the value of the path placeholder to replace in the request URI.
+-     * Note that it may be null for explicit payload members.
+-     */
+-    public String marshallLocationName() {
+-        return marshallLocationName;
+-    }
+-
+-    /**
+-     * @return Where the data should be marshalled to.
+-     */
+-    public MarshallLocation marshallLocation() {
+-        return marshallLocation;
+-    }
+-
+-    /**
+-     * @return True if the member is explicitly bound to the payload. Applicable only for RESTFUL services.
+-     */
+-    public boolean isExplicitPayloadMember() {
+-        return isExplicitPayloadMember;
+-    }
+-
+-    /**
+-     * @return True if the payload member is binary data (i.e. a {@link java.nio.ByteBuffer} or {@link java.io.InputStream} and
+-     * should be sent as the request content. This is not true when binary data is bound to a member of the JSON payload since it
+-     * will be base64 encoded as a string.
+-     */
+-    public boolean isBinary() {
+-        return isBinary;
+-    }
+-
+-    /**
+-     * @return Optional supplier of default value if the value to marshall is null.
+-     */
+-    public DefaultValueSupplier defaultValueSupplier() {
+-        return defaultValueSupplier;
+-    }
+-
+-    /**
+-     * @return Builder instance to construct a {@link MarshallingInfo}.
+-     */
+-    public static  Builder builder(MarshallingType marshallingType) {
+-        return new Builder(marshallingType);
+-    }
+-
+-    /**
+-     * Builder for a {@link MarshallingInfo}.
+-     */
+-    public static final class Builder {
+-
+-        private final MarshallingType marshallingType;
+-        private String marshallLocationName;
+-        private MarshallLocation marshallLocation;
+-        private boolean isExplicitPayloadMember;
+-        private boolean isBinary;
+-        private DefaultValueSupplier defaultValueSupplier;
+-
+-        private Builder(MarshallingType marshallingType) {
+-            this.marshallingType = marshallingType;
+-        }
+-
+-        public Builder marshallLocationName(String marshallLocationName) {
+-            this.marshallLocationName = marshallLocationName;
+-            return this;
+-        }
+-
+-        public Builder marshallLocation(MarshallLocation marshallLocation) {
+-            this.marshallLocation = marshallLocation;
+-            return this;
+-        }
+-
+-        public Builder isExplicitPayloadMember(boolean isExplicitPayloadMember) {
+-            this.isExplicitPayloadMember = isExplicitPayloadMember;
+-            return this;
+-        }
+-
+-        public Builder isBinary(boolean isBinary) {
+-            this.isBinary = isBinary;
+-            return this;
+-        }
+-
+-        public Builder defaultValueSupplier(DefaultValueSupplier defaultValueSupplier) {
+-            this.defaultValueSupplier = defaultValueSupplier;
+-            return this;
+-        }
+-
+-        /**
+-         * @return An immutable {@link MarshallingInfo} object.
+-         */
+-        public MarshallingInfo build() {
+-            return new MarshallingInfo(this);
+-        }
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/MarshallingType.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/MarshallingType.java
+--- ./src/main/java/com/amazonaws/protocol/MarshallingType.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/MarshallingType.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,79 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol;
+-
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import java.io.InputStream;
+-import java.math.BigDecimal;
+-import java.nio.ByteBuffer;
+-import java.util.Date;
+-import java.util.List;
+-import java.util.Map;
+-
+-/**
+- * Represents the various types supported for marshalling.
+- *
+- * @param  Java type bound to the marshalling type.
+- */
+-@SdkProtectedApi
+-public interface MarshallingType {
+-    /**
+-     * Determine whether this marshalling type is the default marshaller for the provided class. This is used to automatically
+-     * determine the marshaller to be used in the contents of lists or maps.
+-     */
+-    boolean isDefaultMarshallerForType(Class type);
+-
+-    /**
+-     * Used when a value is null (and thus type can't be determined).
+-     */
+-    MarshallingType NULL = new DefaultMarshallingType(Void.class);
+-
+-    MarshallingType STRING = new DefaultMarshallingType(String.class);
+-
+-    MarshallingType INTEGER = new DefaultMarshallingType(Integer.class);
+-
+-    MarshallingType LONG = new DefaultMarshallingType(Long.class);
+-
+-    MarshallingType FLOAT = new DefaultMarshallingType(Float.class);
+-
+-    MarshallingType DOUBLE = new DefaultMarshallingType(Double.class);
+-
+-    MarshallingType BIG_DECIMAL = new DefaultMarshallingType(BigDecimal.class);
+-
+-    MarshallingType BOOLEAN = new DefaultMarshallingType(Boolean.class);
+-
+-    MarshallingType DATE = new DefaultMarshallingType(Date.class);
+-
+-    MarshallingType BYTE_BUFFER = new DefaultMarshallingType(ByteBuffer.class);
+-
+-    MarshallingType STREAM = new DefaultMarshallingType(InputStream.class);
+-
+-    MarshallingType STRUCTURED = new DefaultMarshallingType(StructuredPojo.class);
+-
+-    MarshallingType LIST = new DefaultMarshallingType(List.class);
+-
+-    MarshallingType MAP = new DefaultMarshallingType(Map.class);
+-
+-    /**
+-     * A serializer for strings that should be base-64 encoded when they are sent to AWS.
+-     */
+-    MarshallingType JSON_VALUE = new MarshallingType() {
+-        @Override
+-        public boolean isDefaultMarshallerForType(Class type) {
+-            return false;
+-        }
+-    };
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/MarshallLocation.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/MarshallLocation.java
+--- ./src/main/java/com/amazonaws/protocol/MarshallLocation.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/MarshallLocation.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,51 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol;
+-
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-/**
+- * Enum representing the various locations data can be marshalled to.
+- */
+-@SdkProtectedApi
+-public enum MarshallLocation {
+-
+-    /**
+-     * Payload of the request (format depends on the protocol/content-type)
+-     */
+-    PAYLOAD,
+-
+-    /**
+-     * Add as a query parameter.
+-     */
+-    QUERY_PARAM,
+-
+-    /**
+-     * HTTP header.
+-     */
+-    HEADER,
+-
+-    /**
+-     * Replace the placeholder in the request URI (non-greedy).
+-     */
+-    PATH,
+-
+-    /**
+-     * Replace the placeholder in the request URI (greedy). This location is really the same as {@link #PATH},
+-     * the only difference is whether it's URL encoded or not. Members bound to the {@link #PATH} will be URL
+-     * encoded before replacing, members bound to {@link #GREEDY_PATH} will not be URL encoded.
+-     */
+-    GREEDY_PATH
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/OperationInfo.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/OperationInfo.java
+--- ./src/main/java/com/amazonaws/protocol/OperationInfo.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/OperationInfo.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,166 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol;
+-
+-import com.amazonaws.Request;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.http.HttpMethodName;
+-
+-
+-/**
+- * Static information about an API operation used to marshall it correctly.
+- */
+-@SdkProtectedApi
+-public class OperationInfo {
+-
+-    private final Protocol protocol;
+-    private final String requestUri;
+-    private final HttpMethodName httpMethodName;
+-    private final String operationIdentifier;
+-    private final String serviceName;
+-    private final boolean hasExplicitPayloadMember;
+-    private final boolean hasPayloadMembers;
+-
+-    private OperationInfo(Builder builder) {
+-        this.protocol = builder.protocol;
+-        this.requestUri = builder.requestUri;
+-        this.httpMethodName = builder.httpMethodName;
+-        this.operationIdentifier = builder.operationIdentifier;
+-        this.serviceName = builder.serviceName;
+-        this.hasExplicitPayloadMember = builder.hasExplicitPayloadMember;
+-        this.hasPayloadMembers = builder.hasPayloadMembers;
+-    }
+-
+-    /**
+-     * @return The protocol of the client. Gives hints to the marshaller on how things should be transformed.
+-     */
+-    public Protocol protocol() {
+-        return protocol;
+-    }
+-
+-    /**
+-     * @return Request URI for operation (may contain placeholders for members bound to the uri).
+-     */
+-    public String requestUri() {
+-        return requestUri;
+-    }
+-
+-    /**
+-     * @return HTTP Method that should be used when sending the request.
+-     */
+-    public HttpMethodName httpMethodName() {
+-        return httpMethodName;
+-    }
+-
+-    /**
+-     * @return Identifer for the operation/API being invoked. This is used for RPC based protocols that
+-     * need to identify which action is being taken. For Query/EC2 protocol this is sent as the 'Action' query
+-     * parameter, for JSON RPC this is sent as the 'X-Amz-Target' header.
+-     */
+-    public String operationIdentifier() {
+-        return operationIdentifier;
+-    }
+-
+-    /**
+-     * @return Display name for the service. Mainly used for the metrics system but is also available on the {@link Request}
+-     * object (to do something in a {@link com.amazonaws.handlers.RequestHandler2} for example). This is usually the service
+-     * interface name but may be customized at generation time ('AmazonDynamoDBv2' for example).
+-     */
+-    public String serviceName() {
+-        return serviceName;
+-    }
+-
+-    /**
+-     * @return True if the operation has a member that's explicitly marked as the payload. False otherwise. (Applicable only to
+-     * RESTUL protocols).
+-     */
+-    public boolean hasExplicitPayloadMember() {
+-        return hasExplicitPayloadMember;
+-    }
+-
+-    /**
+-     * @return True if the operation has members bound to the payload. Some requests (especially GET and DELETE) may not
+-     * have any members bound to the payload. (Applicable only to RESTFUL protocols).
+-     */
+-    public boolean hasPayloadMembers() {
+-        return hasPayloadMembers;
+-    }
+-
+-    /**
+-     * @return Builder instance to construct a {@link OperationInfo}.
+-     */
+-    public static Builder builder() {
+-        return new Builder();
+-    }
+-
+-    /**
+-     * Builder for a {@link OperationInfo}.
+-     */
+-    public static final class Builder {
+-
+-        private Protocol protocol;
+-        private String requestUri;
+-        private HttpMethodName httpMethodName;
+-        private String operationIdentifier;
+-        private String serviceName;
+-        private boolean hasExplicitPayloadMember;
+-        private boolean hasPayloadMembers;
+-
+-        public Builder protocol(Protocol protocol) {
+-            this.protocol = protocol;
+-            return this;
+-        }
+-
+-        public Builder requestUri(String requestUri) {
+-            this.requestUri = requestUri;
+-            return this;
+-        }
+-
+-        public Builder httpMethodName(HttpMethodName httpMethodName) {
+-            this.httpMethodName = httpMethodName;
+-            return this;
+-        }
+-
+-        public Builder operationIdentifier(String operationIdentifier) {
+-            this.operationIdentifier = operationIdentifier;
+-            return this;
+-        }
+-
+-        public Builder serviceName(String serviceName) {
+-            this.serviceName = serviceName;
+-            return this;
+-        }
+-
+-        public Builder hasExplicitPayloadMember(boolean hasExplicitPayloadMember) {
+-            this.hasExplicitPayloadMember = hasExplicitPayloadMember;
+-            return this;
+-        }
+-
+-        public Builder hasPayloadMembers(boolean hasPayloadMembers) {
+-            this.hasPayloadMembers = hasPayloadMembers;
+-            return this;
+-        }
+-
+-        private Builder() {
+-        }
+-
+-        /**
+-         * @return An immutable {@link OperationInfo} object.
+-         */
+-        public OperationInfo build() {
+-            return new OperationInfo(this);
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/Protocol.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/Protocol.java
+--- ./src/main/java/com/amazonaws/protocol/Protocol.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/Protocol.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,38 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol;
+-
+-/**
+- * Supported protocols for the new marshalling style. Currently only includes JSON based services.
+- */
+-public enum Protocol {
+-
+-    /**
+-     * RPC protocol that sends all data in the payload as JSON and sends the X-Amz-Target header to indicate the
+-     * operation to invoke.
+-     */
+-    AWS_JSON,
+-
+-    /**
+-     * Protocol that supports RESTful bindings. Members can be bound to the headers, query params, path, or payload. Supports
+-     * binary and streaming data. Operation is identified by HTTP verb and resource path combination.
+-     */
+-    REST_JSON,
+-
+-    /**
+-     * A variation of REST_JSON for externally generated, API Gateway clients.
+-     */
+-    API_GATEWAY
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/ProtocolMarshaller.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/ProtocolMarshaller.java
+--- ./src/main/java/com/amazonaws/protocol/ProtocolMarshaller.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/ProtocolMarshaller.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,37 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol;
+-
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-/**
+- * Interface used by generated marshallers to marshall a Java POJO.
+- */
+-@SdkProtectedApi
+-public interface ProtocolMarshaller {
+-
+-    /**
+-     * Marshalls the value into the appropriate location based on the {@link MarshallingInfo} metadata.
+-     *
+-     * @param val             Value to marshall. May be null if the location allows it (for example, members bound to the path
+-     *                        must never be null or empty).
+-     * @param marshallingInfo Metadata about how and where to marshall the data. Must not be null.
+-     * @throws com.amazonaws.SdkClientException If invalid parameters or combination of parameters are provided (I.E. null value
+-     *                                          provided for member bound to the path).
+-     */
+-     void marshall(T val, MarshallingInfo marshallingInfo) throws SdkClientException;
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/ProtocolRequestMarshaller.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/ProtocolRequestMarshaller.java
+--- ./src/main/java/com/amazonaws/protocol/ProtocolRequestMarshaller.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/ProtocolRequestMarshaller.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,52 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol;
+-
+-import com.amazonaws.Request;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-/**
+- * Interface used by generated marshallers to transform a Java POJO in a {@link Request} object which represents an HTTP request.
+- *
+- * 
Example Usage:

+- * 
+- * {@code
+- * ProtocolRequestMarshaller = createProtocolMarshaller(...);
+- * protocolMarshaller.startMarshalling();
+- * protocolMarshaller.marshall(obj, marshallingInfo);
+- * Request marshalledRequest = protocolMarshaller.finishMarshalling();
+- * }
+- * 

+- *
+- * @param  Type of the original request object.
+- */
+-@SdkProtectedApi
+-public interface ProtocolRequestMarshaller extends ProtocolMarshaller {
+-
+-    /**
+-     * Hook to perform an initialization that needs to happen at the start of marshalling. Must be called before
+-     * any call to {@link #marshall(Object, MarshallingInfo)}.
+-     */
+-    void startMarshalling();
+-
+-    /**
+-     * Finializes the marshalling and produces a {@link Request} object that can be sent for execution. Must be the last
+-     * method called in the marshaller.
+-     *
+-     * @return Marshalled {@link Request} object.
+-     */
+-    Request finishMarshalling();
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/protocol/StructuredPojo.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/StructuredPojo.java
+--- ./src/main/java/com/amazonaws/protocol/StructuredPojo.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/protocol/StructuredPojo.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,31 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.protocol;
+-
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-/**
+- * Interface implemented by model classes so that they may marshaller themselves.
+- */
+-@SdkProtectedApi
+-public interface StructuredPojo {
+-
+-    /**
+-     * Marshalls this structured data using the given {@link ProtocolMarshaller}.
+-     *
+-     * @param protocolMarshaller Implementation of {@link ProtocolMarshaller} used to marshall this object's data.
+-     */
+-    void marshall(ProtocolMarshaller protocolMarshaller);
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/Protocol.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/Protocol.java
+--- ./src/main/java/com/amazonaws/Protocol.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/Protocol.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,54 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- * 
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- * 
+- *  http://aws.amazon.com/apache2.0
+- * 
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws;
+-
+-/**
+- * Represents the communication protocol to use when sending requests to AWS.
+- * 

+- * Communication over HTTPS is the default, and is more secure than HTTP, which
+- * is why AWS recommends using HTTPS. HTTPS connections can use more system
+- * resources because of the extra work to encrypt network traffic, so the option
+- * to use HTTP is available in case users need it.
+- */
+-public enum Protocol {
+-
+-    /**
+-     * HTTP Protocol - Using the HTTP protocol is less secure than HTTPS, but
+-     * can slightly reduce the system resources used when communicating with
+-     * AWS.
+-     */
+-    HTTP("http"),
+-
+-    /**
+-     * HTTPS Protocol - Using the HTTPS protocol is more secure than using the
+-     * HTTP protocol, but may use slightly more system resources. AWS recommends
+-     * using HTTPS for maximize security.
+-     */
+-    HTTPS("https");
+-
+-    private final String protocol;
+-
+-    private Protocol(String protocol) {
+-        this.protocol = protocol;
+-    }
+-
+-    /* (non-Javadoc)
+-     * @see java.lang.Enum#toString()
+-     */
+-    @Override
+-    public String toString() {
+-        return protocol;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/ProxyAuthenticationMethod.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/ProxyAuthenticationMethod.java
+--- ./src/main/java/com/amazonaws/ProxyAuthenticationMethod.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/ProxyAuthenticationMethod.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,30 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws;
+-
+-import java.util.List;
+-
+-/**
+- * Methods by which the SDK can authenticate against an HTTP proxy. These can be configured on a client using
+- * {@link ClientConfiguration#setProxyAuthenticationMethods(List)}.
+- */
+-public enum ProxyAuthenticationMethod {
+-    SPNEGO,
+-    KERBEROS,
+-    NTLM,
+-    DIGEST,
+-    BASIC
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/ReadLimitInfo.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/ReadLimitInfo.java
+--- ./src/main/java/com/amazonaws/ReadLimitInfo.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/ReadLimitInfo.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,23 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws;
+-
+-public interface ReadLimitInfo {
+-    /**
+-     * Returns the read limit for mark-and-reset during retries; or -1 if not
+-     * available.
+-     */
+-    public int getReadLimit();
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/regions/AbstractRegionMetadataProvider.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/AbstractRegionMetadataProvider.java
+--- ./src/main/java/com/amazonaws/regions/AbstractRegionMetadataProvider.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/AbstractRegionMetadataProvider.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,59 +0,0 @@
+-/*
+- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.regions;
+-
+-import java.net.URI;
+-
+-
+-/**
+- * An abstract implementation of {@link RegionMetadataProvider}
+- */
+-
+-public abstract class AbstractRegionMetadataProvider implements
+-        RegionMetadataProvider {
+-
+-    @Override
+-    public Region getRegionByEndpoint(String endpoint) {
+-        String host = getHost(endpoint);
+-
+-        for (Region region : getRegions()) {
+-            for (String serviceEndpoint :
+-                    region.getAvailableEndpoints()) {
+-
+-                if (host.equals(getHost(serviceEndpoint))) {
+-                    return region;
+-                }
+-            }
+-        }
+-
+-        throw new IllegalArgumentException(
+-                "No region found with any service for endpoint " + endpoint);
+-    }
+-
+-    /**
+-     * Parse the host portion out of an endpoint (which may or may not
+-     * contain a scheme).
+-     *
+-     * @param endpoint the endpoint to parse
+-     * @return the host portion of the endpoint
+-     */
+-    private static String getHost(final String endpoint) {
+-        String host = URI.create(endpoint).getHost();
+-        if (host == null) {
+-            host = URI.create("http://" + endpoint).getHost();
+-        }
+-        return host;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/regions/AwsEnvVarOverrideRegionProvider.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/AwsEnvVarOverrideRegionProvider.java
+--- ./src/main/java/com/amazonaws/regions/AwsEnvVarOverrideRegionProvider.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/AwsEnvVarOverrideRegionProvider.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,31 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.regions;
+-
+-import com.amazonaws.SdkClientException;
+-
+-import static com.amazonaws.SDKGlobalConfiguration.AWS_REGION_ENV_VAR;
+-
+-/**
+- * Loads region information from the '{@value com.amazonaws.SDKGlobalConfiguration#AWS_REGION_ENV_VAR}'
+- * environment variable.
+- */
+-public class AwsEnvVarOverrideRegionProvider extends AwsRegionProvider {
+-
+-    @Override
+-    public String getRegion() throws SdkClientException {
+-        return System.getenv(AWS_REGION_ENV_VAR);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/regions/AwsProfileRegionProvider.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/AwsProfileRegionProvider.java
+--- ./src/main/java/com/amazonaws/regions/AwsProfileRegionProvider.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/AwsProfileRegionProvider.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,73 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.regions;
+-
+-
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.annotation.SdkTestInternalApi;
+-import com.amazonaws.auth.profile.internal.AllProfiles;
+-import com.amazonaws.auth.profile.internal.AwsProfileNameLoader;
+-import com.amazonaws.auth.profile.internal.BasicProfile;
+-import com.amazonaws.auth.profile.internal.BasicProfileConfigLoader;
+-import com.amazonaws.profile.path.AwsProfileFileLocationProvider;
+-import com.amazonaws.util.StringUtils;
+-
+-import java.io.File;
+-
+-/**
+- * Loads region information from the shared AWS config file. Uses the default profile unless
+- * otherwise specified.
+- */
+-public class AwsProfileRegionProvider extends AwsRegionProvider {
+-
+-    private final String profileName;
+-    private final AwsProfileFileLocationProvider locationProvider;
+-    private final BasicProfileConfigLoader profileConfigLoader;
+-
+-    public AwsProfileRegionProvider() {
+-        this(AwsProfileNameLoader.INSTANCE.loadProfileName());
+-    }
+-
+-    public AwsProfileRegionProvider(String profileName) {
+-        this(profileName, AwsProfileFileLocationProvider.DEFAULT_CONFIG_LOCATION_PROVIDER,
+-             BasicProfileConfigLoader.INSTANCE);
+-    }
+-
+-    @SdkTestInternalApi
+-    AwsProfileRegionProvider(String profileName, AwsProfileFileLocationProvider locationProvider,
+-                             BasicProfileConfigLoader configLoader) {
+-        this.profileName = profileName;
+-        this.locationProvider = locationProvider;
+-        this.profileConfigLoader = configLoader;
+-    }
+-
+-    @Override
+-    public String getRegion() throws SdkClientException {
+-        File configFile = locationProvider.getLocation();
+-        if (configFile != null && configFile.exists()) {
+-            BasicProfile profile = loadProfile(configFile);
+-            if (profile != null && !StringUtils.isNullOrEmpty(profile.getRegion())) {
+-                return profile.getRegion();
+-            }
+-        }
+-        return null;
+-    }
+-
+-    private BasicProfile loadProfile(File configFile) {
+-        final AllProfiles allProfiles = profileConfigLoader.loadProfiles(configFile);
+-        return allProfiles.getProfile(profileName);
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/regions/AwsRegionProviderChain.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/AwsRegionProviderChain.java
+--- ./src/main/java/com/amazonaws/regions/AwsRegionProviderChain.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/AwsRegionProviderChain.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,61 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.regions;
+-
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.auth.AWSCredentialsProviderChain;
+-
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.List;
+-
+-/**
+- * Composite {@link AwsRegionProvider} that sequentially delegates to a chain of providers looking
+- * for region information.
+- */
+-public class AwsRegionProviderChain extends AwsRegionProvider {
+-
+-    private static final Log LOG = LogFactory.getLog(AWSCredentialsProviderChain.class);
+-
+-    private final List providers;
+-
+-    public AwsRegionProviderChain(AwsRegionProvider... providers) {
+-        this.providers = new ArrayList(providers.length);
+-        Collections.addAll(this.providers, providers);
+-    }
+-
+-    @Override
+-    public String getRegion() throws SdkClientException {
+-        for (AwsRegionProvider provider : providers) {
+-            try {
+-                final String region = provider.getRegion();
+-                if (region != null) {
+-                    return region;
+-                }
+-            } catch (Exception e) {
+-                // Ignore any exceptions and move onto the next provider
+-                LOG.debug("Unable to load region from " + provider.toString() +
+-                          ": " + e.getMessage());
+-            }
+-        }
+-        // Note: This is a bug in the provider chain. The chain should return null when no region is found according to
+-        // the interface, but an exception is thrown  here instead. This class is used in too many places to change now.
+-        // TODO: In 2.0, be sure this bug does not carry through.
+-        throw new SdkClientException("Unable to load region information from any provider in the chain");
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/regions/AwsRegionProvider.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/AwsRegionProvider.java
+--- ./src/main/java/com/amazonaws/regions/AwsRegionProvider.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/AwsRegionProvider.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,30 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.regions;
+-
+-import com.amazonaws.SdkClientException;
+-
+-/**
+- * Interface for providing AWS region information. Implementations are free to use any strategy for
+- * providing region information.
+- */
+-public abstract class AwsRegionProvider {
+-
+-    /**
+-     * @return Region name to use or null if region information is not available.
+-     */
+-    public abstract String getRegion() throws SdkClientException;
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/regions/AwsSystemPropertyRegionProvider.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/AwsSystemPropertyRegionProvider.java
+--- ./src/main/java/com/amazonaws/regions/AwsSystemPropertyRegionProvider.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/AwsSystemPropertyRegionProvider.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,30 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.regions;
+-
+-import com.amazonaws.SDKGlobalConfiguration;
+-import com.amazonaws.SdkClientException;
+-
+-/**
+- * Loads region information from the '{@value com.amazonaws.SDKGlobalConfiguration#AWS_REGION_SYSTEM_PROPERTY}' JVM system
+- * property.
+- */
+-public class AwsSystemPropertyRegionProvider extends AwsRegionProvider {
+-
+-    @Override
+-    public String getRegion() throws SdkClientException {
+-        return System.getProperty(SDKGlobalConfiguration.AWS_REGION_SYSTEM_PROPERTY);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/regions/DefaultAwsRegionProviderChain.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/DefaultAwsRegionProviderChain.java
+--- ./src/main/java/com/amazonaws/regions/DefaultAwsRegionProviderChain.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/DefaultAwsRegionProviderChain.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,28 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.regions;
+-
+-/**
+- * Default region provider chain used when no explicit region is supplied to a client builder.
+- */
+-public class DefaultAwsRegionProviderChain extends AwsRegionProviderChain {
+-
+-    public DefaultAwsRegionProviderChain() {
+-        super(new AwsEnvVarOverrideRegionProvider(),
+-              new AwsSystemPropertyRegionProvider(),
+-              new AwsProfileRegionProvider(),
+-              new InstanceMetadataRegionProvider());
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/regions/InMemoryRegionImpl.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/InMemoryRegionImpl.java
+--- ./src/main/java/com/amazonaws/regions/InMemoryRegionImpl.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/InMemoryRegionImpl.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,107 +0,0 @@
+-/*
+- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.regions;
+-
+-import com.amazonaws.util.ValidationUtils;
+-
+-import java.util.ArrayList;
+-import java.util.Collection;
+-import java.util.Collections;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-
+-/**
+- * An implementation of {@link RegionImpl} that holds all information in memory.
+- */
+-public class InMemoryRegionImpl implements RegionImpl {
+-
+-    private static final String DEFAULT_DOMAIN = "amazonaws.com";
+-
+-    private final String name;
+-
+-    private final String domain;
+-
+-    private final Map endpoints = new HashMap();
+-
+-    private final List https = new ArrayList();
+-
+-    private final List http = new ArrayList();
+-
+-    public InMemoryRegionImpl(String name, String domain) {
+-        ValidationUtils.assertNotNull(name, "region name");
+-        this.name = name;
+-        this.domain = domain == null ? DEFAULT_DOMAIN : domain;
+-    }
+-
+-    public InMemoryRegionImpl addEndpoint(String serviceName, String endpoint) {
+-        ValidationUtils.assertNotNull(serviceName, "service name");
+-        ValidationUtils.assertNotNull(endpoint, "endpoint");
+-
+-        endpoints.put(serviceName, endpoint);
+-        return this;
+-    }
+-
+-    public InMemoryRegionImpl addHttps(String serviceName) {
+-        https.add(serviceName);
+-        return this;
+-    }
+-
+-    public InMemoryRegionImpl addHttp(String serviceName) {
+-        http.add(serviceName);
+-        return this;
+-    }
+-
+-    @Override
+-    public String getName() {
+-        return name;
+-    }
+-
+-    @Override
+-    public String getDomain() {
+-        return domain;
+-    }
+-
+-    @Override
+-    public String getPartition() {
+-        throw new UnsupportedOperationException("Partition is not available in the in memory implementation");
+-    }
+-
+-    @Override
+-    public boolean isServiceSupported(String serviceName) {
+-        return endpoints.containsKey(serviceName);
+-    }
+-
+-    @Override
+-    public String getServiceEndpoint(String serviceName) {
+-        return endpoints.get(serviceName);
+-    }
+-
+-    @Override
+-    public boolean hasHttpsEndpoint(String serviceName) {
+-        return https.contains(serviceName);
+-    }
+-
+-    @Override
+-    public boolean hasHttpEndpoint(String serviceName) {
+-        return http.contains(serviceName);
+-    }
+-
+-    @Override
+-    public Collection getAvailableEndpoints() {
+-        return Collections.unmodifiableCollection(endpoints.values());
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/regions/InMemoryRegionsProvider.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/InMemoryRegionsProvider.java
+--- ./src/main/java/com/amazonaws/regions/InMemoryRegionsProvider.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/InMemoryRegionsProvider.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,73 +0,0 @@
+-/*
+- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.regions;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.util.ValidationUtils;
+-
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.LinkedList;
+-import java.util.List;
+-
+-/**
+- * Region metadata provider that holds all data in memory and returns data
+- * from them.
+- */
+-@SdkInternalApi
+-public class InMemoryRegionsProvider extends AbstractRegionMetadataProvider {
+-
+-    /** list of regions. */
+-    private final List regions;
+-
+-    public InMemoryRegionsProvider(List regions) {
+-        ValidationUtils.assertNotNull(regions, "regions");
+-        this.regions = Collections.unmodifiableList(new ArrayList
+-                (regions));
+-    }
+-
+-    @Override
+-    public List getRegions() {
+-        return Collections.unmodifiableList(new ArrayList(regions));
+-    }
+-
+-    @Override
+-    public Region getRegion(String regionName) {
+-        for (Region region : regions) {
+-            if (region.getName().equals(regionName)) {
+-                return region;
+-            }
+-        }
+-        return null;
+-    }
+-
+-    @Override
+-    public List getRegionsForService(String serviceName) {
+-        final List results = new LinkedList();
+-
+-        for (Region region : regions) {
+-            if (region.isServiceSupported(serviceName)) {
+-                results.add(region);
+-            }
+-        }
+-
+-        return results;
+-    }
+-
+-    @Override
+-    public String toString() {
+-        return regions.toString();
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/regions/InstanceMetadataRegionProvider.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/InstanceMetadataRegionProvider.java
+--- ./src/main/java/com/amazonaws/regions/InstanceMetadataRegionProvider.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/InstanceMetadataRegionProvider.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,65 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.regions;
+-
+-import com.amazonaws.AmazonClientException;
+-import com.amazonaws.SDKGlobalConfiguration;
+-import com.amazonaws.util.EC2MetadataUtils;
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-
+-/**
+- * Attempts to load region information from the EC2 Metadata service. If the application is not
+- * running on EC2 or {@link SDKGlobalConfiguration#isEc2MetadataDisabled()} returns true,
+- * this provider will return null.
+- */
+-public class InstanceMetadataRegionProvider extends AwsRegionProvider {
+-
+-    private static final Log LOG = LogFactory.getLog(InstanceMetadataRegionProvider.class);
+-
+-    /**
+-     * Cache region as it will not change during the lifetime of the JVM.
+-     */
+-    private volatile String region;
+-
+-    /**
+-     * @throws AmazonClientException if {@link SDKGlobalConfiguration#isEc2MetadataDisabled()} is true
+-     */
+-    @Override
+-    public String getRegion() {
+-        if (SDKGlobalConfiguration.isEc2MetadataDisabled()) {
+-            throw new AmazonClientException("AWS_EC2_METADATA_DISABLED is set to true, not loading region from EC2 Instance "
+-                                         + "Metadata service");
+-        }
+-
+-        if (region == null) {
+-            synchronized (this) {
+-                if (region == null) {
+-                    this.region = tryDetectRegion();
+-                }
+-            }
+-        }
+-        return region;
+-    }
+-
+-    private String tryDetectRegion() {
+-        try {
+-            return EC2MetadataUtils.getEC2InstanceRegion();
+-        } catch (AmazonClientException sce) {
+-            LOG.debug("Ignoring failure to retrieve the region: " + sce.getMessage());
+-            return null;
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/regions/LegacyRegionXmlLoadUtils.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/LegacyRegionXmlLoadUtils.java
+--- ./src/main/java/com/amazonaws/regions/LegacyRegionXmlLoadUtils.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/LegacyRegionXmlLoadUtils.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,117 +0,0 @@
+-/*
+- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.regions;
+-
+-import com.amazonaws.ClientConfiguration;
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.util.RuntimeHttpUtils;
+-
+-import java.io.BufferedInputStream;
+-import java.io.File;
+-import java.io.FileInputStream;
+-import java.io.FileNotFoundException;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.net.URI;
+-
+-@Deprecated
+-@SdkInternalApi
+-public class LegacyRegionXmlLoadUtils {
+-
+-    /**
+-     * Loads a set of region metadata by downloading an XML file from the
+-     * given URI and parsing it.
+-     *
+-     * @param uri    the uri of the XML file to parse
+-     * @param config configuration for the HTTP client to use to fetch the file
+-     * @throws IOException any error while reading data.
+-     */
+-    public static RegionMetadata load
+-    (final URI uri, final ClientConfiguration config) throws
+-            IOException {
+-
+-        return RegionMetadataParser.parse(
+-                RuntimeHttpUtils.fetchFile(uri, config));
+-    }
+-
+-    /**
+-     * Loads a set of region metadata by parsing the given file.
+-     *
+-     * @param file the region metadata to load from
+-     * @throws IOException any error while reading from file.
+-     */
+-    public static RegionMetadata load
+-    (final File file) throws IOException {
+-        return RegionMetadataParser.parse(new BufferedInputStream(new
+-                FileInputStream(file)));
+-    }
+-
+-    /**
+-     * Loads a set of region metadata from an arbitrary {@code InputStream}
+-     * containing an XML file.
+-     *
+-     * @param stream the stream to load from
+-     * @return the loaded region metadata
+-     * @throws IOException on error reading from the stream
+-     */
+-    public static RegionMetadata load
+-    (final InputStream stream) throws IOException {
+-
+-        return RegionMetadataParser.parse(stream);
+-    }
+-
+-    /**
+-     * Loads a set of region metadata from an XML file stored as a resource of
+-     * the classloader used to load the given class.
+-     *
+-     * @param clazz the class to use as a base for the resource
+-     * @param name  the path to the resource, relative to the given class
+-     * @return the parsed region metadata
+-     * @throws IOException if the resource is not found or cannot be parsed
+-     */
+-    public static RegionMetadata load(
+-            final Class clazz,
+-            final String name) throws IOException {
+-
+-        InputStream stream = clazz.getResourceAsStream(name);
+-        if (stream == null) {
+-            throw new FileNotFoundException(
+-                    "No resource '" + name + "' found.");
+-        }
+-
+-        return load(stream);
+-    }
+-
+-    /**
+-     * Loads a set of region metadata from an XML file stored as a resource
+-     * of the given classloader.
+-     *
+-     * @param classLoader the class loader to load the resource from
+-     * @param name        the path to the resource
+-     * @return the parsed region metadata
+-     * @throws IOException if the resource is not found or cannot be parsed
+-     */
+-    public static RegionMetadata load(
+-            final ClassLoader classLoader,
+-            final String name) throws IOException {
+-
+-        InputStream stream = classLoader.getResourceAsStream(name);
+-        if (stream == null) {
+-            throw new FileNotFoundException(
+-                    "No resource '" + name + "' found.");
+-        }
+-        return load(stream);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/regions/LegacyRegionXmlMetadataBuilder.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/LegacyRegionXmlMetadataBuilder.java
+--- ./src/main/java/com/amazonaws/regions/LegacyRegionXmlMetadataBuilder.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/LegacyRegionXmlMetadataBuilder.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,107 +0,0 @@
+-/*
+- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.regions;
+-
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.SDKGlobalConfiguration;
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.internal.config.Builder;
+-import com.amazonaws.util.IOUtils;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-
+-/**
+- * A region metadata builder that loads the data by looking at all the
+- * legacy metadata locations.
+- */
+-@SdkInternalApi
+-public class LegacyRegionXmlMetadataBuilder implements Builder {
+-
+-    private static final String REGIONS_FILE_OVERRIDE =
+-            SDKGlobalConfiguration.REGIONS_FILE_OVERRIDE_SYSTEM_PROPERTY;
+-
+-    private static final String OVERRIDE_ENDPOINTS_RESOURCE_PATH =
+-            "/com/amazonaws/regions/override/regions.xml";
+-
+-    private static final Log LOG = LogFactory.getLog(LegacyRegionXmlMetadataBuilder.class);
+-
+-    @Override
+-    public RegionMetadata build() {
+-        return loadOverrideMetadataIfExists();
+-    }
+-
+-    private RegionMetadata loadOverrideMetadataIfExists() {
+-        RegionMetadata metadata = loadFromSystemProperty();
+-
+-        if (metadata == null) {
+-            InputStream override = RegionUtils.class
+-                    .getResourceAsStream(OVERRIDE_ENDPOINTS_RESOURCE_PATH);
+-            if (override != null) {
+-                metadata = loadFromStream(override);
+-                IOUtils.closeQuietly(override, LOG);
+-            }
+-        }
+-
+-        return metadata;
+-    }
+-
+-    /**
+-     * Loads region metadata from file location specified in
+-     * {@link #REGIONS_FILE_OVERRIDE} property.
+-     * Returns null if no such property exists.
+-     *
+-     * @throws SdkClientException if any error occurs while loading the
+-     *                               metadata file.
+-     */
+-    private RegionMetadata loadFromSystemProperty() {
+-        final String overrideFilePath = System.getProperty
+-                (REGIONS_FILE_OVERRIDE);
+-
+-        if (overrideFilePath != null) {
+-            try {
+-                return LegacyRegionXmlLoadUtils.load(new File
+-                        (overrideFilePath));
+-            } catch (IOException exception) {
+-                throw new SdkClientException(
+-                        "Error parsing region metadata from " + overrideFilePath,
+-                        exception);
+-            }
+-        }
+-        return null;
+-    }
+-
+-    /**
+-     * Loads region metadata from file location specified in
+-     * {@link #REGIONS_FILE_OVERRIDE} property.
+-     * Returns null if no such property exists.
+-     *
+-     * @throws SdkClientException if any error occurs while loading the
+-     *                               metadata file.
+-     */
+-    private RegionMetadata loadFromStream(final InputStream stream) {
+-        try {
+-            return LegacyRegionXmlLoadUtils.load(stream);
+-        } catch (IOException exception) {
+-            throw new SdkClientException(
+-                    "Error parsing region metadata from input stream",
+-                    exception);
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/regions/RegionImpl.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/RegionImpl.java
+--- ./src/main/java/com/amazonaws/regions/RegionImpl.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/RegionImpl.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,95 +0,0 @@
+-/*
+- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.regions;
+-
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-
+-import java.util.Collection;
+-
+-/**
+- * Interface for an region implementation.
+- */
+-@SdkInternalApi
+-public interface RegionImpl {
+-
+-    /**
+-     * The unique system ID for this region; ex: "us-east-1".
+-     *
+-     * @return The unique system ID for this region.
+-     */
+-    String getName();
+-
+-    /**
+-     * Returns the domain for this region; ex: "amazonaws.com".
+-     *
+-     * @return The domain for this region.
+-     */
+-    String getDomain();
+-
+-    /**
+-     * Returns the partition this region is in. I.E. 'aws' or 'aws-cn'
+-     *
+-     * @return The partition this region is in.
+-     */
+-    String getPartition();
+-
+-    /**
+-     * Returns whether the given service is supported in this region.
+-     *
+-     * @param serviceName
+-     *         The service endpoint prefix which can be retrieved from the
+-     *         constant ENDPOINT_PREFIX of the specific service client interface,
+-     *         e.g. AmazonEC2.ENDPOINT_PREFIX.
+-     */
+-    boolean isServiceSupported(String serviceName);
+-
+-    /**
+-     * Returns the endpoint for the service given.
+-     *
+-     * @param serviceName
+-     *         The service endpoint prefix which can be retrieved from the
+-     *         constant ENDPOINT_PREFIX of the specific service client interface,
+-     *         e.g. AmazonEC2.ENDPOINT_PREFIX.
+-     */
+-    String getServiceEndpoint(String serviceName);
+-
+-    /**
+-     * Returns whether the given service support the https protocol in this region.
+-     *
+-     * @param serviceName
+-     *         The service endpoint prefix which can be retrieved from the
+-     *         constant ENDPOINT_PREFIX of the specific service client interface,
+-     *         e.g. AmazonEC2.ENDPOINT_PREFIX.
+-     */
+-    boolean hasHttpEndpoint(String serviceName);
+-
+-    /**
+-     * Returns whether the given service support the http protocol in this region.
+-     *
+-     * @param serviceName
+-     *         The service endpoint prefix which can be retrieved from the
+-     *         constant ENDPOINT_PREFIX of the specific service client interface,
+-     *         e.g. AmazonEC2.ENDPOINT_PREFIX.
+-     */
+-    boolean hasHttpsEndpoint(String serviceName);
+-
+-    /**
+-     * Returns an immutable collection of all the endpoints available in the
+-     * region
+-     * metadata.
+-     */
+-    Collection getAvailableEndpoints();
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/regions/Region.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/Region.java
+--- ./src/main/java/com/amazonaws/regions/Region.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/Region.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,189 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.regions;
+-
+-import com.amazonaws.AmazonWebServiceClient;
+-import com.amazonaws.ClientConfiguration;
+-import com.amazonaws.auth.AWSCredentialsProvider;
+-import com.amazonaws.util.ValidationUtils;
+-
+-import java.lang.reflect.Constructor;
+-import java.util.Collection;
+-
+-/**
+- * Metadata for an AWS region, including its name and what services
+- * are available in it.
+- */
+-public class Region {
+-
+-    private final RegionImpl regionImpl;
+-
+-    public Region(RegionImpl regionImpl) {
+-        ValidationUtils.assertNotNull(regionImpl, "region implementation");
+-        this.regionImpl = regionImpl;
+-    }
+-
+-    /**
+-     * Returns the region with the id given, or null if it cannot be found in
+-     * the current regions.xml file.
+-     */
+-    public static Region getRegion(Regions region) {
+-        return RegionUtils.getRegion(region.getName());
+-    }
+-
+-    /**
+-     * The unique system ID for this region; ex: "us-east-1".
+-     *
+-     * @return The unique system ID for this region.
+-     */
+-    public String getName() {
+-        return regionImpl.getName();
+-    }
+-
+-    /**
+-     * Returns the domain for this region; ex: "amazonaws.com".
+-     *
+-     * @return The domain for this region.
+-     */
+-    public String getDomain() {
+-        return regionImpl.getDomain();
+-    }
+-
+-    /**
+-     * Returns the partition this region is in. I.E. 'aws' or 'aws-cn'
+-     *
+-     * @return The partition this region is in.
+-     */
+-    public String getPartition() {
+-        return regionImpl.getPartition();
+-    }
+-
+-    /**
+-     * Returns the endpoint for the service given.
+-     *
+-     * @param endpointPrefix
+-     *         The service endpoint prefix which can be retrieved from the
+-     *         constant ENDPOINT_PREFIX of the specific service client interface,
+-     *         e.g. AmazonEC2.ENDPOINT_PREFIX.
+-     */
+-    public String getServiceEndpoint(String endpointPrefix) {
+-        return regionImpl.getServiceEndpoint(endpointPrefix);
+-    }
+-
+-    /**
+-     * Returns whether the given service is supported in this region.
+-     *
+-     * @param serviceName
+-     *         The service endpoint prefix which can be retrieved from the
+-     *         constant ENDPOINT_PREFIX of the specific service client interface,
+-     *         e.g. AmazonEC2.ENDPOINT_PREFIX.
+-     */
+-    public boolean isServiceSupported(String serviceName) {
+-        return regionImpl.isServiceSupported(serviceName);
+-    }
+-
+-    /**
+-     * Returns whether the given service support the https protocol in this region.
+-     *
+-     * @param serviceName
+-     *         The service endpoint prefix which can be retrieved from the
+-     *         constant ENDPOINT_PREFIX of the specific service client interface,
+-     *         e.g. AmazonEC2.ENDPOINT_PREFIX.
+-     */
+-    public boolean hasHttpsEndpoint(String serviceName) {
+-        return regionImpl.hasHttpsEndpoint(serviceName);
+-    }
+-
+-    /**
+-     * Returns whether the given service support the http protocol in this region.
+-     *
+-     * @param serviceName
+-     *         The service endpoint prefix which can be retrieved from the
+-     *         constant ENDPOINT_PREFIX of the specific service client interface,
+-     *         e.g. AmazonEC2.ENDPOINT_PREFIX.
+-     */
+-    public boolean hasHttpEndpoint(String serviceName) {
+-        return regionImpl.hasHttpEndpoint(serviceName);
+-    }
+-
+-    /**
+-     * Returns a immutable collection of all endpoints available in the
+-     * metadata.
+-     */
+-    public Collection getAvailableEndpoints() {
+-        return regionImpl.getAvailableEndpoints();
+-    }
+-
+-    /**
+-     * Creates a new service client of the class given and configures it. If
+-     * credentials or config are null, defaults will be used.
+-     *
+-     * @param serviceClass The service client class to instantiate, e.g. AmazonS3Client.class
+-     * @param credentials  The credentials provider to use, or null for the default
+-     *                     credentials provider
+-     * @param config       The configuration to use, or null for the default
+-     *                     configuration
+-     * @deprecated use appropriate {@link com.amazonaws.client.builder.AwsClientBuilder} implementation
+-     *             for the service being constructed. For example:
+-     *             {@code AmazonSNSClientBuilder.standard().withRegion(region).build();}
+-     */
+-    @Deprecated
+-    public  T createClient(Class serviceClass,
+-                                                             AWSCredentialsProvider credentials,
+-                                                             ClientConfiguration config) {
+-        Constructor constructor;
+-        T client;
+-        try {
+-            if (credentials == null && config == null) {
+-                constructor = serviceClass.getConstructor();
+-                client = constructor.newInstance();
+-            } else if (credentials == null) {
+-                constructor = serviceClass.getConstructor(ClientConfiguration.class);
+-                client = constructor.newInstance(config);
+-            } else if (config == null) {
+-                constructor = serviceClass.getConstructor(AWSCredentialsProvider.class);
+-                client = constructor.newInstance(credentials);
+-            } else {
+-                constructor = serviceClass.getConstructor(AWSCredentialsProvider.class, ClientConfiguration.class);
+-                client = constructor.newInstance(credentials, config);
+-            }
+-
+-            client.setRegion(this);
+-            return client;
+-        } catch (Exception e) {
+-            throw new RuntimeException("Couldn't instantiate instance of " + serviceClass, e);
+-        }
+-    }
+-
+-    @Override
+-    public boolean equals(Object obj) {
+-        if (obj instanceof Region == false)
+-            return false;
+-
+-        Region region = (Region) obj;
+-        return this.getName().equals(region.getName());
+-    }
+-
+-    @Override
+-    public int hashCode() {
+-        return getName().hashCode();
+-    }
+-
+-    @Override
+-    public String toString() {
+-        return getName();
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/regions/RegionMetadataFactory.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/RegionMetadataFactory.java
+--- ./src/main/java/com/amazonaws/regions/RegionMetadataFactory.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/RegionMetadataFactory.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,38 +0,0 @@
+-/*
+- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.regions;
+-
+-import com.amazonaws.partitions.PartitionsLoader;
+-
+-/**
+- * A factory to create {@link RegionMetadata}
+- */
+-public class RegionMetadataFactory {
+-
+-    private RegionMetadataFactory() {
+-    }
+-
+-    public static RegionMetadata create() {
+-        RegionMetadata metadata = createLegacyXmlRegionMetadata();
+-        if (metadata == null) {
+-            metadata = new RegionMetadata(new PartitionsLoader().build());
+-        }
+-        return metadata;
+-    }
+-
+-    private static RegionMetadata createLegacyXmlRegionMetadata() {
+-        return new LegacyRegionXmlMetadataBuilder().build();
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/regions/RegionMetadata.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/RegionMetadata.java
+--- ./src/main/java/com/amazonaws/regions/RegionMetadata.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/RegionMetadata.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,99 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.regions;
+-
+-import java.util.List;
+-
+-/**
+- * A collection of metadata about a set of regions and the services they
+- * contain.
+- *
+- * @see RegionUtils
+- */
+-public class RegionMetadata {
+-
+-    private final RegionMetadataProvider provider;
+-
+-    /**
+-     * Creates a new RegionMetadata object from the given list of regions.
+-     *
+-     * @param regions the list of regions
+-     */
+-    public RegionMetadata(final List regions) {
+-        this.provider = new InMemoryRegionsProvider(regions);
+-    }
+-
+-    public RegionMetadata(RegionMetadataProvider provider) {
+-        this.provider = provider;
+-    }
+-
+-    /**
+-     * Returns an immutable list of all regions known to this region metadata
+-     * object, in no particular order.
+-     *
+-     * @return an immutable list of all regions
+-     */
+-    public List getRegions() {
+-        return provider.getRegions();
+-    }
+-
+-    /**
+-     * Returns the region with the name given, if it exists. Otherwise, returns
+-     * null.
+-     *
+-     * @param name the name of the region to search for
+-     * @return the corresponding region, if it exists
+-     */
+-    public Region getRegion(final String name) {
+-        return provider.getRegion(name);
+-    }
+-
+-    /**
+-     * Returns a list of the regions that support the service given.
+-     *
+-     * @param service
+-     *         The service endpoint prefix which can be retrieved from the
+-     *         constant ENDPOINT_PREFIX of the specific service client interface,
+-     *         e.g. AmazonEC2.ENDPOINT_PREFIX.
+-     * @return the list of regions with support for the given service
+-     */
+-    public List getRegionsForService(final String service) {
+-        return provider.getRegionsForService(service);
+-    }
+-
+-    /**
+-     * Searches through all known regions to find one with any service at the
+-     * specified endpoint. If no region is found with a service at that
+-     * endpoint, an exception is thrown.
+-     *
+-     * @param endpoint The endpoint for any service residing in the desired region.
+-     * @return The region containing any service running at the specified
+-     * endpoint, otherwise an exception is thrown if no region is found
+-     * with a service at the specified endpoint.
+-     * @throws IllegalArgumentException If the given URL is malformed, or if the one of the service
+-     *                                  URLs on record is malformed.
+-     * @deprecated sdk no longer holds the complete endpoint for every service in the region.
+-     * It now uses the partition metadata to compute the endpoints dynamically for new regions and services.
+-     */
+-    @Deprecated
+-    public Region getRegionByEndpoint(final String endpoint) {
+-        return provider.getRegionByEndpoint(endpoint);
+-    }
+-
+-    @Override
+-    public String toString() {
+-        return provider.toString();
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/regions/RegionMetadataParser.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/RegionMetadataParser.java
+--- ./src/main/java/com/amazonaws/regions/RegionMetadataParser.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/RegionMetadataParser.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,211 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.regions;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-import javax.xml.parsers.DocumentBuilder;
+-import javax.xml.parsers.DocumentBuilderFactory;
+-
+-import org.w3c.dom.Document;
+-import org.w3c.dom.Element;
+-import org.w3c.dom.Node;
+-import org.w3c.dom.NodeList;
+-
+-
+-/**
+- * Parses a region metadata file to pull out information about the
+- * available regions, names, IDs, and what service endpoints are available
+- * in each region.
+- */
+-public class RegionMetadataParser {
+-
+-    private static final String REGION_TAG = "Region";
+-    private static final String REGION_ID_TAG = "Name";
+-    private static final String DOMAIN_TAG = "Domain";
+-    private static final String ENDPOINT_TAG = "Endpoint";
+-    private static final String SERVICE_TAG = "ServiceName";
+-    private static final String HTTP_TAG = "Http";
+-    private static final String HTTPS_TAG = "Https";
+-    private static final String HOSTNAME_TAG = "Hostname";
+-
+-    /**
+-     * Parses the specified input stream and returns a {@code RegionMetadata}
+-     * object.
+-     *
+-     * @param input the input stream to parse
+-     * @return the parsed region metadata
+-     * @throws IOException on error
+-     */
+-    public static RegionMetadata parse(final InputStream input)
+-            throws IOException {
+-
+-        return new RegionMetadata(internalParse(input, false));
+-    }
+-
+-    /**
+-     * @deprecated since this object is stateless
+-     */
+-    @Deprecated
+-    public RegionMetadataParser() {
+-    }
+-    
+-    /**
+-     * Parses the specified input stream and returns a list of the regions
+-     * declared in it. By default, verification on the region endpoints is
+-     * disabled.
+-     * 
+-     * @param input
+-     *            The stream containing the region metadata to parse.
+-     * 
+-     * @return The list of parsed regions.
+-     * @deprecated in favor of {@link #parse(InputStream)}
+-     */
+-    @Deprecated
+-    public List parseRegionMetadata(InputStream input)
+-            throws IOException {
+-
+-        return internalParse(input, false);
+-    }
+-
+-    /**
+-     * Parses the specified input stream and optionally verifies that all of
+-     * the endpoints end in ".amazonaws.com". This method is deprecated, since
+-     * not all valid AWS endpoints end in ".amazonaws.com" any more.
+-     * 
+-     * @param input
+-     *            The stream containing the region metadata to parse.
+-     * @param endpointVerification
+-     *            Whether to verify each region endpoint
+-     * 
+-     * @return The list of parsed regions.
+-     * @deprecated in favor of {@link #parse(InputStream)}
+-     */
+-    @Deprecated
+-    public List parseRegionMetadata(final InputStream input,
+-                                            final boolean endpointVerification)
+-            throws IOException {
+-
+-        return internalParse(input, endpointVerification);
+-    }
+-
+-    private static List internalParse(
+-            final InputStream input,
+-            final boolean endpointVerification) throws IOException {
+-
+-        Document document;
+-        try {
+-
+-            DocumentBuilderFactory factory =
+-                DocumentBuilderFactory.newInstance();
+-
+-            DocumentBuilder documentBuilder = factory.newDocumentBuilder();
+-            document = documentBuilder.parse(input);
+-
+-        } catch (IOException exception) {
+-            throw exception;
+-        } catch (Exception exception) {
+-            throw new IOException("Unable to parse region metadata file: "
+-                                  + exception.getMessage(),
+-                                  exception);
+-        } finally {
+-            try {
+-                input.close();
+-            } catch (IOException exception) {
+-            }
+-        }
+-        
+-        NodeList regionNodes = document.getElementsByTagName(REGION_TAG);
+-        List regions = new ArrayList();
+-        for (int i = 0; i < regionNodes.getLength(); i++) {
+-            Node node = regionNodes.item(i);
+-            if (node.getNodeType() == Node.ELEMENT_NODE) {
+-                Element element = (Element)node;
+-                regions.add(parseRegionElement(element, endpointVerification));
+-            }
+-        }
+-        
+-        return regions;
+-    }
+-
+-    private static Region parseRegionElement(
+-            final Element regionElement,
+-            final boolean endpointVerification) {
+-
+-        String name = getChildElementValue(REGION_ID_TAG, regionElement);
+-        String domain = getChildElementValue(DOMAIN_TAG, regionElement);
+-
+-        InMemoryRegionImpl regionImpl = new InMemoryRegionImpl(name, domain);
+-
+-        NodeList endpointNodes =
+-            regionElement.getElementsByTagName(ENDPOINT_TAG);
+-
+-        for (int i = 0; i < endpointNodes.getLength(); i++) {
+-            addRegionEndpoint(regionImpl,
+-                              (Element) endpointNodes.item(i),
+-                              endpointVerification);
+-        }
+-
+-        return new Region(regionImpl);
+-    }
+-    
+-    private static void addRegionEndpoint(
+-            final InMemoryRegionImpl region,
+-            final Element endpointElement,
+-            final boolean endpointVerification) {
+-
+-        String serviceName = getChildElementValue(SERVICE_TAG, endpointElement);
+-        String hostname = getChildElementValue(HOSTNAME_TAG, endpointElement);
+-        String http = getChildElementValue(HTTP_TAG, endpointElement);
+-        String https = getChildElementValue(HTTPS_TAG, endpointElement);
+-
+-        if ( endpointVerification && !verifyLegacyEndpoint(hostname) ) {
+-            throw new IllegalStateException("Invalid service endpoint ("
+-                                            + hostname + ") is detected.");
+-        }
+-
+-        region.addEndpoint(serviceName, hostname);
+-        if (Boolean.valueOf(http)) {
+-            region.addHttp(serviceName);
+-        }
+-        if (Boolean.valueOf(https)) {
+-            region.addHttps(serviceName);
+-        }
+-    }
+-
+-    private static String getChildElementValue(
+-            final String tagName,
+-            final Element element) {
+-
+-        Node tagNode = element.getElementsByTagName(tagName).item(0);
+-        if ( tagNode == null )
+-            return null;
+-        NodeList nodes= tagNode.getChildNodes();
+-        Node node = (Node)nodes.item(0); 
+-     
+-        return node.getNodeValue();    
+-    }
+-
+-    /**
+-     * Returns whether the provided endpoint is a "valid" AWS service endpoint
+-     * ending in ".amazonaws.com".
+-     */
+-    private static boolean verifyLegacyEndpoint(String endpoint) {
+-        return endpoint.endsWith(".amazonaws.com");
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/regions/RegionMetadataProvider.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/RegionMetadataProvider.java
+--- ./src/main/java/com/amazonaws/regions/RegionMetadataProvider.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/RegionMetadataProvider.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,69 +0,0 @@
+-/*
+- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.regions;
+-
+-import com.amazonaws.annotation.SdkInternalApi;
+-
+-import java.util.List;
+-
+-@SdkInternalApi
+-public interface RegionMetadataProvider {
+-
+-    /**
+-     * Returns an immutable list of all regions known to this region metadata
+-     * object, in no particular order.
+-     *
+-     * @return an immutable list of all regions
+-     */
+-    List getRegions();
+-
+-    /**
+-     * Returns the region with the name given, if it exists in the metadata
+-     * or if it can be derived from the metadata.
+-     * Otherwise, returns null.
+-     *
+-     * @param regionName the name of the region to search for
+-     * @return the corresponding region, if it exists or derived.
+-     */
+-    Region getRegion(final String regionName);
+-
+-    /**
+-     * Returns a list of the regions that support the service given.
+-     *
+-     * @param serviceName
+-     *         The service endpoint prefix which can be retrieved from the
+-     *         constant ENDPOINT_PREFIX of the specific service client interface,
+-     *         e.g. AmazonEC2.ENDPOINT_PREFIX.
+-     * @return the list of regions with support for the given service
+-     */
+-    List getRegionsForService(final String serviceName);
+-
+-    /**
+-     * Searches through all known regions to find one with any service at the
+-     * specified endpoint. If no region is found with a service at that
+-     * endpoint, an exception is thrown.
+-     *
+-     * @param endpoint The endpoint for any service residing in the desired region.
+-     * @return The region containing any service running at the specified
+-     * endpoint, otherwise an exception is thrown if no region is found
+-     * with a service at the specified endpoint.
+-     * @throws IllegalArgumentException If the given URL is malformed, or if the one of the service
+-     *                                  URLs on record is malformed.
+-     * @deprecated sdk no longer holds the complete endpoint for every service in the region.
+-     * It now uses the partition metadata to compute the endpoints dynamically for new regions and services.
+-     */
+-    @Deprecated
+-    Region getRegionByEndpoint(final String endpoint);
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/regions/Regions.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/Regions.java
+--- ./src/main/java/com/amazonaws/regions/Regions.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/Regions.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,98 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon Technologies, Inc.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at:
+- *
+- *    http://aws.amazon.com/apache2.0
+- *
+- * This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+- * OR CONDITIONS OF ANY KIND, either express or implied. See the
+- * License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package com.amazonaws.regions;
+-
+-import com.amazonaws.AmazonClientException;
+-import org.apache.commons.logging.LogFactory;
+-
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.util.EC2MetadataUtils;
+-
+-/**
+- * Enumeration of region names
+- */
+-public enum Regions {
+-
+-    GovCloud("us-gov-west-1"),
+-    US_EAST_1("us-east-1"),
+-    US_EAST_2("us-east-2"),
+-    US_WEST_1("us-west-1"),
+-    US_WEST_2("us-west-2"),
+-    EU_WEST_1("eu-west-1"),
+-    EU_WEST_2("eu-west-2"),
+-    EU_WEST_3("eu-west-3"),
+-    EU_CENTRAL_1("eu-central-1"),
+-    AP_SOUTH_1("ap-south-1"),
+-    AP_SOUTHEAST_1("ap-southeast-1"),
+-    AP_SOUTHEAST_2("ap-southeast-2"),
+-    AP_NORTHEAST_1("ap-northeast-1"),
+-    AP_NORTHEAST_2("ap-northeast-2"),
+-    SA_EAST_1("sa-east-1"),
+-    CN_NORTH_1("cn-north-1"),
+-    CN_NORTHWEST_1("cn-northwest-1"),
+-    CA_CENTRAL_1("ca-central-1");
+-
+-    /**
+-     * The default region that new customers in the US are encouraged to use
+-     * when using AWS services for the first time.
+-     */
+-    public static final Regions DEFAULT_REGION = US_WEST_2;
+-
+-    private final String name;
+-
+-    private Regions(String name) {
+-        this.name = name;
+-    }
+-
+-    /**
+-     * The name of this region, used in the regions.xml file to identify it.
+-     */
+-    public String getName() {
+-        return name;
+-    }
+-
+-    /**
+-     * Returns a region enum corresponding to the given region name.
+-     *
+-     * @param regionName
+-     *            The name of the region. Ex.: eu-west-1
+-     * @return Region enum representing the given region name.
+-     */
+-    public static Regions fromName(String regionName) {
+-        for (Regions region : Regions.values()) {
+-            if (region.getName().equals(regionName)) {
+-                return region;
+-            }
+-        }
+-        throw new IllegalArgumentException("Cannot create enum from " + regionName + " value!");
+-    }
+-
+-    /**
+-     * Returns a Region object representing the region the application is
+-     * running in, when running in EC2. If this method is called from a non-EC2
+-     * environment, it will return null.
+-     */
+-    public static Region getCurrentRegion() {
+-        try {
+-            final String region = EC2MetadataUtils.getEC2InstanceRegion();
+-            if (region != null)
+-                return RegionUtils.getRegion(region);
+-        } catch (AmazonClientException e) {
+-            LogFactory.getLog(Regions.class).debug(
+-                "Ignoring failure to retrieve the region: " + e.getMessage());
+-        }
+-        return null;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/regions/RegionUtils.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/RegionUtils.java
+--- ./src/main/java/com/amazonaws/regions/RegionUtils.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/RegionUtils.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,350 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.regions;
+-
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.ClientConfiguration;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.net.URI;
+-import java.util.List;
+-
+-/**
+- * Utilities for working with regions.
+- */
+-public class RegionUtils {
+-
+-    private static volatile RegionMetadata regionMetadata;
+-
+-    /*
+-     * Convenience methods that access the singleton RegionMetadata instance
+-     * maintained by this class, lazily initializing it if need be.
+-     */
+-
+-    /**
+-     * Returns the current set of region metadata for this process,
+-     * initializing it if it has not yet been explicitly initialized before.
+-     *
+-     * @return the current set of region metadata
+-     */
+-    public static RegionMetadata getRegionMetadata() {
+-        RegionMetadata rval = regionMetadata;
+-        if (rval != null) {
+-            return rval;
+-        }
+-
+-        synchronized (RegionUtils.class) {
+-            if (regionMetadata == null) {
+-                initialize();
+-            }
+-        }
+-
+-        return regionMetadata;
+-    }
+-
+-    /**
+-     * Initializes the region metadata by loading from the default hierarchy
+-     * of region metadata locations.
+-     */
+-    public static void initialize() {
+-        regionMetadata = RegionMetadataFactory.create();
+-    }
+-
+-    /**
+-     * Directly sets the singleton {@code RegionMetadata} instance.
+-     *
+-     * @param metadata the new region metadata object
+-     */
+-    public static void initializeWithMetadata(final RegionMetadata metadata) {
+-        if (metadata == null) {
+-            throw new IllegalArgumentException("metadata cannot be null");
+-        }
+-        regionMetadata = metadata;
+-    }
+-
+-    /**
+-     * Returns a list of the available AWS regions.
+-     */
+-    public static List getRegions() {
+-        return getRegionMetadata().getRegions();
+-    }
+-
+-    /**
+-     * Returns a list of the regions that support the service given.
+-     *
+-     * @param serviceAbbreviation
+-     *         The service endpoint prefix which can be retrieved from the
+-     *         constant ENDPOINT_PREFIX of the specific service client interface.
+-     *
+-     */
+-    public static List getRegionsForService(
+-            String serviceAbbreviation) {
+-
+-        return getRegionMetadata().getRegionsForService(serviceAbbreviation);
+-    }
+-
+-    /**
+-     * Returns the region with the id given, if it exists. Otherwise, returns
+-     * null.
+-     */
+-    public static Region getRegion(String regionName) {
+-        return getRegionMetadata().getRegion(regionName);
+-    }
+-
+-    /*
+-     * Methods for loading a RegionMetadata object from various locations.
+-     */
+-
+-    /**
+-     * Loads a set of region metadata by downloading an XML file from the
+-     * given URI and parsing it.
+-     *
+-     * @param uri the uri of the XML file to parse
+-     * @return the parsed region metadata
+-     * @throws IOException on error fetching or parsing the XML file
+-     */
+-    @Deprecated
+-    public static RegionMetadata loadMetadataFromURI(final URI uri)
+-            throws IOException {
+-        return loadMetadataFromURI(uri, null);
+-    }
+-
+-    /**
+-     * Loads a set of region metadata by downloading an XML file from the
+-     * given URI and parsing it.
+-     *
+-     * @param uri    the uri of the XML file to parse
+-     * @param config configuration for the HTTP client to use to fetch the file
+-     * @return the parsed region metadata
+-     * @throws IOException on error fetching or parsing the XML file
+-     */
+-    @Deprecated
+-    public static RegionMetadata loadMetadataFromURI(
+-            final URI uri,
+-            final ClientConfiguration config) throws IOException {
+-        return LegacyRegionXmlLoadUtils.load(uri, config);
+-    }
+-
+-    /**
+-     * Loads a set of region metadata from an XML file on disk.
+-     *
+-     * @param file the file to load from
+-     * @return the loaded region metadata
+-     * @throws IOException on error opening or reading from the file
+-     */
+-    @Deprecated
+-    public static RegionMetadata loadMetadataFromFile(final File file)
+-            throws IOException {
+-        return LegacyRegionXmlLoadUtils.load(file);
+-    }
+-
+-    /**
+-     * Loads a set of region metadata from an XML file stored as a resource
+-     * of the classloader used to load the RegionUtils class.
+-     *
+-     * @param name the path of the resource, relative to the RegionUtils class
+-     * @return the parsed region metadata
+-     * @throws IOException if the resource is not found or cannot be parsed
+-     */
+-    @Deprecated
+-    public static RegionMetadata loadMetadataFromResource(final String name)
+-            throws IOException {
+-
+-        return LegacyRegionXmlLoadUtils.load(RegionUtils
+-                .class, name);
+-    }
+-
+-    /**
+-     * Loads a set of region metadata from an XML file stored as a resource of
+-     * the classloader used to load the given class.
+-     *
+-     * @param clazz the class to use as a base for the resource
+-     * @param name  the path to the resource, relative to the given class
+-     * @return the parsed region metadata
+-     * @throws IOException if the resource is not found or cannot be parsed
+-     */
+-    @Deprecated
+-    public static RegionMetadata loadMetadataFromResource(
+-            final Class clazz,
+-            final String name) throws IOException {
+-
+-        return LegacyRegionXmlLoadUtils.load(clazz, name);
+-    }
+-
+-    /**
+-     * Loads a set of region metadata from an XML file stored as a resource
+-     * of the given classloader.
+-     *
+-     * @param classLoader the class loader to load the resource from
+-     * @param name        the path to the resource
+-     * @return the parsed region metadata
+-     * @throws IOException if the resource is not found or cannot be parsed
+-     */
+-    @Deprecated
+-    public static RegionMetadata loadMetadataFromResource(
+-            final ClassLoader classLoader,
+-            final String name) throws IOException {
+-
+-        return LegacyRegionXmlLoadUtils.load(classLoader,
+-                name);
+-    }
+-
+-    /**
+-     * Loads a set of region metadata from an arbitrary {@code InputStream}
+-     * containing an XML file.
+-     *
+-     * @param stream the stream to load from
+-     * @return the loaded region metadata
+-     * @throws IOException on error reading from the stream
+-     */
+-    @Deprecated
+-    public static RegionMetadata loadMetadataFromInputStream(
+-            final InputStream stream) throws IOException {
+-
+-        return LegacyRegionXmlLoadUtils.load(stream);
+-    }
+-
+-    /*
+-     * Methods for initializing the process-wide singleton RegionMetadata
+-     * instance.
+-     */
+-
+-    /**
+-     * This method no longer attempts to retrieve region metadata from
+-     * CloudFront, as that file is no longer being maintained and the version
+-     * bundled with the SDK is likely to be more up-to-date.
+-     * 

+-     * It's deprecated to signal that it no longer has any possibility of
+-     * retrieving a newer set of metadata than was previously loaded. If you
+-     * are simply wanting to reinitialize from the bundled region metadata,
+-     * call {@code initialize}. If you want to maintain your own remote
+-     * copy of the region metadata and periodically refresh it at runtime,
+-     * call {@code initializeFromURI}.
+-     *
+-     * @deprecated in favor of {@link #initialize()}
+-     */
+-    @Deprecated
+-    public static void init() {
+-        initialize();
+-    }
+-
+-    /**
+-     * Loads a set of region metadata by downloading an XML file from the
+-     * given URI and parsing it.
+-     *
+-     * @param uri the uri of the XML file to parse
+-     * @throws SdkClientException on error
+-     */
+-    @Deprecated
+-    public static synchronized void initializeFromURI(final URI uri) {
+-        initializeFromURI(uri, null);
+-    }
+-
+-    /**
+-     * Loads a set of region metadata by downloading an XML file from the
+-     * given URI and parsing it.
+-     *
+-     * @param uri    the uri of the XML file to parse
+-     * @param config configuration for the HTTP client to use to fetch the file
+-     * @throws SdkClientException on error
+-     */
+-    @Deprecated
+-    public static synchronized void initializeFromURI(
+-            final URI uri,
+-            final ClientConfiguration config) {
+-        try {
+-
+-            regionMetadata = loadMetadataFromURI(uri, config);
+-
+-        } catch (IOException exception) {
+-            throw new SdkClientException(
+-                    "Error parsing region metadata from " + uri,
+-                    exception);
+-        }
+-    }
+-
+-    /**
+-     * Initializes the region metadata singleton from an XML file on disk.
+-     *
+-     * @param file the file to load from
+-     * @throws SdkClientException on error opening or reading from the file
+-     */
+-    @Deprecated
+-    public static synchronized void initializeFromFile(final File file) {
+-        try {
+-            regionMetadata = loadMetadataFromFile(file);
+-        } catch (IOException exception) {
+-            throw new SdkClientException(
+-                    "Error parsing region metadata from " + file,
+-                    exception);
+-        }
+-    }
+-
+-    /**
+-     * Initializes the region metadata singleton from an XML file stored as a
+-     * resource of the classloader used to load the RegionUtils class.
+-     *
+-     * @param name the path of the resource, relative to the RegionUtils class
+-     * @throws SdkClientException on error
+-     */
+-    @Deprecated
+-    public static synchronized void initializeFromResource(final String name) {
+-        initializeFromResource(RegionUtils.class, name);
+-    }
+-
+-    /**
+-     * Initializes the region metadata singleton from the given resource.
+-     *
+-     * @param clazz the class to use as a base for the resource
+-     * @param name  the path to the resource, relative to the given class
+-     * @throws SdkClientException on error
+-     */
+-    @Deprecated
+-    public static synchronized void initializeFromResource(
+-            final Class clazz,
+-            final String name) {
+-
+-        try {
+-            regionMetadata = loadMetadataFromResource(clazz, name);
+-        } catch (IOException exception) {
+-            throw new SdkClientException(
+-                    "Error parsing region metadata from resource " + name,
+-                    exception);
+-        }
+-    }
+-
+-    /**
+-     * Initializes the region metadata singleton from the given resource.
+-     *
+-     * @param classLoader the class loader to use to load the resource
+-     * @param name        the path to the resource
+-     * @throws SdkClientException on error
+-     */
+-    @Deprecated
+-    public static synchronized void initializeFromResource(
+-            final ClassLoader classLoader,
+-            final String name) {
+-
+-        try {
+-            regionMetadata = loadMetadataFromResource(classLoader, name);
+-        } catch (IOException exception) {
+-            throw new SdkClientException(
+-                    "Error parsing region metadata from resource " + name,
+-                    exception);
+-        }
+-    }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/regions/ServiceAbbreviations.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/ServiceAbbreviations.java
+--- ./src/main/java/com/amazonaws/regions/ServiceAbbreviations.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/regions/ServiceAbbreviations.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,86 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon Technologies, Inc.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at:
+- *
+- *    http://aws.amazon.com/apache2.0
+- *
+- * This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+- * OR CONDITIONS OF ANY KIND, either express or implied. See the
+- * License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package com.amazonaws.regions;
+-
+-
+-/**
+- * Abbreviations for looking up information about a specific service. Used in
+- * {@link Region#getServiceEndpoint(String)} and related methods.
+- *
+- * @deprecated use the constant ENDPOINT_PREFIX from the specific service client
+- *             interface instead for retrieving the specific service abbreviation,
+- *             e.g. AmazonEC2.ENDPOINT_PREFIX.
+- */
+-
+-@Deprecated
+-public final class ServiceAbbreviations {
+-    public static final String Autoscaling = "autoscaling";
+-    public static final String CloudFormation = "cloudformation";
+-    public static final String CloudFront = "cloudfront";
+-    public static final String CloudHSM = "cloudhsm";
+-    public static final String CloudSearch = "cloudsearch";
+-    public static final String CloudTrail = "cloudtrail";
+-    public static final String CloudWatch = "monitoring";
+-    public static final String CloudWatchLogs = "logs";
+-    public static final String CodeDeploy = "codedeploy";
+-    public static final String CodeCommit = "codecommit";
+-    public static final String CodePipeline = "codepipeline";
+-    public static final String CognitoIdentity = "cognito-identity";
+-    public static final String CognitoIdentityProvider = "cognito-idp";
+-    public static final String CognitoSync = "cognito-sync";
+-    public static final String Config = "config";
+-    public static final String DeviceFarm = "devicefarm";
+-    public static final String DataPipeline = "datapipeline";
+-    public static final String DirectConnect = "directconnect";
+-    public static final String Directory = "ds";
+-    public static final String DMS = "dms";
+-    public static final String Dynamodb = "dynamodb";
+-    public static final String DynamodbStreams = "streams.dynamodb";
+-    public static final String EC2 = "ec2";
+-    public static final String EC2ContainerService = "ecs";
+-    public static final String EC2SimpleSystemsManager = "ssm";
+-    public static final String Elasticache = "elasticache";
+-    public static final String ElasticBeanstalk = "elasticbeanstalk";
+-    public static final String ElasticFileSystem = "elasticfilesystem";
+-    public static final String ElasticLoadbalancing = "elasticloadbalancing";
+-    public static final String ElasticMapReduce = "elasticmapreduce";
+-    public static final String ElasticTranscoder = "elastictranscoder";
+-    public static final String Email = "email";
+-    public static final String GameLift = "gamelift";
+-    public static final String Glacier = "glacier";
+-    public static final String IAM = "iam";
+-    public static final String IoT = "iot";
+-    public static final String IoTData = "data.iot";
+-    public static final String ImportExport = "importexport";
+-    public static final String KeyManagementService = "kms";
+-    public static final String Kinesis = "kinesis";
+-    public static final String Lambda = "lambda";
+-    public static final String MachineLearning = "machinelearning";
+-    public static final String Opsworks = "opsworks";
+-    public static final String RDS = "rds";
+-    public static final String RedShift = "redshift";
+-    public static final String Route53 = "route53";
+-    public static final String Route53Domains = "route53domains";
+-    public static final String S3 = "s3";
+-    public static final String SimpleDB = "sdb";
+-    public static final String SimpleWorkflow = "swf";
+-    public static final String SNS = "sns";
+-    public static final String SQS = "sqs";
+-    public static final String StorageGateway = "storagegateway";
+-    public static final String STS = "sts";
+-    public static final String Support = "support";
+-    public static final String WAF = "waf";
+-    public static final String Workspaces = "workspaces";
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/RequestClientOptions.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/RequestClientOptions.java
+--- ./src/main/java/com/amazonaws/RequestClientOptions.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/RequestClientOptions.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,120 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon Technologies, Inc.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at:
+- *
+- *    http://aws.amazon.com/apache2.0
+- *
+- * This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+- * OR CONDITIONS OF ANY KIND, either express or implied. See the
+- * License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package com.amazonaws;
+-
+-import com.amazonaws.annotation.NotThreadSafe;
+-
+-import java.io.InputStream;
+-import java.util.EnumMap;
+-
+-/**
+- * Client request options such as client markers for individual
+- * {@link AmazonWebServiceRequest}s.
+- */
+-@NotThreadSafe
+-public final class RequestClientOptions {
+-    /**
+-     * Used to enable mark-and-reset for
+-     * non-mark-and-resettable non-file input stream for up to 128K memory
+-     * buffering by default. Add 1 to get around an implementation quirk of
+-     * BufferedInputStream.
+-     *
+-     * Retries after reading {@link #DEFAULT_STREAM_BUFFER_SIZE} bytes would
+-     * fail to reset the underlying input stream as the mark position would
+-     * have been invalidated.
+-     *
+-     */
+-    public static final int DEFAULT_STREAM_BUFFER_SIZE = (1 << 17)+1;
+-    public static enum Marker {
+-        /**
+-         * Used to specify the http user_agent value.
+-         * This marker is intended only for internal use by the AWS SDK.
+-         */
+-        USER_AGENT,
+-        ;
+-    }
+-
+-    private final EnumMap markers = new EnumMap(Marker.class);
+-    /**
+-     * Used for mark-and-reset purposes during retry.
+-     */
+-    private int readLimit = DEFAULT_STREAM_BUFFER_SIZE;
+-
+-    /**
+-     * Returns the value of the specified marker; or null if there is no such
+-     * value.
+-     */
+-    public String getClientMarker(Marker marker) {
+-        return markers.get(marker);
+-    }
+-
+-    /**
+-     * Associates the given value with the given marker.
+-     * Note the {@link Marker#USER_AGENT} is only intended for internal use
+-     * by the AWS SDK.
+-     */
+-    public void putClientMarker(Marker marker, String value) {
+-        markers.put(marker, value);
+-    }
+-
+-    /**
+-     * Appends a user agent to the USER_AGENT client marker.
+-     * This method is intended only for internal use by the AWS SDK.
+-     */
+-    public void appendUserAgent(String userAgent) {
+-        String marker = markers.get(Marker.USER_AGENT);
+-        if (marker == null)
+-            marker = "";
+-        marker = createUserAgentMarkerString(marker, userAgent);
+-        putClientMarker(Marker.USER_AGENT, marker);
+-    }
+-
+-    /**
+-     * Appends the given client marker string to the existing one and returns it.
+-     */
+-    private String createUserAgentMarkerString(final String marker, String userAgent) {
+-        return marker.contains(userAgent) ? marker : marker + " " + userAgent;
+-    }
+-
+-    /**
+-     * Returns the mark-and-reset read limit; defaults to
+-     * {@value #DEFAULT_STREAM_BUFFER_SIZE}.
+-     *
+-     * @see InputStream#mark(int)
+-     */
+-    public final int getReadLimit() {
+-        return readLimit;
+-    }
+-
+-    /**
+-     * Sets the optional mark-and-reset read limit used for signing and retry
+-     * purposes.
+-     *
+-     * @see InputStream#mark(int)
+-     */
+-    public final void setReadLimit(int readLimit) {
+-        this.readLimit = readLimit;
+-    }
+-
+-    /**
+-     * Copy the internal states of this RequestClientOptions to the
+-     * target RequestClientOptions.
+-     */
+-    void copyTo(RequestClientOptions target) {
+-        target.setReadLimit(getReadLimit());
+-        for (Marker marker: Marker.values())
+-            target.putClientMarker(marker, getClientMarker(marker));
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/RequestConfig.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/RequestConfig.java
+--- ./src/main/java/com/amazonaws/RequestConfig.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/RequestConfig.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,74 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws;
+-
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.auth.AWSCredentialsProvider;
+-import com.amazonaws.event.ProgressListener;
+-import com.amazonaws.internal.AmazonWebServiceRequestAdapter;
+-import com.amazonaws.metrics.RequestMetricCollector;
+-
+-import java.util.List;
+-import java.util.Map;
+-
+-/**
+- * Generic representation of request level configuration. The customer interface for specifying
+- * request level configuration is a base request class with configuration methods.
+- */
+-@SdkProtectedApi
+-public abstract class RequestConfig {
+-
+-    /**
+-     * No op implementation to initalize request config in {@link DefaultRequest}.
+-     */
+-    public static final RequestConfig NO_OP = new AmazonWebServiceRequestAdapter(
+-            AmazonWebServiceRequest.NOOP);
+-
+-    public abstract ProgressListener getProgressListener();
+-
+-    public abstract RequestMetricCollector getRequestMetricsCollector();
+-
+-    public abstract AWSCredentialsProvider getCredentialsProvider();
+-
+-    /**
+-     * @return A non null map of custom headers to inject into the request.
+-     */
+-    public abstract Map getCustomRequestHeaders();
+-
+-    /**
+-     * @return A non null map of custom query parameters to inject into the request.
+-     */
+-    public abstract Map> getCustomQueryParameters();
+-
+-    public abstract Integer getRequestTimeout();
+-
+-    public abstract Integer getClientExecutionTimeout();
+-
+-    public abstract RequestClientOptions getRequestClientOptions();
+-
+-    /**
+-     * @return String identifying the 'type' (i.e. operation) of the request. Used in metrics
+-     * subsystem.
+-     */
+-    public abstract String getRequestType();
+-
+-    /**
+-     * @return The original request object. May be delivered to various strategies or hooks for
+-     * extra context. I.E. {@link com.amazonaws.handlers.RequestHandler2} or {@link
+-     * com.amazonaws.retry.RetryPolicy}.
+-     */
+-    public abstract Object getOriginalRequest();
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/Request.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/Request.java
+--- ./src/main/java/com/amazonaws/Request.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/Request.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,150 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws;
+-
+-import com.amazonaws.http.HttpMethodName;
+-import com.amazonaws.util.AWSRequestMetrics;
+-import java.net.URI;
+-import java.util.List;
+-import java.util.Map;
+-
+-/**
+- * Represents a request being sent to an Amazon Web Service, including the
+- * parameters being sent as part of the request, the endpoint to which the
+- * request should be sent, etc.
+- * 

+- * This class is only intended for use inside the AWS client libraries and
+- * request handlers. Users of the AWS SDK for Java should not implement this
+- * interface.
+- *
+- * @param 
+- *            The type of original, user facing request represented by this
+- *            request.
+- */
+-public interface Request extends SignableRequest, HandlerContextAware {
+-    /**
+-     * Sets all headers, clearing any existing ones.
+-     */
+-    void setHeaders(Map headers);
+-
+-    /**
+-     * Sets the path to the resource being requested.
+-     *
+-     * @param path
+-     *            The path to the resource being requested.
+-     */
+-    void setResourcePath(String path);
+-
+-    /**
+-     * Adds the specified request parameter to this request, and returns the
+-     * updated request object.
+-     *
+-     * @param name
+-     *            The name of the request parameter.
+-     * @param value
+-     *            The value of the request parameter.
+-     *
+-     * @return The updated request object.
+-     */
+-    Request withParameter(String name, String value);
+-
+-    /**
+-     * Sets all parameters, clearing any existing values.
+-     *
+-     * Note that List values within the parameters Map must use an implementation that supports null
+-     * values.
+-     */
+-    void setParameters(Map> parameters);
+-
+-    /**
+-     * Adds the specified request parameter and list of values to this request.
+-     *
+-     * @param name
+-     *            The name of the request parameter.
+-     * @param values
+-     *            The value of the request parameter.
+-     */
+-    void addParameters(String name, List values);
+-
+-    /**
+-     * Sets the service endpoint (ex: "https://ec2.amazonaws.com") to which this
+-     * request should be sent.
+-     *
+-     * @param endpoint
+-     *            The service endpoint to which this request should be sent.
+-     */
+-    void setEndpoint(URI endpoint);
+-
+-    /**
+-     * Sets the HTTP method (GET, POST, etc) to use when sending this request.
+-     *
+-     * @param httpMethod
+-     *            The HTTP method to use when sending this request.
+-     */
+-    void setHttpMethod(HttpMethodName httpMethod);
+-
+-    /**
+-     * @return The name of the Amazon service this request is for. This is used
+-     *         as the service name set in request metrics and service
+-     *         exceptions. This is NOT the same as the service name returned by
+-     *         {@link AmazonWebServiceClient#getServiceName()} which is used for
+-     *         signing purpose.
+-     *
+-     * @see {@link AmazonServiceException#getServiceName()}
+-     * @see {@link AWSRequestMetrics.Field#ServiceName}
+-     */
+-    String getServiceName();
+-
+-    /**
+-     * Returns the original, user facing request object which this internal
+-     * request object is representing.
+-     */
+-    AmazonWebServiceRequest getOriginalRequest();
+-
+-    /**
+-     * Sets the optional value for time offset for this request.  This
+-     * will be used by the signer to adjust for potential clock skew.
+-     * Value is in seconds, positive values imply the current clock is "fast",
+-     * negative values imply clock is slow.
+-     *
+-     * @param timeOffset
+-     *            The optional value for time offset (in seconds) for this request.
+-     */
+-    void setTimeOffset(int timeOffset);
+-
+-    /**
+-     * Sets the optional value for time offset for this request.  This
+-     * will be used by the signer to adjust for potential clock skew.
+-     * Value is in seconds, positive values imply the current clock is "fast",
+-     * negative values imply clock is slow.
+-     *
+-     * @return The updated request object.
+-     */
+-    Request withTimeOffset(int timeOffset);
+-
+-    /**
+-     * Returns the request metrics.
+-     */
+-    AWSRequestMetrics getAWSRequestMetrics();
+-
+-    /**
+-     * Bind the request metrics to the request. Note metrics can be captured
+-     * before the request is created.
+-     *
+-     * @throws IllegalStateException if the binding has already occurred
+-     */
+-    void setAWSRequestMetrics(AWSRequestMetrics metrics);
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/ResetException.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/ResetException.java
+--- ./src/main/java/com/amazonaws/ResetException.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/ResetException.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,62 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws;
+-
+-/**
+- * Stream reset failure.
+- */
+-public class ResetException extends SdkClientException {
+-    private static final long serialVersionUID = 1L;
+-    private String extraInfo;
+-
+-    public ResetException(String message, Throwable t) {
+-        super(message, t);
+-    }
+-
+-    public ResetException(Throwable t) {
+-        super("", t);
+-    }
+-
+-    public ResetException(String message) {
+-        super(message);
+-    }
+-
+-    public ResetException() {
+-        super("");
+-    }
+-
+-    /**
+-     * {@inheritDoc}
+-     * A stream reset exception cannot be retried.
+-     */
+-    @Override
+-    public boolean isRetryable() {
+-        return false;
+-    }
+-
+-    @Override
+-    public String getMessage() {
+-        String msg = super.getMessage();
+-        return extraInfo == null ? msg : msg + ";  " + extraInfo;
+-    }
+-
+-    public String getExtraInfo() {
+-        return extraInfo;
+-    }
+-
+-    public void setExtraInfo(String extraInfo) {
+-        this.extraInfo = extraInfo;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/Response.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/Response.java
+--- ./src/main/java/com/amazonaws/Response.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/Response.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,34 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws;
+-
+-import com.amazonaws.http.HttpResponse;
+-
+-/**
+- * Response wrapper to provide access to not only the original AWS response
+- * but also the associated http response.
+- *
+- * @param  the underlying AWS response type.
+- */
+-public final class Response {
+-    private final T response;
+-    private final HttpResponse httpResponse;
+-    public Response(T response, HttpResponse httpResponse) {
+-        this.response = response;
+-        this.httpResponse = httpResponse;
+-    }
+-    public T getAwsResponse() { return response; }
+-    public HttpResponse getHttpResponse() { return httpResponse; }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/ResponseMetadata.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/ResponseMetadata.java
+--- ./src/main/java/com/amazonaws/ResponseMetadata.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/ResponseMetadata.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,73 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws;
+-
+-import java.util.Map;
+-
+-/**
+- * Represents additional metadata included with a response from AWS. Response
+- * metadata varies by service, but all services return an AWS request ID that
+- * can be used in the event a service call isn't working as expected and you
+- * need to work with AWS support to debug an issue.
+- * 

+- * Access to AWS request IDs is also available through the com.amazonaws.request
+- * logger in the AWS SDK for Java.
+- */
+-public class ResponseMetadata {
+-    public static final String AWS_REQUEST_ID = "AWS_REQUEST_ID";
+-
+-    protected final Map metadata;
+-
+-    /**
+-     * Creates a new ResponseMetadata object from a specified map of raw
+-     * metadata information.
+-     * 
+-     * @param metadata
+-     *            The raw metadata for the new ResponseMetadata object.
+-     */
+-    public ResponseMetadata(Map metadata) {
+-        this.metadata = metadata;
+-    }
+-
+-    /**
+-     * Creates a new ResponseMetadata object from an existing ResponseMetadata
+-     * object.
+-     *
+-     * @param originalResponseMetadata
+-     *            The ResponseMetadata object from which to create the new
+-     *            object.
+-     */
+-    public ResponseMetadata(ResponseMetadata originalResponseMetadata) {
+-        this(originalResponseMetadata.metadata);
+-    }
+-
+-    /**
+-     * Returns the AWS request ID contained in this response metadata object.
+-     * AWS request IDs can be used in the event a service call isn't working as
+-     * expected and you need to work with AWS support to debug an issue.
+-     *
+-     * @return The AWS request ID contained in this response metadata object.
+-     */
+-    public String getRequestId() {
+-        return metadata.get(AWS_REQUEST_ID);
+-    }
+-
+-    @Override
+-    public String toString() {
+-        if (metadata == null) return "{}";
+-        return metadata.toString();
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/retry/internal/AuthErrorRetryStrategy.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/internal/AuthErrorRetryStrategy.java
+--- ./src/main/java/com/amazonaws/retry/internal/AuthErrorRetryStrategy.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/internal/AuthErrorRetryStrategy.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,34 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.retry.internal;
+-
+-
+-import com.amazonaws.AmazonServiceException;
+-import com.amazonaws.Request;
+-import com.amazonaws.http.HttpResponse;
+-
+-/**
+- * For internal use only.
+- */
+-public interface AuthErrorRetryStrategy {
+-
+-	/**
+-	 * Returns an alternative signing context (consists of a new signer instance
+-	 * and a new request endpoint) that should be used to retry the request. Or
+-	 * null if it should not be retried.
+-	 */
+-	AuthRetryParameters shouldRetryWithAuthParam(Request originalRequest,
+-			HttpResponse response, AmazonServiceException ase);
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/retry/internal/AuthRetryParameters.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/internal/AuthRetryParameters.java
+--- ./src/main/java/com/amazonaws/retry/internal/AuthRetryParameters.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/internal/AuthRetryParameters.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,51 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.retry.internal;
+-
+-import java.net.URI;
+-
+-import com.amazonaws.annotation.Immutable;
+-import com.amazonaws.auth.Signer;
+-
+-/**
+- * Signer and endpoint parameters that are to be used for the next retry.
+- * 

+- * For internal use only.
+- */
+-@Immutable
+-public class AuthRetryParameters {
+-
+-    private final Signer signerForRetry;
+-    private final URI endpointForRetry;
+-
+-    public AuthRetryParameters(Signer signer, URI endpoint) {
+-        if (signer == null)
+-            throw new NullPointerException("signer");
+-        if (endpoint == null)
+-            throw new NullPointerException("endpoint");
+-
+-        this.signerForRetry = signer;
+-        this.endpointForRetry = endpoint;
+-    }
+-
+-    public Signer getSignerForRetry() {
+-        return signerForRetry;
+-    }
+-
+-    public URI getEndpointForRetry() {
+-        return endpointForRetry;
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/retry/PredefinedBackoffStrategies.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/PredefinedBackoffStrategies.java
+--- ./src/main/java/com/amazonaws/retry/PredefinedBackoffStrategies.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/PredefinedBackoffStrategies.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,158 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.retry;
+-
+-import com.amazonaws.retry.v2.BackoffStrategy;
+-import com.amazonaws.retry.v2.RetryPolicyContext;
+-import com.amazonaws.util.ValidationUtils;
+-
+-import java.util.Random;
+-
+-/**
+- * This class includes a set of pre-defined backoff policies.
+- * See this blog for more information on the different algorithms:
+- * https://www.awsarchitectureblog.com/2015/03/backoff.html
+- */
+-public class PredefinedBackoffStrategies {
+-
+-    /**
+-     * Default base sleep time (milliseconds) for non-throttled exceptions.
+-     **/
+-    private static final int SDK_DEFAULT_BASE_DELAY = 100;
+-
+-    /**
+-     * Default base sleep time (milliseconds) for throttled exceptions.
+-     **/
+-    static final int SDK_DEFAULT_THROTTLED_BASE_DELAY = 500;
+-
+-    /**
+-     * Default maximum back-off time before retrying a request
+-     */
+-    static final int SDK_DEFAULT_MAX_BACKOFF_IN_MILLISECONDS = 20 * 1000;
+-
+-    /**
+-     * Default base sleep time for DynamoDB.
+-     **/
+-    static final int DYNAMODB_DEFAULT_BASE_DELAY = 25;
+-
+-    /**
+-     * Maximum retry limit. Avoids integer overflow issues.
+-     *
+-     * NOTE: If the value is greater than 30, there can be integer overflow
+-     * issues during delay calculation.
+-     **/
+-    private static final int MAX_RETRIES = 30;
+-
+-    public static class FullJitterBackoffStrategy extends V2CompatibleBackoffStrategyAdapter {
+-
+-        private final int baseDelay;
+-        private final int maxBackoffTime;
+-        private final Random random = new Random();
+-
+-        public FullJitterBackoffStrategy(final int baseDelay,
+-                                         final int maxBackoffTime) {
+-            this.baseDelay = ValidationUtils.assertIsPositive(baseDelay, "Base delay");
+-            this.maxBackoffTime = ValidationUtils.assertIsPositive(maxBackoffTime, "Max backoff");
+-        }
+-
+-
+-        @Override
+-        public long computeDelayBeforeNextRetry(RetryPolicyContext context) {
+-            int ceil = calculateExponentialDelay(context.retriesAttempted(), baseDelay, maxBackoffTime);
+-            return random.nextInt(ceil);
+-        }
+-    }
+-
+-    public static class EqualJitterBackoffStrategy extends V2CompatibleBackoffStrategyAdapter {
+-
+-        private final int baseDelay;
+-        private final int maxBackoffTime;
+-        private final Random random = new Random();
+-
+-        public EqualJitterBackoffStrategy(final int baseDelay,
+-                                          final int maxBackoffTime) {
+-            this.baseDelay = ValidationUtils.assertIsPositive(baseDelay, "Base delay");
+-            this.maxBackoffTime = ValidationUtils.assertIsPositive(maxBackoffTime, "Max backoff");
+-        }
+-
+-        @Override
+-        public long computeDelayBeforeNextRetry(RetryPolicyContext context) {
+-            int ceil = calculateExponentialDelay(context.retriesAttempted(), baseDelay, maxBackoffTime);
+-            return (ceil / 2) + random.nextInt((ceil / 2) + 1);
+-        }
+-    }
+-
+-    public static class ExponentialBackoffStrategy extends V2CompatibleBackoffStrategyAdapter {
+-
+-        private final int baseDelay;
+-        private final int maxBackoffTime;
+-
+-        public ExponentialBackoffStrategy(final int baseDelay,
+-                                          final int maxBackoffTime) {
+-            this.baseDelay = ValidationUtils.assertIsPositive(baseDelay, "Base delay");
+-            this.maxBackoffTime = ValidationUtils.assertIsPositive(maxBackoffTime, "Max backoff");
+-        }
+-
+-        @Override
+-        public long computeDelayBeforeNextRetry(RetryPolicyContext context) {
+-            return calculateExponentialDelay(context.retriesAttempted(), baseDelay, maxBackoffTime);
+-        }
+-    }
+-
+-    private static int calculateExponentialDelay(int retriesAttempted, int baseDelay, int maxBackoffTime) {
+-        int retries = Math.min(retriesAttempted, MAX_RETRIES);
+-        return (int) Math.min((1L << retries) * baseDelay, maxBackoffTime);
+-    }
+-
+-
+-    /**
+-     * A private class that implements the default back-off strategy.
+-     **/
+-    public static class SDKDefaultBackoffStrategy extends V2CompatibleBackoffStrategyAdapter {
+-
+-        private final BackoffStrategy fullJitterBackoffStrategy;
+-        private final BackoffStrategy equalJitterBackoffStrategy;
+-
+-        public SDKDefaultBackoffStrategy() {
+-            fullJitterBackoffStrategy = new PredefinedBackoffStrategies.FullJitterBackoffStrategy(
+-                    SDK_DEFAULT_BASE_DELAY, SDK_DEFAULT_MAX_BACKOFF_IN_MILLISECONDS);
+-            equalJitterBackoffStrategy = new PredefinedBackoffStrategies.EqualJitterBackoffStrategy(
+-                    SDK_DEFAULT_THROTTLED_BASE_DELAY, SDK_DEFAULT_MAX_BACKOFF_IN_MILLISECONDS);
+-        }
+-
+-        public SDKDefaultBackoffStrategy(final int baseDelay, final int throttledBaseDelay, final int maxBackoff) {
+-            fullJitterBackoffStrategy = new PredefinedBackoffStrategies.FullJitterBackoffStrategy(
+-                    baseDelay, maxBackoff);
+-            equalJitterBackoffStrategy = new PredefinedBackoffStrategies.EqualJitterBackoffStrategy(
+-                    throttledBaseDelay, maxBackoff);
+-        }
+-
+-        @Override
+-        public long computeDelayBeforeNextRetry(RetryPolicyContext context) {
+-            /*
+-             * We use the full jitter scheme for non-throttled exceptions and the
+-             * equal jitter scheme for throttled exceptions.  This gives a preference
+-             * to quicker response and larger retry distribution for service errors
+-             * and guarantees a minimum delay for throttled exceptions.
+-             */
+-            if (RetryUtils.isThrottlingException(context.exception())) {
+-                return equalJitterBackoffStrategy.computeDelayBeforeNextRetry(context);
+-            } else {
+-                return fullJitterBackoffStrategy.computeDelayBeforeNextRetry(context);
+-            }
+-        }
+-    }
+-
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/retry/PredefinedRetryPolicies.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/PredefinedRetryPolicies.java
+--- ./src/main/java/com/amazonaws/retry/PredefinedRetryPolicies.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/PredefinedRetryPolicies.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,199 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.retry;
+-
+-import com.amazonaws.AmazonClientException;
+-import com.amazonaws.AmazonServiceException;
+-import com.amazonaws.AmazonWebServiceRequest;
+-import com.amazonaws.ClientConfiguration;
+-import java.io.IOException;
+-
+-/**
+- * This class includes a set of pre-defined retry policies, including default
+- * policies used by SDK.
+- */
+-public class PredefinedRetryPolicies {
+-
+-    /** No retry policy **/
+-    public static final RetryPolicy NO_RETRY_POLICY = new RetryPolicy(
+-            RetryPolicy.RetryCondition.NO_RETRY_CONDITION,
+-            RetryPolicy.BackoffStrategy.NO_DELAY,
+-            0,      // maxErrorRetry
+-            false); // honorMaxErrorRetryInClientConfig
+-
+-    /* SDK default */
+-
+-    /** SDK default max retry count **/
+-    public static final int DEFAULT_MAX_ERROR_RETRY = 3;
+-
+-    /**
+-     * SDK default retry policy. Amazon DynamoDB has a custom retry policy that is used when no
+-     * {@link ClientConfiguration} is provided.
+-     */
+-    public static final RetryPolicy DEFAULT;
+-
+-    /* Default for DynamoDB client */
+-
+-    /** Default max retry count for DynamoDB client **/
+-    public static final int DYNAMODB_DEFAULT_MAX_ERROR_RETRY = 10;
+-
+-    /** Default policy for DynamoDB client **/
+-    public static final RetryPolicy DYNAMODB_DEFAULT;
+-
+-    /* Reusable retry policy components */
+-
+-    /**
+-     * The SDK default retry condition, which checks for various conditions in
+-     * the following order:
+-     * 
    
+-     *   
  • Never retry on requests with non-repeatable content;
+-     *   
  • Retry on client exceptions caused by IOException;
+-     *   
  • Retry on service exceptions that are either 500 internal server
+-     *       errors, 503 service unavailable errors, service throttling errors or
+-     *       clock skew errors.
+-     * 

+-     */
+-    public static final RetryPolicy.RetryCondition DEFAULT_RETRY_CONDITION = new SDKDefaultRetryCondition();
+-
+-    /**
+-     * The SDK default back-off strategy, which increases exponentially up to a max amount of delay. It also applies a larger
+-     * scale factor upon service throttling exception.
+-     */
+-    public static final RetryPolicy.BackoffStrategy DEFAULT_BACKOFF_STRATEGY =
+-            new PredefinedBackoffStrategies.SDKDefaultBackoffStrategy();
+-
+-    /**
+-     * The SDK default back-off strategy, which increases exponentially up to a max amount of delay. It also applies a larger
+-     * scale factor upon service throttling exception.
+-     */
+-    public static final V2CompatibleBackoffStrategy DEFAULT_BACKOFF_STRATEGY_V2 =
+-            new PredefinedBackoffStrategies.SDKDefaultBackoffStrategy();
+-
+-    /**
+-     * The default back-off strategy for DynamoDB client, which increases
+-     * exponentially up to a max amount of delay. Compared to the SDK default
+-     * back-off strategy, it applies a smaller scale factor.
+-     */
+-    public static final RetryPolicy.BackoffStrategy DYNAMODB_DEFAULT_BACKOFF_STRATEGY =
+-            new PredefinedBackoffStrategies.SDKDefaultBackoffStrategy(PredefinedBackoffStrategies.DYNAMODB_DEFAULT_BASE_DELAY,
+-                                                                      PredefinedBackoffStrategies.SDK_DEFAULT_THROTTLED_BASE_DELAY,
+-                                                                      PredefinedBackoffStrategies.SDK_DEFAULT_MAX_BACKOFF_IN_MILLISECONDS);
+-
+-    static {
+-        DEFAULT = getDefaultRetryPolicy();
+-        DYNAMODB_DEFAULT = getDynamoDBDefaultRetryPolicy();
+-    }
+-
+-    /**
+-     * Returns the SDK default retry policy. This policy will honor the
+-     * maxErrorRetry set in ClientConfiguration.
+-     *
+-     * @see ClientConfiguration#setMaxErrorRetry(int)
+-     */
+-    public static RetryPolicy getDefaultRetryPolicy() {
+-        return new RetryPolicy(DEFAULT_RETRY_CONDITION,
+-                               DEFAULT_BACKOFF_STRATEGY,
+-                               DEFAULT_MAX_ERROR_RETRY,
+-                               true);
+-    }
+-
+-    /**
+-     * Returns the default retry policy for DynamoDB client. This policy will
+-     * honor the maxErrorRetry set in ClientConfiguration.
+-     *
+-     * @see ClientConfiguration#setMaxErrorRetry(int)
+-     */
+-    public static RetryPolicy getDynamoDBDefaultRetryPolicy() {
+-        return new RetryPolicy(DEFAULT_RETRY_CONDITION,
+-                               DYNAMODB_DEFAULT_BACKOFF_STRATEGY,
+-                               DYNAMODB_DEFAULT_MAX_ERROR_RETRY,
+-                               true);
+-    }
+-
+-    /**
+-     * Returns the SDK default retry policy with the specified max retry count.
+-     */
+-    public static RetryPolicy getDefaultRetryPolicyWithCustomMaxRetries(int maxErrorRetry) {
+-        return new RetryPolicy(DEFAULT_RETRY_CONDITION,
+-                               DEFAULT_BACKOFF_STRATEGY,
+-                               maxErrorRetry,
+-                               false);
+-    }
+-
+-    /**
+-     * Returns the default retry policy for DynamoDB client with the specified
+-     * max retry count.
+-     */
+-    public static RetryPolicy getDynamoDBDefaultRetryPolicyWithCustomMaxRetries(int maxErrorRetry) {
+-        return new RetryPolicy(DEFAULT_RETRY_CONDITION,
+-                               DYNAMODB_DEFAULT_BACKOFF_STRATEGY,
+-                               maxErrorRetry,
+-                               false);
+-    }
+-
+-    /**
+-     * The default implementation of RetryCondition used by the SDK. User could
+-     * extend this class to provide additional custom conditions.
+-     * The default implementation checks for various conditions in
+-     * the following order:
+-     * 
    
+-     *   
  • Retry on client exceptions caused by IOException;
+-     *   
  • Retry on service exceptions that are either 500 internal server
+-     *       errors, 503 service unavailable errors, service throttling errors or
+-     *       clock skew errors.
+-     * 

+-     */
+-    public static class SDKDefaultRetryCondition implements RetryPolicy.RetryCondition {
+-
+-        @Override
+-        public boolean shouldRetry(AmazonWebServiceRequest originalRequest,
+-                                   AmazonClientException exception,
+-                                   int retriesAttempted) {
+-            // Always retry on client exceptions caused by IOException
+-            if (exception.getCause() instanceof IOException) return true;
+-
+-            // Only retry on a subset of service exceptions
+-            if (exception instanceof AmazonServiceException) {
+-                AmazonServiceException ase = (AmazonServiceException)exception;
+-
+-                /*
+-                 * For 500 internal server errors and 503 service
+-                 * unavailable errors, we want to retry, but we need to use
+-                 * an exponential back-off strategy so that we don't overload
+-                 * a server with a flood of retries.
+-                 */
+-                if (RetryUtils.isRetryableServiceException(ase)) return true;
+-
+-                /*
+-                 * Throttling is reported as a 400 error from newer services. To try
+-                 * and smooth out an occasional throttling error, we'll pause and
+-                 * retry, hoping that the pause is long enough for the request to
+-                 * get through the next time.
+-                 */
+-                if (RetryUtils.isThrottlingException(ase)) return true;
+-
+-                /*
+-                 * Clock skew exception. If it is then we will get the time offset
+-                 * between the device time and the server time to set the clock skew
+-                 * and then retry the request.
+-                 */
+-                if (RetryUtils.isClockSkewError(ase)) return true;
+-            }
+-
+-            return false;
+-        }
+-
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/retry/RetryPolicyAdapter.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/RetryPolicyAdapter.java
+--- ./src/main/java/com/amazonaws/retry/RetryPolicyAdapter.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/RetryPolicyAdapter.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,70 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.retry;
+-
+-import com.amazonaws.AmazonClientException;
+-import com.amazonaws.AmazonWebServiceRequest;
+-import com.amazonaws.ClientConfiguration;
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.retry.v2.RetryPolicyContext;
+-
+-import static com.amazonaws.util.ValidationUtils.assertNotNull;
+-
+-/**
+- * Adapts a legacy {@link RetryPolicy} to the new {@link com.amazonaws.retry.v2.RetryPolicy}. This class is intended for internal
+- * use by the SDK.
+- */
+-@SdkInternalApi
+-public class RetryPolicyAdapter implements com.amazonaws.retry.v2.RetryPolicy {
+-
+-    private final RetryPolicy legacyRetryPolicy;
+-    private final ClientConfiguration clientConfiguration;
+-
+-    public RetryPolicyAdapter(RetryPolicy legacyRetryPolicy, ClientConfiguration clientConfiguration) {
+-        this.legacyRetryPolicy = assertNotNull(legacyRetryPolicy, "legacyRetryPolicy");
+-        this.clientConfiguration = assertNotNull(clientConfiguration, "clientConfiguration");
+-    }
+-
+-    @Override
+-    public long computeDelayBeforeNextRetry(RetryPolicyContext context) {
+-        return legacyRetryPolicy.getBackoffStrategy().delayBeforeNextRetry(
+-                (AmazonWebServiceRequest) context.originalRequest(),
+-                (AmazonClientException) context.exception(),
+-                context.retriesAttempted());
+-    }
+-
+-    @Override
+-    public boolean shouldRetry(RetryPolicyContext context) {
+-        if (context.retriesAttempted() >= getMaxErrorRetry()) {
+-            return false;
+-        }
+-        return legacyRetryPolicy.getRetryCondition().shouldRetry(
+-                (AmazonWebServiceRequest) context.originalRequest(),
+-                (AmazonClientException) context.exception(),
+-                context.retriesAttempted());
+-    }
+-
+-    public RetryPolicy getLegacyRetryPolicy() {
+-        return this.legacyRetryPolicy;
+-    }
+-
+-    private int getMaxErrorRetry() {
+-        if(legacyRetryPolicy.isMaxErrorRetryInClientConfigHonored() && clientConfiguration.getMaxErrorRetry() >= 0) {
+-            return clientConfiguration.getMaxErrorRetry();
+-        }
+-        return legacyRetryPolicy.getMaxErrorRetry();
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/retry/RetryPolicy.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/RetryPolicy.java
+--- ./src/main/java/com/amazonaws/retry/RetryPolicy.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/RetryPolicy.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,235 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.retry;
+-
+-import com.amazonaws.AmazonClientException;
+-import com.amazonaws.AmazonWebServiceRequest;
+-import com.amazonaws.ClientConfiguration;
+-import com.amazonaws.annotation.Immutable;
+-
+-/**
+- * Retry policy that can be configured on a specific service client using
+- * {@link ClientConfiguration}. This class is immutable, therefore safe to be
+- * shared by multiple clients.
+- * 
+- * @see ClientConfiguration
+- * @see PredefinedRetryPolicies
+- */
+-@Immutable
+-public final class RetryPolicy {
+-
+-    /**
+-     * Condition on whether a request should be retried. This field
+-     * should not be null.
+-     */
+-    private final RetryCondition retryCondition;
+-    
+-    /**
+-     * Back-off strategy to control the sleep time between retry attempts. This
+-     * field should not be null.
+-     */
+-    private final BackoffStrategy backoffStrategy;
+-    
+-    /**
+-     * Non-negative integer indicating the max retry count.
+-     */
+-    private final int maxErrorRetry;
+-    
+-    /**
+-     * Whether this retry policy should honor the max error retry set in ClientConfiguration.
+-     * @see ClientConfiguration#setMaxErrorRetry(int)
+-     */
+-    private final boolean honorMaxErrorRetryInClientConfig;
+-
+-    /**
+-     * Constructs a new retry policy. See {@link PredefinedRetryPolicies} for
+-     * some pre-defined policy components, and also the default policies used by
+-     * SDK.
+-     * 
+-     * @param retryCondition
+-     *            Retry condition on whether a specific request and exception
+-     *            should be retried. If null value is specified, the SDK'
+-     *            default retry condition is used.
+-     * @param backoffStrategy
+-     *            Back-off strategy for controlling how long the next retry
+-     *            should wait. If null value is specified, the SDK' default
+-     *            exponential back-off strategy is used.
+-     * @param maxErrorRetry
+-     *            Maximum number of retry attempts for failed requests.
+-     * @param honorMaxErrorRetryInClientConfig
+-     *            Whether this retry policy should honor the max error retry set
+-     *            by {@link ClientConfiguration#setMaxErrorRetry(int)}
+-     * @see ClientConfiguration
+-     * @see PredefinedRetryPolicies
+-     */
+-    public RetryPolicy(RetryCondition retryCondition,
+-                       BackoffStrategy backoffStrategy,
+-                       int maxErrorRetry,
+-                       boolean honorMaxErrorRetryInClientConfig) {
+-        if (retryCondition == null) {
+-            retryCondition = PredefinedRetryPolicies.DEFAULT_RETRY_CONDITION;
+-        }
+-        if (backoffStrategy == null) {
+-            backoffStrategy = PredefinedRetryPolicies.DEFAULT_BACKOFF_STRATEGY;
+-        }
+-        if (maxErrorRetry < 0) {
+-            throw new IllegalArgumentException("Please provide a non-negative value for maxErrorRetry.");
+-        }
+-        
+-        this.retryCondition = retryCondition;
+-        this.backoffStrategy = backoffStrategy;
+-        this.maxErrorRetry = maxErrorRetry;
+-        this.honorMaxErrorRetryInClientConfig = honorMaxErrorRetryInClientConfig;
+-    };
+-
+-    /**
+-     * Returns the retry condition included in this retry policy.
+-     * 
+-     * @return The retry condition included in this retry policy.
+-     */
+-    public RetryCondition getRetryCondition() {
+-        return retryCondition;
+-    }
+-
+-    /**
+-     * Returns the back-off strategy included in this retry policy.
+-     * 
+-     * @return The back-off strategy included in this retry policy.
+-     */
+-    public BackoffStrategy getBackoffStrategy() {
+-        return backoffStrategy;
+-    }
+-
+-    /**
+-     * Returns the maximum number of retry attempts.
+-     * 
+-     * @return The maximum number of retry attempts.
+-     */
+-    public int getMaxErrorRetry() {
+-        return maxErrorRetry;
+-    }
+-    
+-    /**
+-     * Returns whether this retry policy should honor the max error retry set in
+-     * ClientConfiguration.
+-     * 
+-     * @return Whether this retry policy should honor the max error retry set in
+-     *         ClientConfiguration
+-     * @see ClientConfiguration#setMaxErrorRetry(int)
+-     */
+-    public boolean isMaxErrorRetryInClientConfigHonored() {
+-        return honorMaxErrorRetryInClientConfig;
+-    }
+-    
+-    /**
+-     * The hook for providing custom condition on whether a failed request
+-     * should be retried.
+-     */
+-    public interface RetryCondition {
+-        RetryCondition NO_RETRY_CONDITION = new RetryCondition() {
+-            @Override
+-            public boolean shouldRetry(AmazonWebServiceRequest originalRequest,
+-                                       AmazonClientException exception,
+-                                       int retriesAttempted) {
+-                return false;
+-            }
+-        };
+-
+-        /**
+-         * Returns whether a failed request should be retried according to the
+-         * given request context. In the following circumstances, the request
+-         * will fail directly without consulting this method:
+-         * 
    
+-         *   
  •  if it has already reached the max retry limit,
+-         *   
  •  if the request contains non-repeatable content,
+-         *   
  •  if any RuntimeException or Error is thrown when executing the request.
+-         * 

+-         * 
+-         * @param originalRequest
+-         *            The original request object being executed. For
+-         *            performance reason, this object is not a defensive copy,
+-         *            and caller should not attempt to modify its data.
+-         * @param exception
+-         *            The exception from the failed request, represented as an
+-         *            AmazonClientException object. There are two types of
+-         *            exception that will be passed to this method:
+-         *            
    
+-         *            
  • AmazonServiceException (sub-class of
+-         *            AmazonClientException) indicating a service error
+-         *            
  • AmazonClientException caused by an IOException when
+-         *            executing the HTTP request.
+-         *            

+-         *            Any other exceptions are regarded as unexpected failures
+-         *            and are thrown immediately without any retry. For
+-         *            performance reason, this object is not a defensive copy,
+-         *            and caller should not attempt to modify its data.
+-         * @param retriesAttempted
+-         *            The number of times the current request has been
+-         *            attempted.
+-         * 
+-         * @return True if the failed request should be retried.
+-         */
+-        boolean shouldRetry(AmazonWebServiceRequest originalRequest,
+-                                   AmazonClientException exception,
+-                                   int retriesAttempted);
+-        
+-    }
+-
+-    /**
+-     * The hook for providing custom back-off strategy to control the sleep time
+-     * between retries.
+-     */
+-    public interface BackoffStrategy {
+-        RetryPolicy.BackoffStrategy NO_DELAY = new BackoffStrategy() {
+-            @Override
+-            public long delayBeforeNextRetry(AmazonWebServiceRequest originalRequest,
+-                                             AmazonClientException exception,
+-                                             int retriesAttempted) {
+-                return 0;
+-            }
+-        };
+-
+-        /**
+-         * Returns the delay (in milliseconds) before next retry attempt.
+-         * 
+-         * @param originalRequest
+-         *            The original request object being executed. For
+-         *            performance reason, this object is not a defensive copy,
+-         *            and caller should not attempt to modify its data.
+-         * @param exception
+-         *            The exception from the failed request, represented as an
+-         *            AmazonClientException object. There are two types of
+-         *            exception that will be passed to this method:
+-         *            
    
+-         *              
  • AmazonServiceException (sub-class of
+-         *                  AmazonClientException) indicating a service error
+-         *              
  • AmazonClientException caused by an IOException when
+-         *                  executing the HTTP request.
+-         *            

+-         *            Any other exceptions are regarded as unexpected failures
+-         *            and are thrown immediately without any retry. For
+-         *            performance reason, this object is not a defensive copy,
+-         *            and caller should not attempt to modify its data.
+-         * @param retriesAttempted
+-         *            The number of times the current request has been attempted
+-         *            (not including the next attempt after the delay).
+-         * 
+-         * @return The delay (in milliseconds) before next retry attempt.
+-         */
+-        long delayBeforeNextRetry(AmazonWebServiceRequest originalRequest,
+-                                         AmazonClientException exception,
+-                                         int retriesAttempted);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/retry/RetryUtils.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/RetryUtils.java
+--- ./src/main/java/com/amazonaws/retry/RetryUtils.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/RetryUtils.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,144 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.retry;
+-
+-import com.amazonaws.AmazonServiceException;
+-import com.amazonaws.SdkBaseException;
+-import java.util.HashSet;
+-import java.util.Set;
+-import org.apache.http.HttpStatus;
+-
+-public class RetryUtils {
+-
+-    static final Set THROTTLING_ERROR_CODES = new HashSet(9);
+-    static final Set CLOCK_SKEW_ERROR_CODES = new HashSet(6);
+-    static final Set RETRYABLE_ERROR_CODES = new HashSet(1);
+-    static final Set RETRYABLE_STATUS_CODES = new HashSet(4);
+-
+-    static {
+-        THROTTLING_ERROR_CODES.add("Throttling");
+-        THROTTLING_ERROR_CODES.add("ThrottlingException");
+-        THROTTLING_ERROR_CODES.add("ThrottledException");
+-        THROTTLING_ERROR_CODES.add("ProvisionedThroughputExceededException");
+-        THROTTLING_ERROR_CODES.add("SlowDown");
+-        THROTTLING_ERROR_CODES.add("TooManyRequestsException");
+-        THROTTLING_ERROR_CODES.add("RequestLimitExceeded");
+-        THROTTLING_ERROR_CODES.add("BandwidthLimitExceeded");
+-        THROTTLING_ERROR_CODES.add("RequestThrottled");
+-
+-        CLOCK_SKEW_ERROR_CODES.add("RequestTimeTooSkewed");
+-        CLOCK_SKEW_ERROR_CODES.add("RequestExpired");
+-        CLOCK_SKEW_ERROR_CODES.add("InvalidSignatureException");
+-        CLOCK_SKEW_ERROR_CODES.add("SignatureDoesNotMatch");
+-        CLOCK_SKEW_ERROR_CODES.add("AuthFailure");
+-        CLOCK_SKEW_ERROR_CODES.add("RequestInTheFuture");
+-
+-        RETRYABLE_ERROR_CODES.add("PriorRequestNotComplete");
+-
+-        RETRYABLE_STATUS_CODES.add(HttpStatus.SC_INTERNAL_SERVER_ERROR);
+-        RETRYABLE_STATUS_CODES.add(HttpStatus.SC_BAD_GATEWAY);
+-        RETRYABLE_STATUS_CODES.add(HttpStatus.SC_SERVICE_UNAVAILABLE);
+-        RETRYABLE_STATUS_CODES.add(HttpStatus.SC_GATEWAY_TIMEOUT);
+-    }
+-
+-    /**
+-     * @deprecated By {@link RetryUtils#isRetryableServiceException(SdkBaseException)}
+-     */
+-    @Deprecated
+-    public static boolean isRetryableServiceException(AmazonServiceException exception) {
+-        return isRetryableServiceException((SdkBaseException) exception);
+-    }
+-
+-    /**
+-     * Returns true if the specified exception is a retryable service side exception.
+-     *
+-     * @param exception The exception to test.
+-     * @return True if the exception resulted from a retryable service error, otherwise false.
+-     */
+-    public static boolean isRetryableServiceException(SdkBaseException exception) {
+-        if (!isAse(exception)) {
+-            return false;
+-        }
+-        AmazonServiceException ase = toAse(exception);
+-        return RETRYABLE_STATUS_CODES.contains(ase.getStatusCode()) || RETRYABLE_ERROR_CODES.contains(ase.getErrorCode());
+-    }
+-
+-    /**
+-     * @deprecated In favor of {@link RetryUtils#isThrottlingException(SdkBaseException)}
+-     */
+-    @Deprecated
+-    public static boolean isThrottlingException(AmazonServiceException exception) {
+-        return isThrottlingException((SdkBaseException) exception);
+-    }
+-
+-    /**
+-     * Returns true if the specified exception is a throttling error.
+-     *
+-     * @param exception The exception to test.
+-     * @return True if the exception resulted from a throttling error message from a service, otherwise false.
+-     */
+-    public static boolean isThrottlingException(SdkBaseException exception) {
+-        if (!isAse(exception)) {
+-            return false;
+-        }
+-        final AmazonServiceException ase = toAse(exception);
+-        return THROTTLING_ERROR_CODES.contains(ase.getErrorCode()) || ase.getStatusCode() == 429;
+-    }
+-
+-    /**
+-     * @deprecated By {@link RetryUtils#isRequestEntityTooLargeException(SdkBaseException)}
+-     */
+-    @Deprecated
+-    public static boolean isRequestEntityTooLargeException(AmazonServiceException exception) {
+-        return isRequestEntityTooLargeException((SdkBaseException) exception);
+-    }
+-
+-    /**
+-     * Returns true if the specified exception is a request entity too large error.
+-     *
+-     * @param exception The exception to test.
+-     * @return True if the exception resulted from a request entity too large error message from a service, otherwise false.
+-     */
+-    public static boolean isRequestEntityTooLargeException(SdkBaseException exception) {
+-        return isAse(exception) && toAse(exception).getStatusCode() == HttpStatus.SC_REQUEST_TOO_LONG;
+-    }
+-
+-    /**
+-     * @deprecated By {@link RetryUtils#isClockSkewError(SdkBaseException)}
+-     */
+-    @Deprecated
+-    public static boolean isClockSkewError(AmazonServiceException exception) {
+-        return isClockSkewError((SdkBaseException) exception);
+-    }
+-
+-    /**
+-     * Returns true if the specified exception is a clock skew error.
+-     *
+-     * @param exception The exception to test.
+-     * @return True if the exception resulted from a clock skews error message from a service, otherwise false.
+-     */
+-    public static boolean isClockSkewError(SdkBaseException exception) {
+-        return isAse(exception) && CLOCK_SKEW_ERROR_CODES.contains(toAse(exception).getErrorCode());
+-    }
+-
+-    private static boolean isAse(SdkBaseException e) {
+-        return e instanceof AmazonServiceException;
+-    }
+-
+-    private static AmazonServiceException toAse(SdkBaseException e) {
+-        return (AmazonServiceException) e;
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/retry/v2/AndRetryCondition.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/v2/AndRetryCondition.java
+--- ./src/main/java/com/amazonaws/retry/v2/AndRetryCondition.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/v2/AndRetryCondition.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,46 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.retry.v2;
+-
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.List;
+-
+-import static com.amazonaws.util.ValidationUtils.assertNotEmpty;
+-
+-/**
+- * Composite {@link RetryCondition} that evaluates to true when all contained retry conditions evaluate to true.
+- */
+-public class AndRetryCondition implements RetryCondition {
+-
+-    private List conditions = new ArrayList();
+-
+-    public AndRetryCondition(RetryCondition... conditions) {
+-        Collections.addAll(this.conditions, assertNotEmpty(conditions, "conditions"));
+-    }
+-
+-    /**
+-     * @return True if all conditions are true, false otherwise.
+-     */
+-    @Override
+-    public boolean shouldRetry(RetryPolicyContext context) {
+-        for (RetryCondition retryCondition : conditions) {
+-            if (!retryCondition.shouldRetry(context)) {
+-                return false;
+-            }
+-        }
+-        return true;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/retry/v2/BackoffStrategy.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/v2/BackoffStrategy.java
+--- ./src/main/java/com/amazonaws/retry/v2/BackoffStrategy.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/v2/BackoffStrategy.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,29 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.retry.v2;
+-
+-/**
+- * Super interface for {@link RetryPolicy} that defines a strategy for backing off between retries.
+- */
+-public interface BackoffStrategy {
+-
+-    /**
+-     * Compute the delay before the next retry request. This strategy is only consulted when there will be a next retry.
+-     *
+-     * @param context Context about the state of the last request and information about the number of requests made.
+-     * @return Amount of time in milliseconds to wait before the next attempt. Must be non-negative (can be zero).
+-     */
+-    long computeDelayBeforeNextRetry(RetryPolicyContext context);
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/retry/v2/FixedDelayBackoffStrategy.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/v2/FixedDelayBackoffStrategy.java
+--- ./src/main/java/com/amazonaws/retry/v2/FixedDelayBackoffStrategy.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/v2/FixedDelayBackoffStrategy.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,34 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.retry.v2;
+-
+-import static com.amazonaws.util.ValidationUtils.assertIsPositive;
+-
+-/**
+- * Simple backoff strategy that always uses a fixed delay.
+- */
+-public class FixedDelayBackoffStrategy implements BackoffStrategy {
+-
+-    private final int fixedBackoff;
+-
+-    public FixedDelayBackoffStrategy(int fixedBackoff) {
+-        this.fixedBackoff = assertIsPositive(fixedBackoff, "fixedBackoff");
+-    }
+-
+-    @Override
+-    public long computeDelayBeforeNextRetry(RetryPolicyContext context) {
+-        return fixedBackoff;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/retry/v2/MaxNumberOfRetriesCondition.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/v2/MaxNumberOfRetriesCondition.java
+--- ./src/main/java/com/amazonaws/retry/v2/MaxNumberOfRetriesCondition.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/v2/MaxNumberOfRetriesCondition.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,34 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.retry.v2;
+-
+-import static com.amazonaws.util.ValidationUtils.assertIsPositive;
+-
+-/**
+- * Simple retry condition that allows retries up to a certain max number of retries.
+- */
+-public class MaxNumberOfRetriesCondition implements RetryCondition {
+-
+-    private final int maxNumberOfRetries;
+-
+-    public MaxNumberOfRetriesCondition(int maxNumberOfRetries) {
+-        this.maxNumberOfRetries = assertIsPositive(maxNumberOfRetries, "maxNumberOfRetries");
+-    }
+-
+-    @Override
+-    public boolean shouldRetry(RetryPolicyContext context) {
+-        return context.retriesAttempted() < maxNumberOfRetries;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/retry/v2/OrRetryCondition.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/v2/OrRetryCondition.java
+--- ./src/main/java/com/amazonaws/retry/v2/OrRetryCondition.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/v2/OrRetryCondition.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,44 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.retry.v2;
+-
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.List;
+-
+-/**
+- * Composite retry condition that evaluates to true if any containing condition evaluates to true.
+- */
+-public class OrRetryCondition implements RetryCondition {
+-
+-    private List conditions = new ArrayList();
+-
+-    public OrRetryCondition(RetryCondition... conditions) {
+-        Collections.addAll(this.conditions, conditions);
+-    }
+-
+-    /**
+-     * @return True if any condition returns true. False otherwise.
+-     */
+-    @Override
+-    public boolean shouldRetry(RetryPolicyContext context) {
+-        for (RetryCondition retryCondition : conditions) {
+-            if (retryCondition.shouldRetry(context)) {
+-                return true;
+-            }
+-        }
+-        return false;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/retry/v2/RetryCondition.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/v2/RetryCondition.java
+--- ./src/main/java/com/amazonaws/retry/v2/RetryCondition.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/v2/RetryCondition.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,29 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.retry.v2;
+-
+-/**
+- * Super interface for {@link RetryPolicy} used to define when a request should be retried.
+- */
+-public interface RetryCondition {
+-
+-    /**
+-     * Determine whether a request should or should not be retried.
+-     *
+-     * @param context Context about the state of the last request and information about the number of requests made.
+-     * @return True if the request should be retried, false if not.
+-     */
+-    boolean shouldRetry(RetryPolicyContext context);
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/retry/v2/RetryOnExceptionsCondition.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/v2/RetryOnExceptionsCondition.java
+--- ./src/main/java/com/amazonaws/retry/v2/RetryOnExceptionsCondition.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/v2/RetryOnExceptionsCondition.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,79 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.retry.v2;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-import static com.amazonaws.util.ValidationUtils.assertNotNull;
+-
+-/**
+- * Retry condition implementation that retries if the exception or the cause of the exception matches the classes defined.
+- */
+-public class RetryOnExceptionsCondition implements RetryCondition {
+-
+-    private final List> exceptionsToRetryOn;
+-
+-    /**
+-     * @param exceptionsToRetryOn Exception classes to retry on.
+-     */
+-    public RetryOnExceptionsCondition(List> exceptionsToRetryOn) {
+-        this.exceptionsToRetryOn = new ArrayList>(
+-                assertNotNull(exceptionsToRetryOn, "exceptionsToRetryOn"));
+-    }
+-
+-    /**
+-     * @param context Context about the state of the last request and information about the number of requests made.
+-     * @return True if the exception class matches one of the whitelisted exceptions or if the cause of the exception matches the
+-     * whitelisted exception.
+-     */
+-    @Override
+-    public boolean shouldRetry(RetryPolicyContext context) {
+-        if (context.exception() != null) {
+-            for (Class exceptionClass : exceptionsToRetryOn) {
+-                if (exceptionMatches(context, exceptionClass)) {
+-                    return true;
+-                }
+-                // Note that we check the wrapped exception too because for things like SocketException or IOException
+-                // we wrap them in an SdkClientException before throwing.
+-                if (wrappedCauseMatches(context, exceptionClass)) {
+-                    return true;
+-                }
+-            }
+-        }
+-        return false;
+-    }
+-
+-    /**
+-     * @param context        Context containing exception.
+-     * @param exceptionClass Expected exception class.
+-     * @return True if the exception in the context matches the provided class.
+-     */
+-    private boolean exceptionMatches(RetryPolicyContext context, Class exceptionClass) {
+-        return context.exception().getClass().equals(exceptionClass);
+-    }
+-
+-    /**
+-     * @param context        Context containing exception.
+-     * @param exceptionClass Expected exception class.
+-     * @return True if the cause of the exception in the context matches the provided class.
+-     */
+-    private boolean wrappedCauseMatches(RetryPolicyContext context, Class exceptionClass) {
+-        if (context.exception().getCause() == null) {
+-            return false;
+-        }
+-        return context.exception().getCause().getClass().equals(exceptionClass);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/retry/v2/RetryOnStatusCodeCondition.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/v2/RetryOnStatusCodeCondition.java
+--- ./src/main/java/com/amazonaws/retry/v2/RetryOnStatusCodeCondition.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/v2/RetryOnStatusCodeCondition.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,50 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.retry.v2;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-import static com.amazonaws.util.ValidationUtils.assertNotNull;
+-
+-/**
+- * Retry condition implementation that retries if the HTTP status code matches one of the provided status codes.
+- */
+-public class RetryOnStatusCodeCondition implements RetryCondition {
+-
+-    private final List statusCodesToRetryOn;
+-
+-    public RetryOnStatusCodeCondition(List statusCodesToRetryOn) {
+-        this.statusCodesToRetryOn = new ArrayList(
+-                assertNotNull(statusCodesToRetryOn, "statusCodesToRetryOn"));
+-    }
+-
+-    /**
+-     * @param context Context about the state of the last request and information about the number of requests made.
+-     * @return True if the HTTP status code matches one of the provided status codes. False if it doesn't match or the request
+-     * failed for reasons other than an exceptional HTTP response (i.e. IOException).
+-     */
+-    @Override
+-    public boolean shouldRetry(RetryPolicyContext context) {
+-        if (context.httpStatusCode() != null) {
+-            for (Integer statusCode : statusCodesToRetryOn) {
+-                if (statusCode.equals(context.httpStatusCode())) {
+-                    return true;
+-                }
+-            }
+-        }
+-        return false;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/retry/v2/RetryPolicyContext.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/v2/RetryPolicyContext.java
+--- ./src/main/java/com/amazonaws/retry/v2/RetryPolicyContext.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/v2/RetryPolicyContext.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,138 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.retry.v2;
+-
+-import com.amazonaws.Request;
+-import com.amazonaws.SdkBaseException;
+-import com.amazonaws.annotation.Immutable;
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.handlers.HandlerContextKey;
+-
+-/**
+- * Contains useful information about a failed request that can be used to make retry and backoff decisions. See {@link
+- * RetryPolicy}.
+- */
+-@Immutable
+-public class RetryPolicyContext {
+-
+-    private final Object originalRequest;
+-    private final Request request;
+-    private final SdkBaseException exception;
+-    private final int retriesAttempted;
+-    private final Integer httpStatusCode;
+-
+-    private RetryPolicyContext(Object originalRequest,
+-                               Request request,
+-                               SdkBaseException exception,
+-                               int retriesAttempted,
+-                               Integer httpStatusCode) {
+-        this.originalRequest = originalRequest;
+-        this.request = request;
+-        this.exception = exception;
+-        this.retriesAttempted = retriesAttempted;
+-        this.httpStatusCode = httpStatusCode;
+-    }
+-
+-    /**
+-     * @return The original request passed to the client method for an operation.
+-     */
+-    public Object originalRequest() {
+-        return this.originalRequest;
+-    }
+-
+-    /**
+-     * @return The marshalled request. See {@link Request#addHandlerContext(HandlerContextKey, Object)} for a mechanism to store
+-     * request level state across invocations of the retry policy.
+-     */
+-    public Request request() {
+-        return this.request;
+-    }
+-
+-    /**
+-     * @return The previous exception (may be a client or a service exception).
+-     */
+-    public SdkBaseException exception() {
+-        return this.exception;
+-    }
+-
+-    /**
+-     * @return Number of retries attempted thus far.
+-     */
+-    public int retriesAttempted() {
+-        return this.retriesAttempted;
+-    }
+-
+-    /**
+-     * @return The total number of requests made thus far.
+-     */
+-    public int totalRequests() {
+-        return retriesAttempted() + 1;
+-    }
+-
+-    /**
+-     * @return HTTP status code of response. May be null if no response was received from the service.
+-     */
+-    public Integer httpStatusCode() {
+-        return this.httpStatusCode;
+-    }
+-
+-    @SdkInternalApi
+-    public static Builder builder() {
+-        return new Builder();
+-    }
+-
+-    @SdkInternalApi
+-    public static class Builder {
+-
+-        private Object originalRequest;
+-        private Request request;
+-        private SdkBaseException exception;
+-        private int retriesAttempted;
+-        private Integer httpStatusCode;
+-
+-        private Builder() {
+-        }
+-
+-        public Builder originalRequest(Object originalRequest) {
+-            this.originalRequest = originalRequest;
+-            return this;
+-        }
+-
+-        public Builder request(Request request) {
+-            this.request = request;
+-            return this;
+-        }
+-
+-        public Builder exception(SdkBaseException exception) {
+-            this.exception = exception;
+-            return this;
+-        }
+-
+-        public Builder retriesAttempted(int retriesAttempted) {
+-            this.retriesAttempted = retriesAttempted;
+-            return this;
+-        }
+-
+-        public Builder httpStatusCode(Integer httpStatusCode) {
+-            this.httpStatusCode = httpStatusCode;
+-            return this;
+-        }
+-
+-        public RetryPolicyContext build() {
+-            return new RetryPolicyContext(originalRequest, request, exception, retriesAttempted, httpStatusCode);
+-        }
+-
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/retry/v2/RetryPolicy.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/v2/RetryPolicy.java
+--- ./src/main/java/com/amazonaws/retry/v2/RetryPolicy.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/v2/RetryPolicy.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,21 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.retry.v2;
+-
+-/**
+- * Aggregate interface combining a {@link RetryCondition} and {@link BackoffStrategy} into a single policy.
+- */
+-public interface RetryPolicy extends RetryCondition, BackoffStrategy {
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/retry/v2/SimpleRetryPolicy.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/v2/SimpleRetryPolicy.java
+--- ./src/main/java/com/amazonaws/retry/v2/SimpleRetryPolicy.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/v2/SimpleRetryPolicy.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,41 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.retry.v2;
+-
+-import static com.amazonaws.util.ValidationUtils.assertNotNull;
+-
+-/**
+- * Implementation of {@link RetryPolicy} that combines an individual {@link RetryCondition} and {@link BackoffStrategy}.
+- */
+-public class SimpleRetryPolicy implements RetryPolicy {
+-
+-    private final RetryCondition retryCondition;
+-    private final BackoffStrategy backoffStrategy;
+-
+-    public SimpleRetryPolicy(RetryCondition retryCondition, BackoffStrategy backoffStrategy) {
+-        this.retryCondition = assertNotNull(retryCondition, "retryCondition");
+-        this.backoffStrategy = assertNotNull(backoffStrategy, "backoffStrategy");
+-    }
+-
+-    @Override
+-    public long computeDelayBeforeNextRetry(RetryPolicyContext context) {
+-        return backoffStrategy.computeDelayBeforeNextRetry(context);
+-    }
+-
+-    @Override
+-    public boolean shouldRetry(RetryPolicyContext context) {
+-        return retryCondition.shouldRetry(context);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/retry/V2CompatibleBackoffStrategyAdapter.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/V2CompatibleBackoffStrategyAdapter.java
+--- ./src/main/java/com/amazonaws/retry/V2CompatibleBackoffStrategyAdapter.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/V2CompatibleBackoffStrategyAdapter.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,39 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.retry;
+-
+-import com.amazonaws.AmazonClientException;
+-import com.amazonaws.AmazonWebServiceRequest;
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.retry.v2.RetryPolicyContext;
+-
+-/**
+- * Adapts the legacy backoff strategy to the new v2 backoff strategy. Strategies that extend this can be used in both legacy and
+- * v2 retry policies.
+- */
+-@SdkInternalApi
+-abstract class V2CompatibleBackoffStrategyAdapter implements V2CompatibleBackoffStrategy {
+-
+-    @Override
+-    public long delayBeforeNextRetry(AmazonWebServiceRequest originalRequest,
+-                                     AmazonClientException exception,
+-                                     int retriesAttempted) {
+-        return computeDelayBeforeNextRetry(RetryPolicyContext.builder()
+-                                            .originalRequest(originalRequest)
+-                                            .exception(exception)
+-                                            .retriesAttempted(retriesAttempted)
+-                                            .build());
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/retry/V2CompatibleBackoffStrategy.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/V2CompatibleBackoffStrategy.java
+--- ./src/main/java/com/amazonaws/retry/V2CompatibleBackoffStrategy.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/retry/V2CompatibleBackoffStrategy.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,23 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.retry;
+-
+-import com.amazonaws.retry.v2.BackoffStrategy;
+-
+-/**
+- * Adapter interface for backoff strategies that can be used in both legacy RetryPolicies and the new V2 retry policy.
+- */
+-public interface V2CompatibleBackoffStrategy extends RetryPolicy.BackoffStrategy, BackoffStrategy {
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/sdk/versionInfo.properties /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/sdk/versionInfo.properties
+--- ./src/main/java/com/amazonaws/sdk/versionInfo.properties	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/sdk/versionInfo.properties	1969-12-31 16:00:00.000000000 -0800
+@@ -1,4 +0,0 @@
+-#Fri Mar 16 21:28:39 UTC 2018
+-platform=java
+-version=1.11.297
+-internalVersion=5773132671
+diff -Nau8r ./src/main/java/com/amazonaws/ServiceNameFactory.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/ServiceNameFactory.java
+--- ./src/main/java/com/amazonaws/ServiceNameFactory.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/ServiceNameFactory.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,46 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws;
+-
+-import com.amazonaws.internal.config.HttpClientConfig;
+-import com.amazonaws.internal.config.InternalConfig;
+-
+-/**
+- * An internal service name factory.
+- */
+-enum ServiceNameFactory {
+-    ;
+-
+-    /**
+-     * Returns the serviceName config for the specified service client, or null
+-     * if no explicit config is found.
+-     */
+-    static String getServiceName(String httpClientName) {
+-        InternalConfig config = InternalConfig.Factory.getInternalConfig();
+-        HttpClientConfig clientConfig = config.getHttpClientConfig(httpClientName);
+-        return clientConfig == null ? null : clientConfig.getServiceName();
+-    }
+-
+-    /**
+-     * Returns the regionMetadataServiceName config for the specified service
+-     * client, or null if no explicit config is found.
+-     */
+-    static String getServiceNameInRegionMetadata(String httpClientName) {
+-        InternalConfig config = InternalConfig.Factory.getInternalConfig();
+-        HttpClientConfig clientConfig = config.getHttpClientConfig(httpClientName);
+-        return clientConfig == null ? null : clientConfig.getRegionMetadataServiceName();
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/SignableRequest.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/SignableRequest.java
+--- ./src/main/java/com/amazonaws/SignableRequest.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/SignableRequest.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,62 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws;
+-
+-import java.io.InputStream;
+-
+-/**
+- * Represents a sign-able request being sent to an Amazon Web Service, including the
+- * parameters being sent as part of the request, the endpoint to which the
+- * request should be sent, etc.
+- * 

+- * This class is only intended for internal use inside the AWS client libraries.
+- * Callers shouldn't ever interact directly with objects of this class.
+- *
+- * @param 
+- *            The type of original, user facing request represented by this
+- *            request.
+- */
+-public interface SignableRequest extends ImmutableRequest {
+-
+-    /**
+-     * Sets the specified header for this request.
+-     *
+-     * @param name
+-     *            The name of the header to set.
+-     * @param value
+-     *            The header's value.
+-     */
+-    void addHeader(String name, String value);
+-
+-    /**
+-     * Adds the specified request parameter to this request.
+-     *
+-     * @param name
+-     *            The name of the request parameter.
+-     * @param value
+-     *            The value of the request parameter.
+-     */
+-    void addParameter(String name, String value);
+-
+-    /**
+-     * Sets the optional stream containing the payload data to include for this
+-     * request. This is used, for example, for S3 chunk encoding.
+-     *
+-     * @param content
+-     *            The optional stream containing the payload data to include for
+-     *            this request.
+-     */
+-    void setContent(InputStream content);
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/SystemDefaultDnsResolver.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/SystemDefaultDnsResolver.java
+--- ./src/main/java/com/amazonaws/SystemDefaultDnsResolver.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/SystemDefaultDnsResolver.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,29 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws;
+-
+-import java.net.InetAddress;
+-import java.net.UnknownHostException;
+-
+-/**
+- * Default dns resolver that uses {@link java.net.InetAddress#getAllByName(String)}
+- * to resolve hosts to ip addresses
+- */
+-public class SystemDefaultDnsResolver implements DnsResolver {
+-    @Override
+-    public InetAddress[] resolve(String host) throws UnknownHostException {
+-        return InetAddress.getAllByName(host);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/transform/AbstractErrorUnmarshaller.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/AbstractErrorUnmarshaller.java
+--- ./src/main/java/com/amazonaws/transform/AbstractErrorUnmarshaller.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/AbstractErrorUnmarshaller.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,69 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.transform;
+-
+-import java.lang.reflect.Constructor;
+-
+-import com.amazonaws.AmazonServiceException;
+-
+-public abstract class AbstractErrorUnmarshaller implements Unmarshaller {
+-
+-    /**
+-     * The type of AmazonServiceException that will be instantiated. Subclasses
+-     * specialized for a specific type of exception can control this through the
+-     * protected constructor.
+-     */
+-    protected final Class exceptionClass;
+-
+-    /**
+-     * Constructs a new error unmarshaller that will unmarshall error responses
+-     * into AmazonServiceException objects.
+-     */
+-    public AbstractErrorUnmarshaller() {
+-        this(AmazonServiceException.class);
+-    }
+-
+-    /**
+-     * Constructs a new error unmarshaller that will unmarshall error responses
+-     * into objects of the specified class, extending AmazonServiceException.
+-     * 
+-     * @param exceptionClass
+-     *            The subclass of AmazonServiceException which will be
+-     *            instantiated and populated by this class.
+-     */
+-    public AbstractErrorUnmarshaller(Class exceptionClass) {
+-        this.exceptionClass = exceptionClass;
+-    }
+-
+-    /**
+-     * Constructs a new exception object of the type specified in this class's
+-     * constructor and sets the specified error message.
+-     * 
+-     * @param message
+-     *            The error message to set in the new exception object.
+-     * 
+-     * @return A new exception object of the type specified in this class's
+-     *         constructor and sets the specified error message.
+-     * 
+-     * @throws Exception
+-     *             If there are any problems using reflection to invoke the
+-     *             exception class's constructor.
+-     */
+-    protected AmazonServiceException newException(String message) throws Exception {
+-        Constructor constructor = exceptionClass.getConstructor(String.class);
+-        return constructor.newInstance(message);
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/transform/JsonErrorUnmarshaller.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/JsonErrorUnmarshaller.java
+--- ./src/main/java/com/amazonaws/transform/JsonErrorUnmarshaller.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/JsonErrorUnmarshaller.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,66 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.transform;
+-
+-import com.amazonaws.AmazonServiceException;
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.annotation.ThreadSafe;
+-import com.fasterxml.jackson.databind.DeserializationFeature;
+-import com.fasterxml.jackson.databind.JsonNode;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-import com.fasterxml.jackson.databind.PropertyNamingStrategy.PascalCaseStrategy;
+-
+-/**
+- * Unmarshaller for JSON error responses from AWS services.
+- */
+-@SdkInternalApi
+-@ThreadSafe
+-public class JsonErrorUnmarshaller extends AbstractErrorUnmarshaller {
+-
+-    public static final JsonErrorUnmarshaller DEFAULT_UNMARSHALLER = new JsonErrorUnmarshaller(
+-            AmazonServiceException.class, null);
+-
+-    private static final ObjectMapper MAPPER = new ObjectMapper().configure(
+-            DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).setPropertyNamingStrategy(
+-            new PascalCaseStrategy());
+-
+-    private final String handledErrorCode;
+-
+-    /**
+-     * @param exceptionClass   Exception class this unmarshaller will attempt to deserialize error response into
+-     * @param handledErrorCode AWS error code that this unmarshaller handles. Pass null to handle all exceptions
+-     */
+-    public JsonErrorUnmarshaller(Class exceptionClass, String handledErrorCode) {
+-        super(exceptionClass);
+-        this.handledErrorCode = handledErrorCode;
+-    }
+-
+-    @Override
+-    public AmazonServiceException unmarshall(JsonNode jsonContent) throws Exception {
+-        return MAPPER.treeToValue(jsonContent, exceptionClass);
+-    }
+-
+-    /**
+-     * @param actualErrorCode Actual AWS error code found in the error response.
+-     * @return True if the actualErrorCode can be handled by this unmarshaller, false otherwise
+-     */
+-    public boolean matchErrorCode(String actualErrorCode) {
+-        if (handledErrorCode == null) {
+-            return true;
+-        }
+-        return handledErrorCode.equals(actualErrorCode);
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/transform/JsonUnmarshallerContextImpl.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/JsonUnmarshallerContextImpl.java
+--- ./src/main/java/com/amazonaws/transform/JsonUnmarshallerContextImpl.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/JsonUnmarshallerContextImpl.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,334 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.transform;
+-
+-import static com.fasterxml.jackson.core.JsonToken.END_ARRAY;
+-import static com.fasterxml.jackson.core.JsonToken.END_OBJECT;
+-import static com.fasterxml.jackson.core.JsonToken.FIELD_NAME;
+-import static com.fasterxml.jackson.core.JsonToken.START_ARRAY;
+-import static com.fasterxml.jackson.core.JsonToken.START_OBJECT;
+-
+-import com.amazonaws.http.HttpResponse;
+-import com.fasterxml.jackson.core.JsonParser;
+-import com.fasterxml.jackson.core.JsonToken;
+-import java.io.IOException;
+-import java.util.Collections;
+-import java.util.HashMap;
+-import java.util.Map;
+-import java.util.Stack;
+-
+-public class JsonUnmarshallerContextImpl extends JsonUnmarshallerContext {
+-    /** The current JsonToken that the private JsonParser is currently pointing to. **/
+-    private JsonToken currentToken;
+-
+-    /** A cache of the next token if it has been peeked ahead. **/
+-    private JsonToken nextToken;
+-
+-    private final JsonParser jsonParser;
+-
+-    private String currentHeader;
+-
+-    /**
+-     * A stack of JsonFieldTokenPair objects that indicates the current state of the context.
+-     * For example, if we have a JSON object:
+-     * {
+-     *   A :
+-     *     {
+-     *       B : [
+-     *         {
+-     *           C : {
+-     *             D : E
+-     *           }
+-     *         },
+-     *       ]
+-     *     }
+-     * }
+-     * When the parser points to "D", the state of this stack should be (from top to bottom):
+-     *  [ (C, START_OBJECT), (B, START_ARRAY), (A, START_OBJECT) ]
+-     */
+-    private final Stack stack = new Stack();
+-
+-    /**
+-     * The name of the field that is currently being parsed. This value is
+-     * nulled out when the parser reaches into the object/array structure of the
+-     * corresponding value, and then it will be pushed into the stack after
+-     * wrapped into a JsonFieldTokenPair object with the START_OBJECT or
+-     * START_ARRAY token following it.
+-     * So in the same example as shown above:
+-     *   (1) when the parser moves from "C" to "{", (currentField, START_OBJECT)
+-     *       will be pushed into the stack and currentField will be set null;
+-     *   (2) but when it moves from "{" to "C", nothing will be pushed into the
+-     *       stack and only currentField will be updated from null to "D".
+-     */
+-    private String currentField;
+-
+-    /**
+-     * This string is used to cache the parent element that was just parsed,
+-     * after it is removed from the stack.
+-     */
+-    private String lastParsedParentElement;
+-
+-    private Map metadata = new HashMap();
+-
+-    private final HttpResponse httpResponse;
+-
+-    private final Map, Unmarshaller> unmarshallerMap;
+-
+-    private final Map> customUnmarshallerMap;
+-
+-    public JsonUnmarshallerContextImpl(JsonParser jsonParser,
+-                                       Map, Unmarshaller> mapper,
+-                                       HttpResponse httpResponse) {
+-        this(jsonParser,
+-             mapper,
+-             Collections.>emptyMap(),
+-             httpResponse);
+-    }
+-
+-    public JsonUnmarshallerContextImpl(JsonParser jsonParser,
+-                                       Map, Unmarshaller> mapper,
+-                                       Map> customUnmarshallerMap,
+-                                       HttpResponse httpResponse) {
+-        this.jsonParser = jsonParser;
+-        this.unmarshallerMap = mapper;
+-        this.customUnmarshallerMap = customUnmarshallerMap;
+-        this.httpResponse = httpResponse;
+-    }
+-
+-    @Override
+-    public String getHeader(String header) {
+-        if (httpResponse == null) return null;
+-
+-        return httpResponse.getHeaders().get(header);
+-    }
+-
+-    @Override
+-    public HttpResponse getHttpResponse() {
+-        return httpResponse;
+-    }
+-
+-    @Override
+-    public int getCurrentDepth() {
+-        int depth = stack.size();
+-        if (currentField != null) depth++;
+-        return depth;
+-    }
+-
+-    @Override
+-    public String readText() throws IOException {
+-
+-        if (isInsideResponseHeader()) {
+-            return getHeader(currentHeader);
+-        }
+-        return readCurrentJsonTokenValue();
+-    }
+-
+-    private String readCurrentJsonTokenValue() throws IOException {
+-        switch (currentToken) {
+-        case VALUE_STRING:
+-            String text = jsonParser.getText();
+-            return text;
+-        case VALUE_FALSE: return "false";
+-        case VALUE_TRUE: return "true";
+-        case VALUE_NULL: return null;
+-        case VALUE_NUMBER_FLOAT:
+-        case VALUE_NUMBER_INT:
+-            return jsonParser.getNumberValue().toString();
+-        case FIELD_NAME:
+-            return jsonParser.getText();
+-        default:
+-            throw new RuntimeException(
+-                    "We expected a VALUE token but got: " + currentToken);
+-        }
+-    }
+-
+-    @Override
+-    public boolean isInsideResponseHeader() {
+-        return currentToken == null && nextToken == null;
+-    }
+-
+-    @Override
+-    public boolean isStartOfDocument() {
+-        return jsonParser == null || jsonParser.getCurrentToken() == null;
+-    }
+-
+-    @Override
+-    public boolean testExpression(String expression) {
+-        if (expression.equals(".")) {
+-            return true;
+-        } else {
+-            if (currentField != null) {
+-                return currentField.equals(expression);
+-            } else {
+-                return (!stack.isEmpty())
+-                        && stack.peek().getField().equals(expression);
+-            }
+-        }
+-    }
+-
+-    @Override
+-    public String getCurrentParentElement() {
+-        String parentElement;
+-        if (currentField != null) {
+-            parentElement = currentField;
+-        } else if ( !stack.isEmpty() ) {
+-            parentElement = stack.peek().getField();
+-        } else {
+-            parentElement = "";
+-        }
+-        return parentElement;
+-    }
+-
+-    @Override
+-    public boolean testExpression(String expression, int stackDepth) {
+-        if (expression.equals(".")) {
+-            return true;
+-        } else {
+-            return testExpression(expression)
+-                    && stackDepth == getCurrentDepth();
+-        }
+-    }
+-
+-    @Override
+-    public JsonToken nextToken() throws IOException {
+-        // Use the value from the nextToken field if
+-        // we've already populated it to peek ahead.
+-        JsonToken token = (nextToken != null) ?
+-                nextToken : jsonParser.nextToken();
+-
+-        this.currentToken = token;
+-        nextToken = null;
+-
+-        updateContext();
+-        return token;
+-    }
+-
+-    @Override
+-    public JsonToken peek() throws IOException {
+-        if (nextToken != null) return nextToken;
+-
+-        nextToken = jsonParser.nextToken();
+-        return nextToken;
+-    }
+-
+-    @Override
+-    public JsonParser getJsonParser() {
+-        return jsonParser;
+-    }
+-
+-    @Override
+-    public Map getMetadata() {
+-        return metadata;
+-    }
+-
+-    @Override
+-    public void setCurrentHeader(String currentHeader) {
+-        this.currentHeader = currentHeader;
+-    }
+-
+-    @Override
+-    public  Unmarshaller getUnmarshaller(Class type) {
+-        return (Unmarshaller) unmarshallerMap.get(type);
+-    }
+-
+-    @Override
+-    public  Unmarshaller getUnmarshaller(Class type, UnmarshallerType unmarshallerType) {
+-        return (Unmarshaller) customUnmarshallerMap.get(unmarshallerType);
+-    }
+-
+-    @Override
+-    public JsonToken getCurrentToken() {
+-        return currentToken;
+-    }
+-
+-    private void updateContext() throws IOException {
+-        lastParsedParentElement = null;
+-        if (currentToken == null) return;
+-
+-        if (currentToken == START_OBJECT || currentToken == START_ARRAY) {
+-            if (currentField != null) {
+-                stack.push(new JsonFieldTokenPair(currentField, currentToken));
+-                currentField = null;
+-            }
+-        } else if (currentToken == END_OBJECT || currentToken == END_ARRAY) {
+-            if (!stack.isEmpty()) {
+-                boolean squareBracketsMatch = currentToken == END_ARRAY && stack.peek().getToken() == START_ARRAY;
+-                boolean curlyBracketsMatch = currentToken == END_OBJECT && stack.peek().getToken() == START_OBJECT;
+-                if (squareBracketsMatch || curlyBracketsMatch) {
+-                    lastParsedParentElement = stack.pop().getField();
+-                }
+-            }
+-            currentField = null;
+-        } else if (currentToken == FIELD_NAME) {
+-            String t = jsonParser.getText();
+-            currentField = t;
+-        }
+-    }
+-
+-    @Override
+-    public String toString() {
+-        StringBuilder stackString = new StringBuilder();
+-
+-        for (JsonFieldTokenPair jsonFieldTokenPair : stack) {
+-            stackString.append("/")
+-                       .append(jsonFieldTokenPair.getField());
+-        }
+-
+-        if (currentField != null) {
+-            stackString.append("/")
+-                       .append(currentField);
+-        }
+-
+-        return stackString.length() == 0 ? "/" : stackString.toString();
+-    }
+-
+-    @Override
+-    public String getLastParsedParentElement() {
+-        return lastParsedParentElement;
+-    }
+-
+-    /**
+-     * An immutable class used to indicate a JSON field value followed by a
+-     * subsequent JSON token. This inner class should only be used by the
+-     * private stack to indicate the current state of the context.
+-     */
+-    private static class JsonFieldTokenPair {
+-        private final String field;
+-        private final JsonToken jsonToken;
+-
+-        /**
+-         * @param fieldString
+-         *            Not null.
+-         * @param token
+-         *            Not null.
+-         */
+-        public JsonFieldTokenPair(String fieldString, JsonToken token) {
+-            field = fieldString;
+-            jsonToken = token;
+-        }
+-
+-        public String getField() {
+-            return field;
+-        }
+-
+-        public JsonToken getToken() {
+-            return jsonToken;
+-        }
+-
+-        public String toString() {
+-            return field + ": " + jsonToken.asString();
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/transform/JsonUnmarshallerContext.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/JsonUnmarshallerContext.java
+--- ./src/main/java/com/amazonaws/transform/JsonUnmarshallerContext.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/JsonUnmarshallerContext.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,231 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.transform;
+-
+-import java.io.IOException;
+-import java.util.Collections;
+-import java.util.Map;
+-
+-import com.amazonaws.http.HttpResponse;
+-import com.fasterxml.jackson.core.JsonParser;
+-import com.fasterxml.jackson.core.JsonToken;
+-
+-/**
+- * Used effectively as the API to access the context of performing the
+- * json-related unmarshalling.
+- * 

+- * For full support, see {@link JsonUnmarshallerContextImpl}
+- * 

+- */
+-public abstract class JsonUnmarshallerContext {
+-
+-    public enum UnmarshallerType {
+-        /**
+-         * @see SimpleTypeJsonUnmarshallers.JsonValueStringUnmarshaller
+-         */
+-        JSON_VALUE
+-    }
+-
+-    /**
+-     * Returns the value of the header with the specified name from the
+-     * response, or null if not present.
+-     *
+-     * @param header
+-     *            The name of the header to lookup.
+-     *
+-     * @return The value of the header with the specified name from the
+-     *         response. Returns null by default or if the header is not
+-     *         present.
+-     */
+-    public String getHeader(String header) {
+-        return null;
+-    }
+-
+-    /**
+-     * Returns the original HttpResponse constructed for this request. Returns
+-     * null by default.
+-     */
+-    public HttpResponse getHttpResponse() {
+-        return null;
+-    }
+-
+-    /**
+-     * Returns the element depth of the parser's current position in the JSON
+-     * document being parsed.
+-     *
+-     * @return The element depth of the parser's current position in the JSON
+-     *         document being parsed. Returns -1 by default.
+-     */
+-    public int getCurrentDepth() {
+-        return -1;
+-    }
+-
+-    /**
+-     * Returns the text of the current token, or throws an exception if the
+-     * current token does not contain text (ex: '{', '}', etc.).
+-     *
+-     * @return The text of the current token. Returns null by default.
+-     *
+-     * @throws IOException
+-     */
+-    public String readText() throws IOException {
+-        return null;
+-    }
+-
+-    /**
+-     * Returns true if parsing of the Json document is yet to start. Returns
+-     * false by default or if the parsing of Json document is not yet started.
+-     */
+-    public boolean isStartOfDocument() {
+-        return false;
+-    }
+-
+-    /**
+-     * Tests the specified expression (a JSON field name) against the current
+-     * position in the JSON document being parsed.
+-     *
+-     * @param expression
+-     *            The field name to test.
+-     * @return True if the expression matches the current document position,
+-     *         Returns false by default and in all other cases.
+-     */
+-    public boolean testExpression(String expression) {
+-        return false;
+-    }
+-
+-    /**
+-     * Returns the name of the JSON field that is the nearest parent of the
+-     * current context.Returns null by default.
+-     */
+-    public String getCurrentParentElement() {
+-        return null;
+-    }
+-
+-    /**
+-     * Tests the specified expression (a JSON field name) against the current
+-     * position in the JSON document being parsed, and restricts the expression
+-     * to matching at the specified stack depth.
+-     *
+-     * @param expression
+-     *            The field name to test.
+-     * @param stackDepth
+-     *            The depth in the stack representing where the expression must
+-     *            start matching in order for this method to return true.
+-     *
+-     * @return True if the specified expression matches the current position in
+-     *         the JSON document, starting from the specified depth. Returns
+-     *         false by default.
+-     */
+-    public boolean testExpression(String expression, int stackDepth) {
+-        return false;
+-    }
+-
+-    /**
+-     * Returns the next JsonToken from the JsonParser. Returns null by default.
+-     */
+-    public JsonToken nextToken() throws IOException {
+-        return null;
+-    }
+-
+-    /**
+-     * Returns the JsonToken which is to be parsed next. Returns null by
+-     * default.
+-     */
+-    public JsonToken peek() throws IOException {
+-        return null;
+-    }
+-
+-    /**
+-     * Returns the JsonParser used for parsing the Json document. Returns null
+-     * by default.
+-     */
+-    public JsonParser getJsonParser() {
+-        return null;
+-    }
+-
+-    /**
+-     * Returns any metadata collected through metadata expressions while this
+-     * context was reading the JSON events from the JSON document.
+-     *
+-     * @return A map of any metadata collected through metadata expressions
+-     *         while this context was reading the JSON document. Returns an
+-     *         empty map by default.
+-     */
+-    public Map getMetadata() {
+-        return Collections.emptyMap();
+-    }
+-
+-    /**
+-     * Registers an expression, which if matched, will cause the data for the
+-     * matching element to be stored in the metadata map under the specified
+-     * key.
+-     *
+-     * @param expression
+-     *            The expression an element must match in order for it's data to
+-     *            be pulled out and stored in the metadata map.
+-     * @param targetDepth
+-     *            The depth in the JSON document where the expression match must
+-     *            start.
+-     * @param storageKey
+-     *            The key under which to store the matching element's data.
+-     */
+-    public void registerMetadataExpression(String expression, int targetDepth,
+-            String storageKey) {
+-    }
+-
+-    /**
+-     * Sets the name of the response header that is to be read next.
+-     */
+-    public void setCurrentHeader(String currentHeader) {
+-    }
+-
+-    /**
+-     * Returns the current JsonToken that is to be parsed by the parser. Returns
+-     * null by default.
+-     */
+-    public JsonToken getCurrentToken() {
+-        return null;
+-    }
+-
+-    /**
+-     * This will return the deleted string in stackString when doing update on
+-     * the stack. Returns null by default.
+-     */
+-    public String getLastParsedParentElement() {
+-        return null;
+-    }
+-
+-    /**
+-     * Returns true if the JsonUnmarshallerContext is involved in
+-     * parsing response headers. Else returns false. Returns true by default.
+-     */
+-    public boolean isInsideResponseHeader() {
+-        return true;
+-    }
+-
+-    /**
+-     * Returns the JsonUnmarshaller for the specified scalar type. Returns null by default.
+-     */
+-    public  Unmarshaller getUnmarshaller(Class type) {
+-        return null;
+-    }
+-
+-    /**
+-     * Returns the JsonUnmarshaller for requested custom unmarshaller type. Returns null by default.
+-     */
+-    public  Unmarshaller getUnmarshaller(Class type, UnmarshallerType unmarshallerType) {
+-        return null;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/transform/LegacyErrorUnmarshaller.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/LegacyErrorUnmarshaller.java
+--- ./src/main/java/com/amazonaws/transform/LegacyErrorUnmarshaller.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/LegacyErrorUnmarshaller.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,120 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- * 
+- *  http://aws.amazon.com/apache2.0
+- * 
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.transform;
+-
+-import static com.amazonaws.util.XpathUtils.asString;
+-import static com.amazonaws.util.XpathUtils.xpath;
+-
+-import java.lang.reflect.Constructor;
+-
+-import javax.xml.xpath.XPath;
+-
+-import org.w3c.dom.Node;
+-
+-import com.amazonaws.AmazonServiceException;
+-import com.amazonaws.AmazonServiceException.ErrorType;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-/**
+- * Unmarshalls an AWS error response into an AmazonServiceException, or
+- * optionally, a subclass of AmazonServiceException if this class is extended.
+- */
+-@SdkProtectedApi
+-public class LegacyErrorUnmarshaller implements Unmarshaller {
+-    /**
+-     * The type of AmazonServiceException that will be instantiated. Subclasses
+-     * specialized for a specific type of exception can control this through the
+-     * protected constructor.
+-     */
+-    private final Class exceptionClass;
+-
+-    /**
+-     * Constructs a new unmarshaller that will unmarshall AWS error responses as
+-     * a generic AmazonServiceException object.
+-     */
+-    public LegacyErrorUnmarshaller() {
+-        this(AmazonServiceException.class);
+-    }
+-
+-    /**
+-     * Constructor allowing subclasses to specify a specific type of
+-     * AmazonServiceException to instantiating when populating the exception
+-     * object with data from the AWS error response.
+-     *
+-     * @param exceptionClass
+-     *            The class of AmazonServiceException to create and populate
+-     *            when unmarshalling the AWS error response.
+-     */
+-    public LegacyErrorUnmarshaller(Class exceptionClass) {
+-        this.exceptionClass = exceptionClass;
+-    }
+-
+-    @Override
+-    public AmazonServiceException unmarshall(Node in) throws Exception {
+-        XPath xpath = xpath();
+-        String errorCode = parseErrorCode(in, xpath);
+-        String message = asString("Response/Errors/Error/Message", in, xpath);
+-        String requestId = asString("Response/RequestID", in, xpath);
+-        String errorType = asString("Response/Errors/Error/Type", in, xpath);
+-
+-        Constructor constructor = exceptionClass.getConstructor(String.class);
+-        AmazonServiceException ase = constructor.newInstance(message);
+-        ase.setErrorCode(errorCode);
+-        ase.setRequestId(requestId);
+-
+-        if (errorType == null) {
+-            ase.setErrorType(ErrorType.Unknown);
+-        } else if (errorType.equalsIgnoreCase("server")) {
+-            ase.setErrorType(ErrorType.Service);
+-        } else if (errorType.equalsIgnoreCase("client")) {
+-            ase.setErrorType(ErrorType.Client);
+-        }
+-
+-        return ase;
+-    }
+-
+-    /**
+-     * Returns the AWS error code for the specified error response.
+-     *
+-     * @param in
+-     *            The DOM tree node containing the error response.
+-     *
+-     * @return The AWS error code contained in the specified error response.
+-     *
+-     * @throws Exception
+-     *             If any problems were encountered pulling out the AWS error
+-     *             code.
+-     */
+-    public String parseErrorCode(Node in) throws Exception {
+-        return asString("Response/Errors/Error/Code", in);
+-    }
+-
+-    public String parseErrorCode(Node in, XPath xpath) throws Exception {
+-        return asString("Response/Errors/Error/Code", in, xpath);
+-    }
+-
+-    /**
+-     * Returns the path to the specified property within an error response.
+-     *
+-     * @param property
+-     *            The name of the desired property.
+-     *
+-     * @return The path to the specified property within an error message.
+-     */
+-    public String getErrorPropertyPath(String property) {
+-        return "Response/Errors/Error/" + property;
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/transform/ListUnmarshaller.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/ListUnmarshaller.java
+--- ./src/main/java/com/amazonaws/transform/ListUnmarshaller.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/ListUnmarshaller.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,96 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.transform;
+-
+-import com.fasterxml.jackson.core.JsonToken;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-import static com.fasterxml.jackson.core.JsonToken.END_ARRAY;
+-
+-/**
+- * This unmarshaller assumes that the start array token as already been consumed before getting
+- * control of the context.
+- */
+-public class ListUnmarshaller implements
+-        Unmarshaller, JsonUnmarshallerContext> {
+-
+-    private final Unmarshaller itemUnmarshaller;
+-
+-    public ListUnmarshaller(
+-            Unmarshaller itemUnmarshaller) {
+-        this.itemUnmarshaller = itemUnmarshaller;
+-    }
+-
+-    /**
+-     * Unmarshalls the response headers or the json doc in the payload to the
+-     * list
+-     */
+-    public List unmarshall(JsonUnmarshallerContext context) throws Exception {
+-        if (context.isInsideResponseHeader()) {
+-            return unmarshallResponseHeaderToList(context);
+-        }
+-        return unmarshallJsonToList(context);
+-    }
+-
+-    /**
+-     * Un marshalls the response header into the list.
+-     */
+-    private List unmarshallResponseHeaderToList(
+-            JsonUnmarshallerContext context) throws Exception {
+-
+-        String headerValue = context.readText();
+-
+-        List list = new ArrayList();
+-
+-        String[] headerValues = headerValue.split("[,]");
+-
+-        for (final String headerVal : headerValues) {
+-            list.add(itemUnmarshaller.unmarshall(new JsonUnmarshallerContext() {
+-                @Override
+-                public String readText() {
+-                    return headerVal;
+-                }
+-            }));
+-        }
+-        return list;
+-    }
+-
+-    /**
+-     * Unmarshalls the current token in the Json document to list.
+-     */
+-    private List unmarshallJsonToList(JsonUnmarshallerContext context)
+-            throws Exception {
+-        List list = new ArrayList();
+-
+-        if (context.getCurrentToken() == JsonToken.VALUE_NULL) {
+-            return null;
+-        }
+-
+-        while (true) {
+-            JsonToken token = context.nextToken();
+-            if (token == null) {
+-                return list;
+-            }
+-
+-            if (token == END_ARRAY) {
+-                return list;
+-            } else {
+-                list.add(itemUnmarshaller.unmarshall(context));
+-            }
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/transform/MapEntry.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/MapEntry.java
+--- ./src/main/java/com/amazonaws/transform/MapEntry.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/MapEntry.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,58 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.transform;
+-
+-import java.util.Map;
+-
+-/**
+- * Simple implementation of the Map.Entry interface.
+- *
+- * @param 
+- *            The type of the key held in this map entry.
+- * @param 
+- *            The type of the value held in this map entry.
+- */
+-public class MapEntry implements Map.Entry {
+-    private K key;
+-    private V value;
+-
+-    /* (non-Javadoc)
+-     * @see java.util.Map.Entry#getKey()
+-     */
+-    public K getKey() {
+-        return key;
+-    }
+-
+-    /* (non-Javadoc)
+-     * @see java.util.Map.Entry#getValue()
+-     */
+-    public V getValue() {
+-        return value;
+-    }
+-
+-    /* (non-Javadoc)
+-     * @see java.util.Map.Entry#setValue(java.lang.Object)
+-     */
+-    public V setValue(V value) {
+-        this.value = value;
+-        return this.value;
+-    }
+-
+-    public K setKey(K key) {
+-        this.key = key;
+-        return this.key;
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/transform/MapUnmarshaller.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/MapUnmarshaller.java
+--- ./src/main/java/com/amazonaws/transform/MapUnmarshaller.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/MapUnmarshaller.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,60 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.transform;
+-
+-import static com.fasterxml.jackson.core.JsonToken.END_ARRAY;
+-import static com.fasterxml.jackson.core.JsonToken.END_OBJECT;
+-import static com.fasterxml.jackson.core.JsonToken.FIELD_NAME;
+-
+-import java.util.HashMap;
+-import java.util.Map;
+-
+-import com.fasterxml.jackson.core.JsonToken;
+-
+-
+-public class MapUnmarshaller implements Unmarshaller, JsonUnmarshallerContext> {
+-
+-    private final Unmarshaller keyUnmarshaller;
+-    private final Unmarshaller valueUnmarshaller;
+-
+-    public MapUnmarshaller(Unmarshaller keyUnmarshaller, Unmarshaller valueUnmarshaller) {
+-        this.keyUnmarshaller = keyUnmarshaller;
+-        this.valueUnmarshaller = valueUnmarshaller;
+-    }
+-
+-    public Map unmarshall(JsonUnmarshallerContext context) throws Exception {
+-        Map map = new HashMap();
+-        int originalDepth = context.getCurrentDepth();
+-
+-        if (context.getCurrentToken() == JsonToken.VALUE_NULL) {
+-            return null;
+-        }
+-
+-        while (true) {
+-            JsonToken token = context.nextToken();
+-            if (token == null) return map;
+-
+-            if (token == FIELD_NAME) {
+-                K k = keyUnmarshaller.unmarshall(context);
+-                token = context.nextToken();
+-                V v = valueUnmarshaller.unmarshall(context);
+-                map.put(k, v);
+-            } else if (token == END_ARRAY || token == END_OBJECT) {
+-                if (context.getCurrentDepth() <= originalDepth) return map;
+-            }
+-        }
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/transform/Marshaller.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/Marshaller.java
+--- ./src/main/java/com/amazonaws/transform/Marshaller.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/Marshaller.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,22 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.transform;
+-
+-
+-public interface Marshaller {
+-
+-    T marshall(R in);
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/transform/PathMarshallers.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/PathMarshallers.java
+--- ./src/main/java/com/amazonaws/transform/PathMarshallers.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/PathMarshallers.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,140 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.transform;
+-
+-import com.amazonaws.util.IdempotentUtils;
+-import com.amazonaws.util.SdkHttpUtils;
+-import com.amazonaws.util.StringUtils;
+-
+-import static com.amazonaws.util.ValidationUtils.assertNotNull;
+-import static com.amazonaws.util.ValidationUtils.assertStringNotEmpty;
+-
+-public class PathMarshallers {
+-
+-    /**
+-     * Marshaller for non greedy path labels. Value is URL encoded and then replaced in the request URI.
+-     */
+-    public static final PathMarshaller NON_GREEDY = new NonGreedyPathMarshaller();
+-
+-    /**
+-     * Marshaller for greedy path labels. Value is not URL encoded and replaced in the request URI.
+-     */
+-    public static final PathMarshaller GREEDY = new GreedyPathMarshaller();
+-
+-    /**
+-     * Marshaller for members marked with the idempotency trait. If the path value is null, a value will
+-     * be auto generated by the SDK.
+-     */
+-    public static final PathMarshaller IDEMPOTENCY = new IdempotencyPathMarshaller();
+-
+-    /**
+-     * Interface for marshalling to a path parameter.
+-     */
+-    public interface PathMarshaller {
+-
+-        /**
+-         * @param resourcePath Current resource path with path param placeholder
+-         * @param paramName    Name of parameter (i.e. placeholder value {Foo})
+-         * @param pathValue    String value of path parameter.
+-         * @return New URI with placeholder replaced with marshalled value.
+-         */
+-        String marshall(String resourcePath, String paramName, String pathValue);
+-
+-        /**
+-         * @param resourcePath Current resource path with path param placeholder
+-         * @param paramName    Name of parameter (i.e. placeholder value {Foo})
+-         * @param pathValue    Integer value of path parameter.
+-         * @return New URI with placeholder replaced with marshalled value.
+-         */
+-        String marshall(String resourcePath, String paramName, Integer pathValue);
+-
+-        /**
+-         * @param resourcePath Current resource path with path param placeholder
+-         * @param paramName    Name of parameter (i.e. placeholder value {Foo})
+-         * @param pathValue    Long value of path parameter.
+-         * @return New URI with placeholder replaced with marshalled value.
+-         */
+-        String marshall(String resourcePath, String paramName, Long pathValue);
+-    }
+-
+-    private static class NonGreedyPathMarshaller implements PathMarshaller {
+-        @Override
+-        public String marshall(String resourcePath, String paramName, String pathValue) {
+-            assertStringNotEmpty(pathValue, paramName);
+-            return resourcePath.replace(String.format("{%s}", paramName), SdkHttpUtils.urlEncode(pathValue, false));
+-        }
+-
+-        @Override
+-        public String marshall(String resourcePath, String paramName, Integer pathValue) {
+-            assertNotNull(pathValue, paramName);
+-            return marshall(resourcePath, paramName, StringUtils.fromInteger(pathValue));
+-        }
+-
+-        @Override
+-        public String marshall(String resourcePath, String paramName, Long pathValue) {
+-            assertNotNull(pathValue, paramName);
+-            return marshall(resourcePath, paramName, StringUtils.fromLong(pathValue));
+-        }
+-    }
+-
+-    private static class GreedyPathMarshaller implements PathMarshaller {
+-
+-        @Override
+-        public String marshall(String resourcePath, String paramName, String pathValue) {
+-            assertStringNotEmpty(pathValue, paramName);
+-            return resourcePath.replace(String.format("{%s+}", paramName), trimLeadingSlash(pathValue));
+-        }
+-
+-        @Override
+-        public String marshall(String resourcePath, String paramName, Integer pathValue) {
+-            assertNotNull(pathValue, paramName);
+-            return marshall(resourcePath, paramName, StringUtils.fromInteger(pathValue));
+-        }
+-
+-        @Override
+-        public String marshall(String resourcePath, String paramName, Long pathValue) {
+-            assertNotNull(pathValue, paramName);
+-            return marshall(resourcePath, paramName, StringUtils.fromLong(pathValue));
+-        }
+-    }
+-
+-    private static class IdempotencyPathMarshaller implements PathMarshaller {
+-        @Override
+-        public String marshall(String resourcePath, String paramName, String pathValue) {
+-            if (pathValue != null && pathValue.isEmpty()) {
+-                throw new IllegalArgumentException(paramName + " must not be empty. If not set a value will be auto generated");
+-            }
+-            return resourcePath.replace(String.format("{%s}", paramName),
+-                                        SdkHttpUtils.urlEncode(IdempotentUtils.resolveString(pathValue), false));
+-        }
+-
+-        @Override
+-        public String marshall(String resourcePath, String paramName, Integer pathValue) {
+-            throw new UnsupportedOperationException("Integer idempotency tokens not yet supported");
+-        }
+-
+-        @Override
+-        public String marshall(String resourcePath, String paramName, Long pathValue) {
+-            throw new UnsupportedOperationException("Long idempotency tokens not yet supported");
+-        }
+-    }
+-
+-    private static String trimLeadingSlash(String value) {
+-        if (value.startsWith("/")) {
+-            return value.replaceFirst("/", "");
+-        }
+-        return value;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/transform/SimpleTypeCborUnmarshallers.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/SimpleTypeCborUnmarshallers.java
+--- ./src/main/java/com/amazonaws/transform/SimpleTypeCborUnmarshallers.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/SimpleTypeCborUnmarshallers.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,223 +0,0 @@
+-/*
+- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.transform;
+-import java.math.BigDecimal;
+-import java.math.BigInteger;
+-import java.nio.ByteBuffer;
+-import java.util.Date;
+-
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.fasterxml.jackson.core.JsonParser;
+-import com.fasterxml.jackson.core.JsonToken;
+-
+-@SdkProtectedApi
+-public class SimpleTypeCborUnmarshallers {
+-    /**
+-     * Unmarshaller for String values.
+-     */
+-    public static class StringCborUnmarshaller implements Unmarshaller {
+-        public String unmarshall(JsonUnmarshallerContext unmarshallerContext) throws Exception {
+-            return unmarshallerContext.readText();
+-        }
+-
+-        private static final StringCborUnmarshaller instance = new StringCborUnmarshaller();
+-
+-        public static StringCborUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Double values.
+-     */
+-    public static class DoubleCborUnmarshaller implements Unmarshaller {
+-        public Double unmarshall(JsonUnmarshallerContext unmarshallerContext) throws Exception {
+-            return unmarshallerContext.getJsonParser().getDoubleValue();
+-        }
+-
+-        private static final DoubleCborUnmarshaller instance = new DoubleCborUnmarshaller();
+-
+-        public static DoubleCborUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Integer values.
+-     */
+-    public static class IntegerCborUnmarshaller implements Unmarshaller {
+-        public Integer unmarshall(JsonUnmarshallerContext unmarshallerContext) throws Exception {
+-            return unmarshallerContext.getJsonParser().getIntValue();
+-        }
+-
+-        private static final IntegerCborUnmarshaller instance = new IntegerCborUnmarshaller();
+-
+-        public static IntegerCborUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    public static class BigIntegerCborUnmarshaller implements Unmarshaller {
+-        public BigInteger unmarshall(JsonUnmarshallerContext unmarshallerContext) throws Exception {
+-            JsonParser parser = unmarshallerContext.getJsonParser();
+-            JsonToken current = parser.getCurrentToken();
+-            if (current == JsonToken.VALUE_NUMBER_INT) {
+-                return parser.getBigIntegerValue();
+-            } else if (current == JsonToken.VALUE_EMBEDDED_OBJECT) {
+-                Object embedded = parser.getEmbeddedObject();
+-                return new BigInteger((byte[]) embedded);
+-            } else {
+-                throw new SdkClientException("Invalid BigInteger Format.");
+-            }
+-        }
+-
+-        private static final BigIntegerCborUnmarshaller instance = new BigIntegerCborUnmarshaller();
+-
+-        public static BigIntegerCborUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    public static class BigDecimalCborUnmarshaller implements Unmarshaller {
+-        public BigDecimal unmarshall(JsonUnmarshallerContext unmarshallerContext) throws Exception {
+-            JsonParser parser = unmarshallerContext.getJsonParser();
+-            Unmarshaller bigIntegerUnmarshaller = unmarshallerContext.getUnmarshaller(BigInteger.class);
+-
+-            JsonToken current = parser.getCurrentToken();
+-            if (current != JsonToken.START_ARRAY) {
+-                throw new SdkClientException("Invalid BigDecimal Format.");
+-            }
+-            parser.nextToken();
+-            int exponent = parser.getIntValue();
+-            parser.nextToken();
+-            BigInteger mantissa = bigIntegerUnmarshaller.unmarshall(unmarshallerContext);
+-            return new BigDecimal(mantissa, exponent);
+-        }
+-
+-        private static final BigDecimalCborUnmarshaller instance = new BigDecimalCborUnmarshaller();
+-
+-        public static BigDecimalCborUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Boolean values.
+-     */
+-    public static class BooleanCborUnmarshaller implements Unmarshaller {
+-        public Boolean unmarshall(JsonUnmarshallerContext unmarshallerContext) throws Exception {
+-            return unmarshallerContext.getJsonParser().getBooleanValue();
+-        }
+-
+-        private static final BooleanCborUnmarshaller instance = new BooleanCborUnmarshaller();
+-
+-        public static BooleanCborUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Float values.
+-     */
+-    public static class FloatCborUnmarshaller implements Unmarshaller {
+-        public Float unmarshall(JsonUnmarshallerContext unmarshallerContext) throws Exception {
+-            return unmarshallerContext.getJsonParser().getFloatValue();
+-        }
+-
+-        private static final FloatCborUnmarshaller instance = new FloatCborUnmarshaller();
+-
+-        public static FloatCborUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Long values.
+-     */
+-    public static class LongCborUnmarshaller implements Unmarshaller {
+-        public Long unmarshall(JsonUnmarshallerContext unmarshallerContext) throws Exception {
+-            return unmarshallerContext.getJsonParser().getLongValue();
+-        }
+-
+-        private static final LongCborUnmarshaller instance = new LongCborUnmarshaller();
+-
+-        public static LongCborUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Byte values.
+-     */
+-    public static class ByteCborUnmarshaller implements Unmarshaller {
+-        public Byte unmarshall(JsonUnmarshallerContext unmarshallerContext) throws Exception {
+-            return unmarshallerContext.getJsonParser().getByteValue();
+-        }
+-
+-        private static final ByteCborUnmarshaller instance = new ByteCborUnmarshaller();
+-
+-        public static ByteCborUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Date values - JSON dates come in as epoch seconds.
+-     */
+-    public static class DateCborUnmarshaller implements Unmarshaller {
+-        public Date unmarshall(JsonUnmarshallerContext unmarshallerContext)
+-                throws Exception {
+-            return new Date(unmarshallerContext.getJsonParser().getLongValue());
+-        }
+-
+-        private static final DateCborUnmarshaller instance = new DateCborUnmarshaller();
+-
+-        public static DateCborUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for ByteBuffer values.
+-     */
+-    public static class ByteBufferCborUnmarshaller implements Unmarshaller {
+-        public ByteBuffer unmarshall(JsonUnmarshallerContext unmarshallerContext) throws Exception {
+-            return ByteBuffer.wrap(unmarshallerContext.getJsonParser().getBinaryValue());
+-
+-        }
+-
+-        private static final ByteBufferCborUnmarshaller instance = new ByteBufferCborUnmarshaller();
+-
+-        public static ByteBufferCborUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Short values.
+-     */
+-    public static class ShortCborUnmarshaller implements Unmarshaller {
+-        public Short unmarshall(JsonUnmarshallerContext unmarshallerContext) throws Exception {
+-            return unmarshallerContext.getJsonParser().getShortValue();
+-        }
+-
+-        private static final ShortCborUnmarshaller instance = new ShortCborUnmarshaller();
+-
+-        public static ShortCborUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/transform/SimpleTypeIonUnmarshallers.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/SimpleTypeIonUnmarshallers.java
+--- ./src/main/java/com/amazonaws/transform/SimpleTypeIonUnmarshallers.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/SimpleTypeIonUnmarshallers.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,179 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- * 
+- * Licensed under the Apache License, Version 2.0 (the "License"). You may not
+- * use this file except in compliance with the License. A copy of the License is
+- * located at
+- * 
+- * http://aws.amazon.com/apache2.0
+- * 
+- * or in the "license" file accompanying this file. This file is distributed on
+- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.transform;
+-
+-import java.math.BigDecimal;
+-import java.math.BigInteger;
+-import java.nio.ByteBuffer;
+-import java.util.Date;
+-
+-public class SimpleTypeIonUnmarshallers {
+-    public static class StringIonUnmarshaller implements Unmarshaller {
+-        @Override
+-        public String unmarshall(JsonUnmarshallerContext context) throws Exception {
+-            return context.readText();
+-        }
+-
+-        private static final StringIonUnmarshaller instance = new StringIonUnmarshaller();
+-
+-        public static StringIonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-
+-    public static class DoubleIonUnmarshaller implements Unmarshaller {
+-        @Override
+-        public Double unmarshall(JsonUnmarshallerContext context) throws Exception {
+-            return context.getJsonParser().getDoubleValue();
+-        }
+-
+-        private static final DoubleIonUnmarshaller instance = new DoubleIonUnmarshaller();
+-
+-        public static DoubleIonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    public static class IntegerIonUnmarshaller implements Unmarshaller {
+-        @Override
+-        public Integer unmarshall(JsonUnmarshallerContext context) throws Exception {
+-            return context.getJsonParser().getIntValue();
+-        }
+-
+-        private static final IntegerIonUnmarshaller instance = new IntegerIonUnmarshaller();
+-
+-        public static IntegerIonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    public static class BigIntegerIonUnmarshaller implements Unmarshaller {
+-        @Override
+-        public BigInteger unmarshall(JsonUnmarshallerContext context) throws Exception {
+-            return context.getJsonParser().getBigIntegerValue();
+-        }
+-
+-        private static final BigIntegerIonUnmarshaller instance = new BigIntegerIonUnmarshaller();
+-
+-        public static BigIntegerIonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    public static class BigDecimalIonUnmarshaller implements Unmarshaller {
+-        @Override
+-        public BigDecimal unmarshall(JsonUnmarshallerContext context) throws Exception {
+-            return context.getJsonParser().getDecimalValue();
+-        }
+-
+-        private static final BigDecimalIonUnmarshaller instance = new BigDecimalIonUnmarshaller();
+-
+-        public static BigDecimalIonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    public static class BooleanIonUnmarshaller implements Unmarshaller {
+-        @Override
+-        public Boolean unmarshall(JsonUnmarshallerContext context) throws Exception {
+-            return context.getJsonParser().getBooleanValue();
+-        }
+-
+-        private static final BooleanIonUnmarshaller instance = new BooleanIonUnmarshaller();
+-
+-        public static BooleanIonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    public static class FloatIonUnmarshaller implements Unmarshaller {
+-        @Override
+-        public Float unmarshall(JsonUnmarshallerContext context) throws Exception {
+-            return context.getJsonParser().getFloatValue();
+-        }
+-
+-        private static final FloatIonUnmarshaller instance = new FloatIonUnmarshaller();
+-
+-        public static FloatIonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    public static class LongIonUnmarshaller implements Unmarshaller {
+-        @Override
+-        public Long unmarshall(JsonUnmarshallerContext context) throws Exception {
+-            return context.getJsonParser().getLongValue();
+-        }
+-
+-        private static final LongIonUnmarshaller instance = new LongIonUnmarshaller();
+-
+-        public static LongIonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    public static class ByteIonUnmarshaller implements Unmarshaller {
+-        @Override
+-        public Byte unmarshall(JsonUnmarshallerContext context) throws Exception {
+-            return context.getJsonParser().getByteValue();
+-        }
+-
+-        private static final ByteIonUnmarshaller instance = new ByteIonUnmarshaller();
+-
+-        public static ByteIonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    public static class DateIonUnmarshaller implements Unmarshaller {
+-        @Override
+-        public Date unmarshall(JsonUnmarshallerContext context) throws Exception {
+-            return (Date) context.getJsonParser().getEmbeddedObject();
+-        }
+-
+-        private static final DateIonUnmarshaller instance = new DateIonUnmarshaller();
+-
+-        public static DateIonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    public static class ByteBufferIonUnmarshaller implements Unmarshaller {
+-        @Override
+-        public ByteBuffer unmarshall(JsonUnmarshallerContext context) throws Exception {
+-            return (ByteBuffer) context.getJsonParser().getEmbeddedObject();
+-        }
+-
+-        private static final ByteBufferIonUnmarshaller instance = new ByteBufferIonUnmarshaller();
+-
+-        public static ByteBufferIonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    public static class ShortIonUnmarshaller implements Unmarshaller {
+-        @Override
+-        public Short unmarshall(JsonUnmarshallerContext context) throws Exception {
+-            return context.getJsonParser().getShortValue();
+-        }
+-
+-        private static final ShortIonUnmarshaller instance = new ShortIonUnmarshaller();
+-
+-        public static ShortIonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/transform/SimpleTypeJsonUnmarshallers.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/SimpleTypeJsonUnmarshallers.java
+--- ./src/main/java/com/amazonaws/transform/SimpleTypeJsonUnmarshallers.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/SimpleTypeJsonUnmarshallers.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,264 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.transform;
+-
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.util.Base64;
+-import com.amazonaws.util.DateUtils;
+-import com.fasterxml.jackson.core.JsonToken;
+-import java.math.BigDecimal;
+-import java.math.BigInteger;
+-import java.nio.ByteBuffer;
+-import java.nio.charset.Charset;
+-import java.util.Date;
+-
+-public class SimpleTypeJsonUnmarshallers {
+-    /**
+-     * Unmarshaller for String values.
+-     */
+-    public static class StringJsonUnmarshaller implements Unmarshaller {
+-        public String unmarshall(JsonUnmarshallerContext unmarshallerContext) throws Exception {
+-            return unmarshallerContext.readText();
+-        }
+-
+-        private static final StringJsonUnmarshaller instance = new StringJsonUnmarshaller();
+-
+-        public static StringJsonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for fields with JSON values. For headers, JSON values are base-64 encoded and are decoded here. For payloads,
+-     * JSON values are treated like normal strings.
+-     */
+-    public static class JsonValueStringUnmarshaller extends StringJsonUnmarshaller {
+-        public String unmarshall(JsonUnmarshallerContext unmarshallerContext) throws Exception {
+-            String stringValue = super.unmarshall(unmarshallerContext);
+-            return !unmarshallerContext.isInsideResponseHeader()
+-                   ? stringValue
+-                   : new String(Base64.decode(stringValue), Charset.forName("utf-8"));
+-        }
+-
+-        private static final JsonValueStringUnmarshaller INSTANCE = new JsonValueStringUnmarshaller();
+-        public static JsonValueStringUnmarshaller getInstance() {
+-            return INSTANCE;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Double values.
+-     */
+-    public static class DoubleJsonUnmarshaller implements Unmarshaller {
+-        public Double unmarshall(JsonUnmarshallerContext unmarshallerContext) throws Exception {
+-            String doubleString = unmarshallerContext.readText();
+-            return (doubleString == null) ? null : Double.parseDouble(doubleString);
+-        }
+-
+-        private static final DoubleJsonUnmarshaller instance = new DoubleJsonUnmarshaller();
+-
+-        public static DoubleJsonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Integer values.
+-     */
+-    public static class IntegerJsonUnmarshaller implements Unmarshaller {
+-        public Integer unmarshall(JsonUnmarshallerContext unmarshallerContext) throws Exception {
+-            String intString = unmarshallerContext.readText();
+-            return (intString == null) ? null : Integer.parseInt(intString);
+-        }
+-
+-        private static final IntegerJsonUnmarshaller instance = new IntegerJsonUnmarshaller();
+-
+-        public static IntegerJsonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    public static class BigIntegerJsonUnmarshaller implements Unmarshaller {
+-        public BigInteger unmarshall(JsonUnmarshallerContext unmarshallerContext) throws Exception {
+-            String intString = unmarshallerContext.readText();
+-            return (intString == null) ? null : new BigInteger(intString);
+-        }
+-
+-        private static final BigIntegerJsonUnmarshaller instance = new BigIntegerJsonUnmarshaller();
+-
+-        public static BigIntegerJsonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    public static class BigDecimalJsonUnmarshaller implements Unmarshaller {
+-        public BigDecimal unmarshall(JsonUnmarshallerContext unmarshallerContext) throws Exception {
+-            String s = unmarshallerContext.readText();
+-            return (s == null) ? null : new BigDecimal(s);
+-        }
+-
+-        private static final BigDecimalJsonUnmarshaller instance = new BigDecimalJsonUnmarshaller();
+-
+-        public static BigDecimalJsonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Boolean values.
+-     */
+-    public static class BooleanJsonUnmarshaller implements Unmarshaller {
+-        public Boolean unmarshall(JsonUnmarshallerContext unmarshallerContext) throws Exception {
+-            String booleanString = unmarshallerContext.readText();
+-            return (booleanString == null) ? null : Boolean.parseBoolean(booleanString);
+-        }
+-
+-        private static final BooleanJsonUnmarshaller instance = new BooleanJsonUnmarshaller();
+-
+-        public static BooleanJsonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Float values.
+-     */
+-    public static class FloatJsonUnmarshaller implements Unmarshaller {
+-        public Float unmarshall(JsonUnmarshallerContext unmarshallerContext) throws Exception {
+-            String floatString = unmarshallerContext.readText();
+-            return (floatString == null) ? null : Float.valueOf(floatString);
+-        }
+-
+-        private static final FloatJsonUnmarshaller instance = new FloatJsonUnmarshaller();
+-
+-        public static FloatJsonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Long values.
+-     */
+-    public static class LongJsonUnmarshaller implements Unmarshaller {
+-        public Long unmarshall(JsonUnmarshallerContext unmarshallerContext) throws Exception {
+-            String longString = unmarshallerContext.readText();
+-            return (longString == null) ? null : Long.parseLong(longString);
+-        }
+-
+-        private static final LongJsonUnmarshaller instance = new LongJsonUnmarshaller();
+-
+-        public static LongJsonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Byte values.
+-     */
+-    public static class ByteJsonUnmarshaller implements Unmarshaller {
+-        public Byte unmarshall(JsonUnmarshallerContext unmarshallerContext) throws Exception {
+-            String byteString = unmarshallerContext.readText();
+-            return (byteString == null) ? null : Byte.valueOf(byteString);
+-        }
+-
+-        private static final ByteJsonUnmarshaller instance = new ByteJsonUnmarshaller();
+-
+-        public static ByteJsonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Date values - JSON dates come in as epoch seconds for AWS services and ISO8601 string
+-     * for API Gateway fronted services..
+-     */
+-    public static class DateJsonUnmarshaller implements Unmarshaller {
+-        public Date unmarshall(JsonUnmarshallerContext unmarshallerContext)
+-                throws Exception {
+-            // If value is string, assume ISO8601. Otherwise parse as epoch seconds.
+-            if (unmarshallerContext.getCurrentToken() == JsonToken.VALUE_STRING) {
+-                return DateUtils.parseISO8601Date(unmarshallerContext.readText());
+-            } else {
+-                return DateUtils.parseServiceSpecificDate(unmarshallerContext.readText());
+-            }
+-        }
+-
+-        private static final DateJsonUnmarshaller instance = new DateJsonUnmarshaller();
+-
+-        public static DateJsonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for ByteBuffer values.
+-     */
+-    public static class ByteBufferJsonUnmarshaller implements Unmarshaller {
+-        public ByteBuffer unmarshall(JsonUnmarshallerContext unmarshallerContext) throws Exception {
+-            String base64EncodedString = unmarshallerContext.readText();
+-            if (base64EncodedString == null) {
+-                return null;
+-            }
+-            byte[] decodedBytes = Base64.decode(base64EncodedString);
+-            return ByteBuffer.wrap(decodedBytes);
+-
+-        }
+-
+-        private static final ByteBufferJsonUnmarshaller instance = new ByteBufferJsonUnmarshaller();
+-
+-        public static ByteBufferJsonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Character values.
+-     */
+-    public static class CharacterJsonUnmarshaller implements Unmarshaller {
+-        public Character unmarshall(JsonUnmarshallerContext unmarshallerContext) throws Exception {
+-            String charString = unmarshallerContext.readText();
+-
+-            if (charString == null) return null;
+-
+-            charString = charString.trim();
+-            if (charString.isEmpty() || charString.length() > 1)
+-                throw new SdkClientException("'" + charString
+-                        + "' cannot be converted to Character");
+-            return Character.valueOf(charString.charAt(0));
+-        }
+-
+-        private static final CharacterJsonUnmarshaller instance = new CharacterJsonUnmarshaller();
+-
+-        public static CharacterJsonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Short values.
+-     */
+-    public static class ShortJsonUnmarshaller implements Unmarshaller {
+-        public Short unmarshall(JsonUnmarshallerContext unmarshallerContext) throws Exception {
+-            String shortString = unmarshallerContext.readText();
+-            return (shortString == null) ? null : Short.valueOf(shortString);
+-        }
+-
+-        private static final ShortJsonUnmarshaller instance = new ShortJsonUnmarshaller();
+-
+-        public static ShortJsonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/transform/SimpleTypeStaxUnmarshallers.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/SimpleTypeStaxUnmarshallers.java
+--- ./src/main/java/com/amazonaws/transform/SimpleTypeStaxUnmarshallers.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/SimpleTypeStaxUnmarshallers.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,254 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.transform;
+-
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.util.Base64;
+-import com.amazonaws.util.DateUtils;
+-
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-
+-import java.math.BigDecimal;
+-import java.math.BigInteger;
+-import java.nio.ByteBuffer;
+-import java.util.Date;
+-
+-/**
+- * Collection of StAX unmarshallers for simple data types.
+- */
+-public class SimpleTypeStaxUnmarshallers {
+-    /** Shared logger */
+-    private static Log log = LogFactory.getLog(SimpleTypeStaxUnmarshallers.class);
+-
+-    /**
+-     * Unmarshaller for String values.
+-     */
+-    public static class StringStaxUnmarshaller implements Unmarshaller {
+-        public String unmarshall(StaxUnmarshallerContext unmarshallerContext) throws Exception {
+-            return unmarshallerContext.readText();
+-        }
+-
+-        private static final StringStaxUnmarshaller instance = new StringStaxUnmarshaller();
+-
+-        public static StringStaxUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    public static class BigDecimalStaxUnmarshaller implements Unmarshaller {
+-        public BigDecimal unmarshall(StaxUnmarshallerContext unmarshallerContext)
+-                throws Exception {
+-            String s = unmarshallerContext.readText();
+-            return (s == null) ? null : new BigDecimal(s);
+-        }
+-
+-        private static final BigDecimalStaxUnmarshaller instance = new BigDecimalStaxUnmarshaller();
+-
+-        public static BigDecimalStaxUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    public static class BigIntegerStaxUnmarshaller implements Unmarshaller {
+-        public BigInteger unmarshall(StaxUnmarshallerContext unmarshallerContext)
+-                throws Exception {
+-            String s = unmarshallerContext.readText();
+-            return (s == null) ? null : new BigInteger(s);
+-        }
+-
+-        private static final BigIntegerStaxUnmarshaller instance = new BigIntegerStaxUnmarshaller();
+-
+-        public static BigIntegerStaxUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Double values.
+-     */
+-    public static class DoubleStaxUnmarshaller implements Unmarshaller {
+-        public Double unmarshall(StaxUnmarshallerContext unmarshallerContext) throws Exception {
+-            String doubleString = unmarshallerContext.readText();
+-            return (doubleString == null) ? null : Double.parseDouble(doubleString);
+-        }
+-
+-        private static final DoubleStaxUnmarshaller instance = new DoubleStaxUnmarshaller();
+-
+-        public static DoubleStaxUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Integer values.
+-     */
+-    public static class IntegerStaxUnmarshaller implements Unmarshaller {
+-        public Integer unmarshall(StaxUnmarshallerContext unmarshallerContext) throws Exception {
+-            String intString = unmarshallerContext.readText();
+-            return (intString == null) ? null : Integer.parseInt(intString);
+-        }
+-
+-        private static final IntegerStaxUnmarshaller instance = new IntegerStaxUnmarshaller();
+-
+-        public static IntegerStaxUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Boolean values.
+-     */
+-    public static class BooleanStaxUnmarshaller implements Unmarshaller {
+-        public Boolean unmarshall(StaxUnmarshallerContext unmarshallerContext) throws Exception {
+-            String booleanString = unmarshallerContext.readText();
+-            return (booleanString == null) ? null : Boolean.parseBoolean(booleanString);
+-        }
+-
+-        private static final BooleanStaxUnmarshaller instance = new BooleanStaxUnmarshaller();
+-
+-        public static BooleanStaxUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Float values.
+-     */
+-    public static class FloatStaxUnmarshaller implements Unmarshaller {
+-        public Float unmarshall(StaxUnmarshallerContext unmarshallerContext) throws Exception {
+-            String floatString = unmarshallerContext.readText();
+-            return (floatString == null) ? null : Float.valueOf(floatString);
+-        }
+-
+-        private static final FloatStaxUnmarshaller instance = new FloatStaxUnmarshaller();
+-
+-        public static FloatStaxUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Long values.
+-     */
+-    public static class LongStaxUnmarshaller implements Unmarshaller {
+-        public Long unmarshall(StaxUnmarshallerContext unmarshallerContext) throws Exception {
+-            String longString = unmarshallerContext.readText();
+-            return (longString == null) ? null : Long.parseLong(longString);
+-        }
+-
+-        private static final LongStaxUnmarshaller instance = new LongStaxUnmarshaller();
+-
+-        public static LongStaxUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Byte values.
+-     */
+-    public static class ByteStaxUnmarshaller implements Unmarshaller {
+-        public Byte unmarshall(StaxUnmarshallerContext unmarshallerContext) throws Exception {
+-            String byteString = unmarshallerContext.readText();
+-            return (byteString == null) ? null : Byte.valueOf(byteString);
+-        }
+-
+-        private static final ByteStaxUnmarshaller instance = new ByteStaxUnmarshaller();
+-
+-        public static ByteStaxUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Date values.
+-     */
+-    public static class DateStaxUnmarshaller implements Unmarshaller {
+-        public Date unmarshall(StaxUnmarshallerContext unmarshallerContext) throws Exception {
+-            String dateString = unmarshallerContext.readText();
+-            if (dateString == null) return null;
+-
+-            try {
+-                return DateUtils.parseISO8601Date(dateString);
+-            } catch (Exception e) {
+-                log.warn("Unable to parse date '" + dateString + "':  " + e.getMessage(), e);
+-                return null;
+-            }
+-        }
+-
+-        private static final DateStaxUnmarshaller instance = new DateStaxUnmarshaller();
+-
+-        public static DateStaxUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for ByteBuffer values.
+-     */
+-    public static class ByteBufferStaxUnmarshaller implements Unmarshaller {
+-        public ByteBuffer unmarshall(StaxUnmarshallerContext unmarshallerContext) throws Exception {
+-            String base64EncodedString = unmarshallerContext.readText();
+-            byte[] decodedBytes = Base64.decode(base64EncodedString);
+-            return ByteBuffer.wrap(decodedBytes);
+-
+-        }
+-
+-        private static final ByteBufferStaxUnmarshaller instance = new ByteBufferStaxUnmarshaller();
+-
+-        public static ByteBufferStaxUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Character values.
+-     */
+-    public static class CharacterJsonUnmarshaller implements Unmarshaller {
+-        public Character unmarshall(StaxUnmarshallerContext unmarshallerContext) throws Exception {
+-            String charString = unmarshallerContext.readText();
+-
+-            if (charString == null) return null;
+-
+-            charString = charString.trim();
+-            if (charString.isEmpty() || charString.length() > 1)
+-                throw new SdkClientException("'" + charString
+-                        + "' cannot be converted to Character");
+-            return Character.valueOf(charString.charAt(0));
+-        }
+-
+-        private static final CharacterJsonUnmarshaller instance = new CharacterJsonUnmarshaller();
+-
+-        public static CharacterJsonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-
+-    /**
+-     * Unmarshaller for Short values.
+-     */
+-    public static class ShortJsonUnmarshaller implements Unmarshaller {
+-        public Short unmarshall(StaxUnmarshallerContext unmarshallerContext) throws Exception {
+-            String shortString = unmarshallerContext.readText();
+-            return (shortString == null) ? null : Short.valueOf(shortString);
+-        }
+-
+-        private static final ShortJsonUnmarshaller instance = new ShortJsonUnmarshaller();
+-
+-        public static ShortJsonUnmarshaller getInstance() {
+-            return instance;
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/transform/SimpleTypeUnmarshallers.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/SimpleTypeUnmarshallers.java
+--- ./src/main/java/com/amazonaws/transform/SimpleTypeUnmarshallers.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/SimpleTypeUnmarshallers.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,164 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- * 
+- *  http://aws.amazon.com/apache2.0
+- * 
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.transform;
+-
+-import java.nio.ByteBuffer;
+-import java.util.Date;
+-
+-import org.w3c.dom.Node;
+-
+-import com.amazonaws.util.XpathUtils;
+-
+-/**
+- * Collection of unmarshallers for simple data types.
+- */
+-public class SimpleTypeUnmarshallers {
+-    
+-    /**
+-     * Unmarshaller for String values.
+-     */
+-    public static class StringUnmarshaller implements Unmarshaller {
+-        public String unmarshall(Node in) throws Exception {
+-            return XpathUtils.asString(".", in);
+-        }
+-
+-        private static StringUnmarshaller instance;
+-        public static StringUnmarshaller getInstance() {
+-            if (instance == null) instance = new StringUnmarshaller();
+-            return instance;
+-        }
+-    }
+-    
+-    /**
+-     * Unmarshaller for Double values.
+-     */
+-    public static class DoubleUnmarshaller implements Unmarshaller {
+-        public Double unmarshall(Node in) throws Exception {
+-            return XpathUtils.asDouble(".", in);
+-        }
+-        
+-        private static DoubleUnmarshaller instance;
+-        public static DoubleUnmarshaller getInstance() {
+-            if (instance == null) instance = new DoubleUnmarshaller();
+-            return instance;
+-        }
+-    }
+-    
+-    /**
+-     * Unmarshaller for Integer values.
+-     */
+-    public static class IntegerUnmarshaller implements Unmarshaller {
+-        public Integer unmarshall(Node in) throws Exception {
+-            return XpathUtils.asInteger(".", in);
+-        }
+-
+-        private static IntegerUnmarshaller instance;
+-        public static IntegerUnmarshaller getInstance() {
+-            if (instance == null) instance = new IntegerUnmarshaller();
+-            return instance;
+-        }
+-    }
+-    
+-    /**
+-     * Unmarshaller for Boolean values.
+-     */
+-    public static class BooleanUnmarshaller implements Unmarshaller {
+-        public Boolean unmarshall(Node in) throws Exception {
+-            return XpathUtils.asBoolean(".", in);
+-        }
+-
+-        private static BooleanUnmarshaller instance;
+-        public static BooleanUnmarshaller getInstance() {
+-            if (instance == null) instance = new BooleanUnmarshaller();
+-            return instance;
+-        }
+-    }
+-    
+-    /**
+-     * Unmarshaller for Float values.
+-     */
+-    public static class FloatUnmarshaller implements Unmarshaller {
+-        public Float unmarshall(Node in) throws Exception {
+-            return XpathUtils.asFloat(".", in);
+-        }
+-
+-        private static FloatUnmarshaller instance;
+-        public static FloatUnmarshaller getInstance() {
+-            if (instance == null) instance = new FloatUnmarshaller();
+-            return instance;
+-        }
+-    }
+-    
+-    /**
+-     * Unmarshaller for Long values.
+-     */
+-    public static class LongUnmarshaller implements Unmarshaller {
+-        public Long unmarshall(Node in) throws Exception {
+-            return XpathUtils.asLong(".", in);
+-        }
+-
+-        private static LongUnmarshaller instance;
+-        public static LongUnmarshaller getInstance() {
+-            if (instance == null) instance = new LongUnmarshaller();
+-            return instance;
+-        }
+-    }
+-    
+-    /**
+-     * Unmarshaller for Byte values.
+-     */
+-    public static class ByteUnmarshaller implements Unmarshaller {
+-        public Byte unmarshall(Node in) throws Exception {
+-            return XpathUtils.asByte(".", in);
+-        }
+-
+-        private static ByteUnmarshaller instance;
+-        public static ByteUnmarshaller getInstance() {
+-            if (instance == null) instance = new ByteUnmarshaller();
+-            return instance;
+-        }
+-    }
+-    
+-    /**
+-     * Unmarshaller for Date values.
+-     */
+-    public static class DateUnmarshaller implements Unmarshaller {
+-        public Date unmarshall(Node in) throws Exception {
+-            return XpathUtils.asDate(".", in);
+-        }
+-
+-        private static DateUnmarshaller instance;
+-        public static DateUnmarshaller getInstance() {
+-            if (instance == null) instance = new DateUnmarshaller();
+-            return instance;
+-        }
+-    }
+-    
+-    /**
+-     * Unmarshaller for ByteBuffer values.
+-     */
+-    public static class ByteBufferUnmarshaller implements Unmarshaller {
+-        public ByteBuffer unmarshall(Node in) throws Exception {
+-            return XpathUtils.asByteBuffer(".", in);
+-        }
+-
+-        private static ByteBufferUnmarshaller instance;
+-        public static ByteBufferUnmarshaller getInstance() {
+-            if (instance == null) instance = new ByteBufferUnmarshaller();
+-            return instance;
+-        }
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/transform/StandardErrorUnmarshaller.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/StandardErrorUnmarshaller.java
+--- ./src/main/java/com/amazonaws/transform/StandardErrorUnmarshaller.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/StandardErrorUnmarshaller.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,114 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.transform;
+-
+-import static com.amazonaws.util.XpathUtils.asString;
+-import static com.amazonaws.util.XpathUtils.xpath;
+-
+-import javax.xml.xpath.XPath;
+-
+-import org.w3c.dom.Node;
+-
+-import com.amazonaws.AmazonServiceException;
+-import com.amazonaws.AmazonServiceException.ErrorType;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-/**
+- * Error unmarshaller that knows how to interpret a standard AWS error message
+- * (i.e. where to find the AWS error code, the error message, etc.) and turn it
+- * into an AmazonServiceException.
+- *
+- * @see LegacyErrorUnmarshaller
+- */
+-@SdkProtectedApi
+-public class StandardErrorUnmarshaller extends AbstractErrorUnmarshaller {
+-
+-    /**
+-     * Constructs a new unmarshaller that will unmarshall a standard AWS error
+-     * message as a generic AmazonServiceException object.
+-     */
+-    public StandardErrorUnmarshaller() {}
+-
+-    /**
+-     * Constructor allowing subclasses to specify a specific type of
+-     * AmazonServiceException to instantiating when populating the exception
+-     * object with data from the error message.
+-     *
+-     * @param exceptionClass
+-     *            The class of AmazonServiceException to create and populate
+-     *            when unmarshalling the error message.
+-     */
+-    public StandardErrorUnmarshaller(Class exceptionClass) {
+-        super(exceptionClass);
+-    }
+-
+-    /**
+-     * @see com.amazonaws.transform.Unmarshaller#unmarshall(java.lang.Object)
+-     */
+-    public AmazonServiceException unmarshall(Node in) throws Exception {
+-        XPath xpath = xpath();
+-        String errorCode = parseErrorCode(in, xpath);
+-        String errorType = asString("ErrorResponse/Error/Type", in, xpath);
+-        String requestId = asString("ErrorResponse/RequestId", in, xpath);
+-        String message = asString("ErrorResponse/Error/Message", in, xpath);
+-
+-        AmazonServiceException ase = newException(message);
+-        ase.setErrorCode(errorCode);
+-        ase.setRequestId(requestId);
+-
+-        if (errorType == null) {
+-            ase.setErrorType(ErrorType.Unknown);
+-        } else if (errorType.equalsIgnoreCase("Receiver")) {
+-            ase.setErrorType(ErrorType.Service);
+-        } else if (errorType.equalsIgnoreCase("Sender")) {
+-            ase.setErrorType(ErrorType.Client);
+-        }
+-
+-        return ase;
+-    }
+-
+-    /**
+-     * Returns the AWS error code for the specified error response.
+-     *
+-     * @param in
+-     *            The DOM tree node containing the error response.
+-     *
+-     * @return The AWS error code contained in the specified error response.
+-     *
+-     * @throws Exception
+-     *             If any problems were encountered pulling out the AWS error
+-     *             code.
+-     */
+-    public String parseErrorCode(Node in) throws Exception {
+-        return asString("ErrorResponse/Error/Code", in);
+-    }
+-
+-    public String parseErrorCode(Node in, XPath xpath) throws Exception {
+-        return asString("ErrorResponse/Error/Code", in, xpath);
+-    }
+-
+-    /**
+-     * Returns the path to the specified property within an error response.
+-     *
+-     * @param property
+-     *            The name of the desired property.
+-     *
+-     * @return The path to the specified property within an error message.
+-     */
+-    public String getErrorPropertyPath(String property) {
+-        return "ErrorResponse/Error/" + property;
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/transform/StaxUnmarshallerContext.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/StaxUnmarshallerContext.java
+--- ./src/main/java/com/amazonaws/transform/StaxUnmarshallerContext.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/StaxUnmarshallerContext.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,305 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.transform;
+-
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.Iterator;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Stack;
+-
+-import javax.xml.stream.XMLEventReader;
+-import javax.xml.stream.XMLStreamConstants;
+-import javax.xml.stream.XMLStreamException;
+-import javax.xml.stream.events.Attribute;
+-import javax.xml.stream.events.XMLEvent;
+-
+-/**
+- * Contains the unmarshalling state for the parsing of an XML response. The
+- * unmarshallers are stateless so that they can be reused, so this class holds
+- * the state while different unmarshallers work together to parse an XML
+- * response. It also tracks the current position and element depth of the
+- * document being parsed and provides utilties for accessing the next XML event
+- * from the parser, reading element text, handling attribute XML events, etc.
+- */
+-public class StaxUnmarshallerContext {
+-
+-    private XMLEvent currentEvent;
+-    private final XMLEventReader eventReader;
+-
+-    public final Stack stack = new Stack();
+-    private String stackString = "";
+-
+-    private Map metadata = new HashMap();
+-    private List metadataExpressions = new ArrayList();
+-
+-    private Iterator attributeIterator;
+-    private final Map headers;
+-
+-    private String currentHeader;
+-
+-    public void setCurrentHeader(String currentHeader) {
+-        this.currentHeader = currentHeader;
+-    }
+-
+-    public boolean isInsideResponseHeader() {
+-        return currentEvent == null;
+-    }
+-
+-    /**
+-     * Constructs a new unmarshaller context using the specified source of XML events.
+-     *
+-     * @param eventReader
+-     *            The source of XML events for this unmarshalling context.
+-     */
+-    public StaxUnmarshallerContext(XMLEventReader eventReader) {
+-        this(eventReader, null);
+-    }
+-
+-    /**
+-     * Constructs a new unmarshaller context using the specified source of XML
+-     * events, and a set of response headers.
+-     *
+-     * @param eventReader
+-     *            The source of XML events for this unmarshalling context.
+-     * @param headers
+-     *            The set of response headers associated with this unmarshaller
+-     *            context.
+-     */
+-    public StaxUnmarshallerContext(XMLEventReader eventReader, Map headers) {
+-        this.eventReader = eventReader;
+-        this.headers = headers;
+-    }
+-
+-    /**
+-     * Returns the value of the header with the specified name from the
+-     * response, or null if not present.
+-     *
+-     * @param header
+-     *            The name of the header to lookup.
+-     *
+-     * @return The value of the header with the specified name from the
+-     *         response, or null if not present.
+-     */
+-    public String getHeader(String header) {
+-        if (headers == null) return null;
+-
+-        return headers.get(header);
+-    }
+-
+-    /**
+-     * Returns the text contents of the current element being parsed.
+-     *
+-     * @return The text contents of the current element being parsed.
+-     * @throws XMLStreamException
+-     */
+-    public String readText() throws XMLStreamException {
+-        if (isInsideResponseHeader()) {
+-            return getHeader(currentHeader);
+-        }
+-        if (currentEvent.isAttribute()) {
+-            Attribute attribute = (Attribute)currentEvent;
+-            return attribute.getValue();
+-        }
+-
+-        StringBuilder sb = new StringBuilder();
+-        while (true) {
+-            XMLEvent event = eventReader.peek();
+-            if (event.getEventType() == XMLStreamConstants.CHARACTERS) {
+-                eventReader.nextEvent();
+-                sb.append(event.asCharacters().getData());
+-            } else if (event.getEventType() == XMLStreamConstants.END_ELEMENT) {
+-                return sb.toString();
+-            } else {
+-                throw new RuntimeException("Encountered unexpected event: " + event.toString());
+-            }
+-        }
+-    }
+-
+-    /**
+-     * Returns the element depth of the parser's current position in the XML
+-     * document being parsed.
+-     *
+-     * @return The element depth of the parser's current position in the XML
+-     *         document being parsed.
+-     */
+-    public int getCurrentDepth() {
+-        return stack.size();
+-    }
+-
+-    /**
+-     * Tests the specified expression against the current position in the XML
+-     * document being parsed.
+-     *
+-     * @param expression
+-     *            The psuedo-xpath expression to test.
+-     * @return True if the expression matches the current document position,
+-     *         otherwise false.
+-     */
+-    public boolean testExpression(String expression) {
+-        if (expression.equals(".")) return true;
+-        return stackString.endsWith(expression);
+-    }
+-
+-    /**
+-     * Tests the specified expression against the current position in the XML
+-     * document being parsed, and restricts the expression to matching at the
+-     * specified stack depth.
+-     *
+-     * @param expression
+-     *            The psuedo-xpath expression to test.
+-     * @param startingStackDepth
+-     *            The depth in the stack representing where the expression must
+-     *            start matching in order for this method to return true.
+-     *
+-     * @return True if the specified expression matches the current position in
+-     *         the XML document, starting from the specified depth.
+-     */
+-    public boolean testExpression(String expression, int startingStackDepth) {
+-        if (expression.equals(".")) return true;
+-
+-        int index = -1;
+-        while ((index = expression.indexOf("/", index + 1)) > -1) {
+-            // Don't consider attributes a new depth level
+-            if (expression.charAt(index + 1) != '@') {
+-                startingStackDepth++;
+-            }
+-        }
+-
+-
+-        return (startingStackDepth == getCurrentDepth()
+-                && stackString.endsWith("/" + expression));
+-    }
+-
+-    /**
+-     * Returns true if this unmarshaller context is at the very beginning of a
+-     * source document (i.e. no data has been parsed from the document yet).
+-     *
+-     * @return true if this unmarshaller context is at the very beginning of a
+-     *         source document (i.e. no data has been parsed from the document
+-     *         yet).
+-     */
+-    public boolean isStartOfDocument() throws XMLStreamException {
+-        return eventReader.peek().isStartDocument();
+-    }
+-
+-    /**
+-     * Returns the next XML event for the document being parsed.
+-     *
+-     * @return The next XML event for the document being parsed.
+-     *
+-     * @throws XMLStreamException
+-     */
+-    public XMLEvent nextEvent() throws XMLStreamException {
+-        if (attributeIterator != null && attributeIterator.hasNext()) {
+-            currentEvent = (XMLEvent)attributeIterator.next();
+-        } else {
+-            currentEvent = eventReader.nextEvent();
+-        }
+-
+-        if (currentEvent.isStartElement()) {
+-            attributeIterator = currentEvent.asStartElement().getAttributes();
+-        }
+-
+-        updateContext(currentEvent);
+-
+-        if (eventReader.hasNext()) {
+-            XMLEvent nextEvent = eventReader.peek();
+-            if (nextEvent != null && nextEvent.isCharacters()) {
+-                for (MetadataExpression metadataExpression : metadataExpressions) {
+-                    if (testExpression(metadataExpression.expression, metadataExpression.targetDepth)) {
+-                        metadata.put(metadataExpression.key, nextEvent.asCharacters().getData());
+-                    }
+-                }
+-            }
+-        }
+-
+-        return currentEvent;
+-    }
+-
+-    /**
+-     * Returns any metadata collected through metadata expressions while this
+-     * context was reading the XML events from the XML document.
+-     *
+-     * @return A map of any metadata collected through metadata expressions
+-     *         while this context was reading the XML document.
+-     */
+-    public Map getMetadata() {
+-        return metadata;
+-    }
+-
+-    /**
+-     * Registers an expression, which if matched, will cause the data for the
+-     * matching element to be stored in the metadata map under the specified
+-     * key.
+-     *
+-     * @param expression
+-     *            The expression an element must match in order for it's data to
+-     *            be pulled out and stored in the metadata map.
+-     * @param targetDepth
+-     *            The depth in the XML document where the expression match must
+-     *            start.
+-     * @param storageKey
+-     *            The key under which to store the matching element's data.
+-     */
+-    public void registerMetadataExpression(String expression, int targetDepth, String storageKey) {
+-        metadataExpressions.add(new MetadataExpression(expression, targetDepth, storageKey));
+-    }
+-
+-
+-    /*
+-     * Private Interface
+-     */
+-
+-    /**
+-     * Simple container for the details of a metadata expression this
+-     * unmarshaller context is looking for.
+-     */
+-    private static class MetadataExpression {
+-        public String expression;
+-        public int targetDepth;
+-        public String key;
+-
+-        public MetadataExpression(String expression, int targetDepth, String key) {
+-            this.expression = expression;
+-            this.targetDepth = targetDepth;
+-            this.key = key;
+-        }
+-    }
+-
+-    private void updateContext(XMLEvent event) {
+-        if (event == null) return;
+-
+-        if (event.isEndElement()) {
+-            stack.pop();
+-            stackString = "";
+-            for (String s : stack) {
+-                stackString += "/" + s;
+-            }
+-        } else if (event.isStartElement()) {
+-            stack.push(event.asStartElement().getName().getLocalPart());
+-            stackString += "/" + event.asStartElement().getName().getLocalPart();
+-        } else if (event.isAttribute()) {
+-            Attribute attribute = (Attribute)event;
+-            stackString = "";
+-            for (String s : stack) {
+-                stackString += "/" + s;
+-            }
+-            stackString += "/@" + attribute.getName().getLocalPart();
+-        }
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/transform/Unmarshaller.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/Unmarshaller.java
+--- ./src/main/java/com/amazonaws/transform/Unmarshaller.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/Unmarshaller.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,21 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- * 
+- *  http://aws.amazon.com/apache2.0
+- * 
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.transform;
+-
+-public interface Unmarshaller {
+-
+-    public T unmarshall(R in) throws Exception;
+-    
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/transform/VoidJsonUnmarshaller.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/VoidJsonUnmarshaller.java
+--- ./src/main/java/com/amazonaws/transform/VoidJsonUnmarshaller.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/VoidJsonUnmarshaller.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,26 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.transform;
+-
+-
+-/**
+- * Simple unmarshaller that iterates through the JSON events but always
+- * returns null.
+- */
+-public class VoidJsonUnmarshaller implements Unmarshaller {
+-    public T unmarshall(JsonUnmarshallerContext context) throws Exception {
+-        return null;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/transform/VoidStaxUnmarshaller.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/VoidStaxUnmarshaller.java
+--- ./src/main/java/com/amazonaws/transform/VoidStaxUnmarshaller.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/VoidStaxUnmarshaller.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,26 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.transform;
+-
+-/**
+- * Simple StAX unmarshaller that iterates through the XML events but always
+- * returns null.
+- */
+-public class VoidStaxUnmarshaller implements Unmarshaller {
+-    public T unmarshall(StaxUnmarshallerContext context) throws Exception {
+-        while (context.nextEvent().isEndDocument() == false);
+-        return null;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/transform/VoidUnmarshaller.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/VoidUnmarshaller.java
+--- ./src/main/java/com/amazonaws/transform/VoidUnmarshaller.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/transform/VoidUnmarshaller.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,29 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- * 
+- *  http://aws.amazon.com/apache2.0
+- * 
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.transform;
+-
+-import org.w3c.dom.Node;
+-
+-/**
+- * Simple Unmarshaller implementation that always returns null.
+- */
+-public class VoidUnmarshaller implements Unmarshaller {
+-    /**
+-     * @see com.amazonaws.transform.Unmarshaller#unmarshall(java.lang.Object)
+-     */
+-    public Void unmarshall(Node in) throws Exception {
+-            return null;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/AbstractBase32Codec.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/AbstractBase32Codec.java
+--- ./src/main/java/com/amazonaws/util/AbstractBase32Codec.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/AbstractBase32Codec.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,280 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-import static com.amazonaws.util.CodecUtils.sanityCheckLastPos;
+-
+-/**
+- * Common base class for Base 32 like codec implementation.
+- * 
+- * @author Hanson Char
+- */
+-abstract class AbstractBase32Codec implements Codec {
+-    private static final int MASK_2BITS = (1 << 2) - 1;
+-    private static final int MASK_3BITS = (1 << 3) - 1;
+-    private static final int MASK_4BITS = (1 << 4) - 1;
+-    private static final int MASK_5BITS = (1 << 5) - 1;
+-    // Base 32 alphabet as defined at http://www.ietf.org/rfc/rfc4648.txt
+-    private static final byte PAD = '=';
+-    
+-    private final byte[] alphabets;
+-
+-    protected AbstractBase32Codec(byte[] alphabets) {
+-        this.alphabets = alphabets;
+-    }
+-
+-    @Override
+-    public final byte[] encode(byte[] src) {
+-        final int num5bytes = src.length / 5;
+-        final int remainder = src.length % 5;
+-        
+-        if (remainder == 0)
+-        {
+-            byte[] dest = new byte[num5bytes * 8];
+-    
+-            for (int s=0,d=0; s < src.length; s+=5, d+=8)
+-                encode5bytes(src, s, dest, d);
+-            return dest;
+-        }
+-        
+-        byte[] dest = new byte[(num5bytes+1) * 8];
+-        int s=0, d=0;
+-        
+-        for (; s < src.length-remainder; s+=5, d+=8)
+-            encode5bytes(src, s, dest, d);
+-        
+-        switch(remainder) {
+-            case 1:
+-                encode1byte(src, s, dest, d);
+-                break;
+-            case 2:
+-                encode2bytes(src, s, dest, d);
+-                break;
+-            case 3:
+-                encode3bytes(src, s, dest, d);
+-                break;
+-            case 4:
+-                encode4bytes(src, s, dest, d);
+-                break;
+-            default:
+-                throw new IllegalStateException();
+-        }
+-        return dest;
+-    }
+-    
+-    private final void encode5bytes(byte[] src, int s, byte[] dest, int d) {
+-        // operator precedence in descending order: >>> or <<, &, |
+-        byte p;
+-        dest[d++] = (byte)alphabets[(p=src[s++]) >>> 3 & MASK_5BITS];                         // 5 
+-        dest[d++] = (byte)alphabets[(p & MASK_3BITS) << 2 | (p=src[s++]) >>> 6 & MASK_2BITS]; // 3 2
+-        dest[d++] = (byte)alphabets[p >>> 1 & MASK_5BITS];                                    //   5
+-        dest[d++] = (byte)alphabets[(p & 1) << 4 | (p=src[s++]) >>> 4 & MASK_4BITS];          //   1 4
+-        dest[d++] = (byte)alphabets[(p & MASK_4BITS) << 1 | (p=src[s++]) >>> 7 & 1];          //     4 1
+-        dest[d++] = (byte)alphabets[p >>> 2 & MASK_5BITS];                                    //       5
+-        dest[d++] = (byte)alphabets[(p & MASK_2BITS) << 3 | (p=src[s]) >>> 5 & MASK_3BITS];   //       2 3
+-        dest[d] = (byte)alphabets[p & MASK_5BITS];                                            //         5
+-        return;
+-    }
+-    
+-    private final void encode4bytes(byte[] src, int s, byte[] dest, int d) {
+-        // operator precedence in descending order: >>> or <<, &, |
+-        byte p;
+-        dest[d++] = (byte)alphabets[(p=src[s++]) >>> 3 & MASK_5BITS];                         // 5 
+-        dest[d++] = (byte)alphabets[(p & MASK_3BITS) << 2 | (p=src[s++]) >>> 6 & MASK_2BITS]; // 3 2
+-        dest[d++] = (byte)alphabets[p >>> 1 & MASK_5BITS];                                    //   5
+-        dest[d++] = (byte)alphabets[(p & 1) << 4 | (p=src[s++]) >>> 4 & MASK_4BITS];          //   1 4
+-        dest[d++] = (byte)alphabets[(p & MASK_4BITS) << 1 | (p=src[s]) >>> 7 & 1];            //     4 1
+-        dest[d++] = (byte)alphabets[p >>> 2 & MASK_5BITS];                                    //       5
+-        dest[d++] = (byte)alphabets[(p & MASK_2BITS) << 3];                                   //       2
+-        dest[d] = PAD;
+-        return;
+-    }
+-    
+-    private final void encode3bytes(byte[] src, int s, byte[] dest, int d) {
+-        // operator precedence in descending order: >>> or <<, &, |
+-        byte p;
+-        dest[d++] = (byte)alphabets[(p=src[s++]) >>> 3 & MASK_5BITS];                         // 5 
+-        dest[d++] = (byte)alphabets[(p & MASK_3BITS) << 2 | (p=src[s++]) >>> 6 & MASK_2BITS]; // 3 2
+-        dest[d++] = (byte)alphabets[p >>> 1 & MASK_5BITS];                                    //   5
+-        dest[d++] = (byte)alphabets[(p & 1) << 4 | (p=src[s]) >>> 4 & MASK_4BITS];            //   1 4
+-        dest[d++] = (byte)alphabets[(p & MASK_4BITS) << 1];                                   //     4
+-        
+-        for (int i=0; i < 3; i++)
+-            dest[d++] = PAD;                                                                       
+-        return;
+-    }
+-    
+-    private final void encode2bytes(byte[] src, int s, byte[] dest, int d) {
+-        // operator precedence in descending order: >>> or <<, &, |
+-        byte p;
+-        dest[d++] = (byte)alphabets[(p=src[s++]) >>> 3 & MASK_5BITS];                         // 5 
+-        dest[d++] = (byte)alphabets[(p & MASK_3BITS) << 2 | (p=src[s]) >>> 6 & MASK_2BITS];   // 3 2
+-        dest[d++] = (byte)alphabets[p >>> 1 & MASK_5BITS];                                    //   5
+-        dest[d++] = (byte)alphabets[(p & 1) << 4];                                            //   1
+-        
+-        for (int i=0; i < 4; i++)
+-            dest[d++] = PAD;                                                                       
+-        return;
+-    }
+-    
+-    private final void encode1byte(byte[] src, int s, byte[] dest, int d) {
+-        // operator precedence in descending order: >>> or <<, &, |
+-        byte p;
+-        dest[d++] = (byte)alphabets[(p=src[s]) >>> 3 & MASK_5BITS];                            // 5 
+-        dest[d++] = (byte)alphabets[(p & MASK_3BITS) << 2];                                    // 3
+-        
+-        for (int i=0; i < 6; i++)
+-            dest[d++] = PAD;                                                                       
+-        return;
+-    }
+-    
+-    private final void decode5bytes(byte[] src, int s, byte[] dest, int d) {
+-        int p=0;
+-        // operator precedence in descending order: >>> or <<, &, |
+-        dest[d++] = (byte)
+-                    (
+-                        pos(src[s++]) << 3
+-                        | (p=pos(src[s++])) >>> 2 & MASK_3BITS
+-                    )
+-                    ;                                               // 5 3
+-        dest[d++] = (byte)
+-                    (
+-                        (p & MASK_2BITS) << 6
+-                        | pos(src[s++]) << 1 
+-                        | (p=pos(src[s++])) >>> 4 & 1
+-                    )
+-                    ;                                               //   2 5 1
+-        dest[d++] = (byte)
+-                    (
+-                        (p & MASK_4BITS) << 4 
+-                        | (p=pos(src[s++])) >>> 1 & MASK_4BITS
+-                    )
+-                    ;                                               //       4 4
+-        dest[d++] = (byte)
+-                    (
+-                        (p & 1) << 7
+-                        | pos(src[s++]) << 2
+-                        | (p=pos(src[s++])) >>> 3 & MASK_2BITS
+-                    )
+-                    ;                                               //         1 5 2
+-        dest[d]   = (byte)
+-                    (
+-                        (p & MASK_3BITS) << 5 
+-                        | pos(src[s])
+-                    );                                              //             3 5
+-        return;
+-    }
+-    
+-    /**
+-     * @param n the number of final quantum in bytes to decode into.  Ranges from 1 to 4, inclusive.
+-     */
+-    private final void decode1to4bytes(int n, byte[] src, int s, byte[] dest, int d) {
+-        int p=0;
+-        // operator precedence in descending order: >>> or <<, &, |
+-        dest[d++] = (byte)
+-                    (
+-                        pos(src[s++]) << 3
+-                        | (p=pos(src[s++])) >>> 2 & MASK_3BITS
+-                    )
+-                    ;                                               // 5 3
+-        if (n == 1) {
+-            sanityCheckLastPos(p, MASK_2BITS);
+-            return;
+-        }
+-        
+-        dest[d++] = (byte)
+-                    (
+-                        (p & MASK_2BITS) << 6
+-                        | (pos(src[s++])) << 1 
+-                        | (p=pos(src[s++])) >>> 4 & 1
+-                    )
+-                    ;                                               //   2 5 1
+-        if (n == 2) {
+-            sanityCheckLastPos(p, MASK_4BITS);
+-            return;
+-        }
+-        
+-        dest[d++] = (byte)
+-                    (
+-                        (p & MASK_4BITS) << 4 
+-                        | (p=pos(src[s++])) >>> 1 & MASK_4BITS
+-                    )
+-                    ;                                               //       4 4
+-        if (n == 3) {
+-            sanityCheckLastPos(p, 1);
+-            return;
+-        }
+-        
+-        dest[d]   = (byte)
+-                    (
+-                        (p & 1) << 7
+-                        | pos(src[s++]) << 2
+-                        | (p=pos(src[s])) >>> 3 & MASK_2BITS
+-                    )
+-                    ;                                               //         1 5 2
+-        sanityCheckLastPos(p, MASK_3BITS);
+-        return;
+-    }
+-    
+-    @Override
+-    public final byte[] decode(byte[] src, final int length) 
+-    {
+-        if (length % 8 != 0)
+-            throw new IllegalArgumentException
+-            ("Input is expected to be encoded in multiple of 8 bytes but found: " + length);
+-
+-        int pads=0;
+-        int last = length-1;
+-        
+-        // max possible padding in b32 encoding is 6
+-        for (; pads < 6 && last > -1; last--, pads++) {
+-            if (src[last] != PAD)
+-                break;
+-        }
+-        
+-        final int fq; // final quantum in unit of bytes
+-        
+-        switch(pads) {
+-            case 0:
+-                fq=5;
+-                break; // final quantum of encoding input is an integral multiple of 40 bits
+-            case 1:
+-                fq=4;
+-                break; // final quantum of encoding input is exactly 32 bits
+-            case 3:
+-                fq=3;
+-                break; // final quantum of encoding input is exactly 24 bits
+-            case 4:
+-                fq=2;
+-                break; // final quantum of encoding input is exactly 16 bits
+-            case 6:
+-                fq=1;
+-                break; // final quantum of encoding input is exactly 8 bits
+-            default:
+-                throw new IllegalArgumentException("Invalid number of paddings " + pads);
+-        }
+-        final byte[] dest = new byte[length / 8 * 5 - (5-fq)]; 
+-        int s=0, d=0;
+-        
+-        // % has a higher precedence than - than <
+-        for (; d < dest.length - fq%5; s+=8,d+=5)
+-            decode5bytes(src, s, dest, d);
+-
+-        if (fq < 5)
+-            decode1to4bytes(fq, src, s, dest, d);
+-        return dest;
+-    }
+-    
+-    protected abstract int pos(byte in);
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/AwsHostNameUtils.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/AwsHostNameUtils.java
+--- ./src/main/java/com/amazonaws/util/AwsHostNameUtils.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/AwsHostNameUtils.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,247 +0,0 @@
+-/*
+- * Copyright 2012-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import java.net.InetAddress;
+-import java.net.URI;
+-import java.util.regex.Matcher;
+-import java.util.regex.Pattern;
+-
+-import com.amazonaws.internal.config.HostRegexToRegionMapping;
+-import com.amazonaws.internal.config.InternalConfig;
+-import com.amazonaws.log.InternalLogFactory;
+-
+-public class AwsHostNameUtils {
+-
+-    private static final Pattern S3_ENDPOINT_PATTERN =
+-        Pattern.compile("^(?:.+\\.)?s3[.-]([a-z0-9-]+)$");
+-
+-    private static final Pattern STANDARD_CLOUDSEARCH_ENDPOINT_PATTERN =
+-        Pattern.compile("^(?:.+\\.)?([a-z0-9-]+)\\.cloudsearch$");
+-
+-    private static final Pattern EXTENDED_CLOUDSEARCH_ENDPOINT_PATTERN =
+-        Pattern.compile("^(?:.+\\.)?([a-z0-9-]+)\\.cloudsearch\\..+");
+-
+-    /**
+-     * @deprecated in favor of {@link #parseRegionName(String, String)}.
+-     */
+-    @Deprecated
+-    public static String parseRegionName(URI endpoint) {
+-        return parseRegionName(endpoint.getHost(), null);
+-    }
+-
+-    /**
+-     * Attempts to parse the region name from an endpoint based on conventions
+-     * about the endpoint format.
+-     *
+-     * @param host         the hostname to parse
+-     * @param serviceHint  an optional hint about the service for the endpoint
+-     * @return             the region parsed from the hostname, or
+-     *                     "us-east-1" if no region information
+-     *                     could be found.
+-     * @deprecated	in favor of {@link #parseRegion(String, String)}.
+-     */
+-    @Deprecated
+-    public static String parseRegionName(final String host,
+-                                         final String serviceHint) {
+-        String region = parseRegion(host, serviceHint);
+-
+-        // If region is null, then endpoint is totally non-standard;
+-        // guess us-east-1 for lack of a better option.
+-        return region == null ? "us-east-1" : region;
+-    }
+-
+-    /**
+-     * Attempts to parse the region name from an endpoint based on conventions
+-     * about the endpoint format.
+-     *
+-     * @param host         the hostname to parse
+-     * @param serviceHint  an optional hint about the service for the endpoint
+-     * @return             the region parsed from the hostname, or
+-     *                     null if no region information could be found.
+-     */
+-    public static String parseRegion(final String host,
+-                                         final String serviceHint) {
+-
+-        if (host == null) {
+-            throw new IllegalArgumentException("hostname cannot be null");
+-        }
+-        String regionNameInInternalConfig = parseRegionNameByInternalConfig(host);
+-        if (regionNameInInternalConfig != null) {
+-            return regionNameInInternalConfig;
+-        }
+-
+-        if (host.endsWith(".amazonaws.com")) {
+-            int index = host.length() - ".amazonaws.com".length();
+-            return parseStandardRegionName(host.substring(0, index));
+-        }
+-
+-        if (serviceHint != null) {
+-            if (serviceHint.equals("cloudsearch")
+-                    && !host.startsWith("cloudsearch.")) {
+-
+-                // CloudSearch domains use the nonstandard domain format
+-                // [domain].[region].cloudsearch.[suffix].
+-
+-                Matcher matcher = EXTENDED_CLOUDSEARCH_ENDPOINT_PATTERN
+-                        .matcher(host);
+-
+-                if (matcher.matches()) {
+-                    return matcher.group(1);
+-                }
+-            }
+-
+-            // If we have a service hint, look for 'service.[region]' or
+-            // 'service-[region]' in the endpoint's hostname.
+-            Pattern pattern = Pattern.compile(
+-                "^(?:.+\\.)?"
+-                + Pattern.quote(serviceHint)
+-                + "[.-]([a-z0-9-]+)\\."
+-            );
+-
+-            Matcher matcher = pattern.matcher(host);
+-            if (matcher.find()) {
+-                return matcher.group(1);
+-            }
+-        }
+-
+-        // Endpoint is non-standard
+-        return null;
+-    }
+-
+-    /**
+-     * Parses the region name from a standard (*.amazonaws.com) endpoint.
+-     *
+-     * @param fragment  the portion of the endpoint excluding
+-     *                  ".amazonaws.com"
+-     * @return          the parsed region name (or "us-east-1" as a
+-     *                  best guess if we can't tell for sure)
+-     */
+-    private static String parseStandardRegionName(final String fragment) {
+-
+-        Matcher matcher = S3_ENDPOINT_PATTERN.matcher(fragment);
+-        if (matcher.matches()) {
+-            // host was 'bucket.s3-[region].amazonaws.com'.
+-            return matcher.group(1);
+-        }
+-
+-        matcher = STANDARD_CLOUDSEARCH_ENDPOINT_PATTERN.matcher(fragment);
+-        if (matcher.matches()) {
+-            // host was 'domain.[region].cloudsearch.amazonaws.com'.
+-            return matcher.group(1);
+-        }
+-
+-        int index = fragment.lastIndexOf('.');
+-        if (index == -1) {
+-            // host was 'service.amazonaws.com', guess us-east-1
+-            // for lack of a better option.
+-            return "us-east-1";
+-        }
+-
+-        // host was 'service.[region].amazonaws.com'.
+-        String region = fragment.substring(index + 1);
+-
+-        // Special case for iam.us-gov.amazonaws.com, which is actually
+-        // us-gov-west-1.
+-        if ("us-gov".equals(region)) {
+-            region = "us-gov-west-1";
+-        }
+-
+-        return region;
+-    }
+-
+-    /**
+-     * @return the configured region name if the given host name matches any of
+-     *         the host-to-region mappings in the internal config; otherwise
+-     *         return null.
+-     */
+-    private static String parseRegionNameByInternalConfig(String host) {
+-        InternalConfig internConfig = InternalConfig.Factory.getInternalConfig();
+-
+-        for (HostRegexToRegionMapping mapping : internConfig.getHostRegexToRegionMappings()) {
+-            if (mapping.isHostNameMatching(host)) {
+-                return mapping.getRegionName();
+-            }
+-        }
+-
+-        return null;
+-    }
+-
+-    /**
+-     * Parses the service name from an endpoint. Can only handle endpoints of
+-     * the form 'service.[region.]amazonaws.com'.
+-     *
+-     * @Deprecated This method currently doesn't support BJS endpoints. This
+-     * method is used only in AWS4Signer to identify the service name from an
+-     * endpoint. This method is broken as it no longer returns the service
+-     * name to used for signing for all AWS services. This method will be
+-     * removed as part of next major version upgrade.
+-     */
+-    @Deprecated
+-    public static String parseServiceName(URI endpoint) {
+-        String host = endpoint.getHost();
+-
+-        // If we don't recognize the domain, throw an exception.
+-        if (!host.endsWith(".amazonaws.com")) {
+-            throw new IllegalArgumentException(
+-                "Cannot parse a service name from an unrecognized endpoint ("
+-                + host
+-                + ").");
+-        }
+-
+-        String serviceAndRegion =
+-            host.substring(0, host.indexOf(".amazonaws.com"));
+-
+-        // Special cases for S3 endpoints with bucket names embedded.
+-        if (serviceAndRegion.endsWith(".s3")
+-            || S3_ENDPOINT_PATTERN.matcher(serviceAndRegion).matches()) {
+-            return "s3";
+-        }
+-
+-        char separator = '.';
+-
+-        // If we don't detect a separator between service name and region, then
+-        // assume that the region is not included in the hostname, and it's only
+-        // the service name (ex: "http://iam.amazonaws.com").
+-        if (serviceAndRegion.indexOf(separator) == -1) {
+-            return serviceAndRegion;
+-        }
+-
+-        String service =
+-            serviceAndRegion.substring(0, serviceAndRegion.indexOf(separator));
+-
+-        return service;
+-    }
+-
+-    /**
+-     * Returns the host name for the local host. If the operation is not allowed
+-     * by the security check, the textual representation of the IP address of
+-     * the local host is returned instead. If the ip address of the local host
+-     * cannot be resolved or if there is any other failure, "localhost" is
+-     * returned as a fallback.
+-     */
+-    public static String localHostName() {
+-        try {
+-            InetAddress localhost = InetAddress.getLocalHost();
+-            return localhost.getHostName();
+-        } catch (Exception e) {
+-            InternalLogFactory.getLog(AwsHostNameUtils.class)
+-                .debug(
+-                    "Failed to determine the local hostname; fall back to "
+-                            + "use \"localhost\".", e);
+-            return "localhost";
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/AWSRequestMetricsFullSupport.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/AWSRequestMetricsFullSupport.java
+--- ./src/main/java/com/amazonaws/util/AWSRequestMetricsFullSupport.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/AWSRequestMetricsFullSupport.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,226 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.util;
+-
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Map.Entry;
+-
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-
+-import com.amazonaws.annotation.NotThreadSafe;
+-import com.amazonaws.metrics.AwsSdkMetrics;
+-import com.amazonaws.metrics.MetricType;
+-import com.amazonaws.metrics.RequestMetricCollector;
+-
+-/**
+- * In contrast to {@link AWSRequestMetrics}, which is intended to be a minimal
+- * support of AWS SDK request metrics, this class is the full support of AWS SDK
+- * request metrics including features such as properties and sub-events.
+- * 

+- * This class is instantiated instead of {@link AWSRequestMetrics} when request
+- * metric collection is required during a particular service request/response
+- * cycle.
+- */
+-@NotThreadSafe
+-public class AWSRequestMetricsFullSupport extends AWSRequestMetrics {
+-    /* Stores some key value pairs. */
+-    private final Map> properties = new HashMap>();
+-    
+-    /* A map to store events that are being profiled. */
+-    private final Map eventsBeingProfiled = new HashMap();
+-    /* Latency Logger */
+-    private static final Log latencyLogger = LogFactory.getLog("com.amazonaws.latency");
+-    private static final Object KEY_VALUE_SEPARATOR = "=";
+-    private static final Object COMMA_SEPARATOR = ", ";
+-
+-    /**
+-     * This constructor should be used in the case when AWS SDK metrics
+-     * collector is enabled.
+-     * 
+-     * @see AWSRequestMetricsFullSupport
+-     */
+-    public AWSRequestMetricsFullSupport() {
+-        super(TimingInfo.startTimingFullSupport());
+-    }
+-    
+-    /**
+-     * Start an event which will be timed. The startTime and endTime are added
+-     * to timingInfo only after endEvent is called. For every startEvent there
+-     * should be a corresponding endEvent. If you start the same event without
+-     * ending it, this will overwrite the old event. i.e. There is no support
+-     * for recursive events yet. Having said that, if you start and end an event
+-     * in that sequence multiple times, all events are logged in timingInfo in
+-     * that order.
+-     * 
+-     * This feature is enabled if the system property
+-     * "com.amazonaws.sdk.enableRuntimeProfiling" is set, or if a
+-     * {@link RequestMetricCollector} is in use either at the request, web service
+-     * client, or AWS SDK level.
+-     * 
+-     * @param eventName
+-     *            - The name of the event to start
+-     * 
+-     * @see AwsSdkMetrics
+-     */
+-    @Override
+-    public void startEvent(String eventName) {
+-        /* This will overwrite past events */
+-        eventsBeingProfiled.put // ignoring the wall clock time
+-            (eventName, TimingInfo.startTimingFullSupport(System.nanoTime()));
+-    }
+-
+-    @Override
+-    public void startEvent(MetricType f) {
+-        startEvent(f.name());
+-    }
+-
+-    /**
+-     * End an event which was previously started. Once ended, log how much time
+-     * the event took. It is illegal to end an Event that was not started. It is
+-     * good practice to endEvent in a finally block. See Also startEvent.
+-     * 
+-     * @param eventName
+-     *            - The name of the event to start
+-     */
+-    @Override
+-    public void endEvent(String eventName) {
+-        TimingInfo event = eventsBeingProfiled.get(eventName);
+-        /* Somebody tried to end an event that was not started. */
+-        if (event == null) {
+-            LogFactory.getLog(getClass()).warn
+-                ("Trying to end an event which was never started: " + eventName);
+-            return;
+-        }
+-        event.endTiming();
+-        this.timingInfo.addSubMeasurement(
+-            eventName,
+-            TimingInfo.unmodifiableTimingInfo(
+-                event.getStartTimeNano(),
+-                event.getEndTimeNano()));
+-    }
+-
+-    @Override
+-    public void endEvent(MetricType f) {
+-        endEvent(f.name());
+-    }
+-
+-    /**
+-     * Add 1 to an existing count for a given event. If the count for that event
+-     * does not exist, then it creates one and initializes it to 1.
+-     * 
+-     * This feature is enabled if the system property
+-     * "com.amazonaws.sdk.enableRuntimeProfiling" is set, or if a
+-     * {@link RequestMetricCollector} is in use either at the request, web service
+-     * client, or AWS SDK level.
+-     * 
+-     * @param event
+-     *            - The name of the event to count
+-     */
+-    @Override
+-    public void incrementCounter(String event) {
+-        timingInfo.incrementCounter(event);
+-    }
+-
+-    @Override
+-    public void incrementCounter(MetricType f) {
+-        incrementCounter(f.name());
+-    }
+-    
+-    @Override
+-    public void setCounter(String counterName, long count) {
+-        timingInfo.setCounter(counterName, count);
+-    }
+-
+-    @Override
+-    public void setCounter(MetricType f, long count) {
+-        setCounter(f.name(), count);
+-    }
+-    
+-    /**
+-     * Add a property. If you add the same property more than once, it stores
+-     * all values a list.
+-     * 
+-     * This feature is enabled if the system property
+-     * "com.amazonaws.sdk.enableRuntimeProfiling" is set, or if a
+-     * {@link RequestMetricCollector} is in use either at the request, web service
+-     * client, or AWS SDK level.
+-     * 
+-     * @param propertyName
+-     *            The name of the property
+-     * @param value
+-     *            The property value
+-     */
+-    @Override
+-    public void addProperty(String propertyName, Object value) {
+-        List propertyList = properties.get(propertyName);
+-        if (propertyList == null) {
+-            propertyList = new ArrayList();
+-            properties.put(propertyName, propertyList);
+-        }
+-        
+-        propertyList.add(value);
+-    }
+-
+-    @Override
+-    public void addProperty(MetricType f, Object value) {
+-        addProperty(f.name(), value);
+-    }
+-
+-    @Override
+-    public void log() {
+-        if (latencyLogger.isInfoEnabled()) {
+-            StringBuilder builder = new StringBuilder();
+-
+-            for (Entry> entry : properties.entrySet()) {
+-                keyValueFormat(entry.getKey(), entry.getValue(), builder);
+-            }
+-
+-            for (Entry entry : timingInfo.getAllCounters()
+-                    .entrySet()) {
+-                keyValueFormat(entry.getKey(), entry.getValue(), builder);
+-            }
+-            for (Entry> entry : timingInfo
+-                    .getSubMeasurementsByName().entrySet()) {
+-                keyValueFormat(entry.getKey(), entry.getValue(), builder);
+-            }
+-            latencyLogger.info(builder.toString());
+-        }
+-    }
+-
+-    private void keyValueFormat(Object key, Object value, StringBuilder builder) {
+-        builder.append(key).append(KEY_VALUE_SEPARATOR).append(value).append(COMMA_SEPARATOR);
+-    }
+-
+-    @Override
+-    public List getProperty(String propertyName){
+-    	return properties.get(propertyName);
+-    }
+-
+-    @Override
+-    public List getProperty(MetricType f){
+-        return getProperty(f.name());
+-    }
+-
+-    /** Always returns true. */
+-    @Override
+-    public final boolean isEnabled() {
+-        return true;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/AWSRequestMetrics.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/AWSRequestMetrics.java
+--- ./src/main/java/com/amazonaws/util/AWSRequestMetrics.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/AWSRequestMetrics.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,232 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.util;
+-
+-import com.amazonaws.annotation.NotThreadSafe;
+-import com.amazonaws.metrics.MetricType;
+-import com.amazonaws.metrics.RequestMetricType;
+-
+-import java.util.Collections;
+-import java.util.List;
+-
+-/**
+- * Used as both a base class and a minimal support of AWS SDK request metrics.
+- * The base class of supporting AWS SDK request metrics.
+- * 

+- * In contrast to {@link AWSRequestMetricsFullSupport}, which is intended to be
+- * a full support of AWS SDK request metrics, this class only provides access to
+- * a {@link TimingInfo} instance that only has minimal support for start and end
+- * time (ie with no-ops for sub-event measurements) for backward compatibility
+- * reason. The other methods related to properties and counters in this class
+- * are effectively no-ops.
+- * 

+- * This class is instantiated instead of {@link AWSRequestMetricsFullSupport}
+- * when request metric collection is not required during a particular service
+- * request/response cycle.
+- */
+-@NotThreadSafe
+-public class AWSRequestMetrics {
+-    /**
+-     *  If the class name is required for logging and metrics we should use this
+-     *  constant version instead of the expensive function call.
+-     */
+-    public static final String SIMPLE_NAME = AWSRequestMetrics.class.getSimpleName();
+-
+-    /**
+-     * Predefined AWS SDK metric types general across all AWS clients. Client
+-     * specific predefined metrics like S3 or DynamoDB are defined in the client
+-     * specific packages.
+-     */
+-    public enum Field implements RequestMetricType {
+-        AWSErrorCode,
+-        AWSRequestID,
+-        /**
+-         * The specific request subtype, such as PutItemRequest, PutObjectRequest, etc.
+-         */
+-        RequestType,
+-        BytesProcessed,
+-        /**
+-         * Total number of milliseconds taken for a request/response including
+-         * the time taken to execute the request handlers, round trip to AWS,
+-         * and the time taken to execute the response handlers.
+-         */
+-        ClientExecuteTime,
+-        CredentialsRequestTime,
+-
+-        Exception,
+-        /**
+-         * Used to count and preserve the throttle related exceptions.
+-         */
+-        ThrottleException,
+-        /**
+-         * Number of milliseconds taken for a request/response round trip to AWS.
+-         */
+-        HttpRequestTime,
+-        RedirectLocation,
+-        RequestMarshallTime,
+-        /**
+-         * Number of milliseconds taken to sign a request.
+-         */
+-        RequestSigningTime,
+-        /**
+-         * Number of milliseconds taken to execute the response handler for a response from AWS.
+-         */
+-        ResponseProcessingTime,
+-        /**
+-         * Number of requests to AWS.
+-         */
+-        RequestCount,
+-        /**
+-         * Number of retries of AWS SDK sending a request to AWS.
+-         */
+-        RetryCount, // captured via the RequestCount since (RetryCount = RequestCount - 1)
+-        /**
+-         * Snapshot of currently consumed retry capacity.
+-         */
+-        RetryCapacityConsumed,
+-        /**
+-         * Number of retries that were not attempted due to retry throttling.
+-         */
+-        ThrottledRetryCount,
+-        /**
+-         * Number of retries of the underlying http client library in sending a
+-         * request to AWS.
+-         */
+-        HttpClientRetryCount,
+-        /**
+-         * Time taken to send a request to AWS by the http client library,
+-         * excluding any retry.
+-         */
+-        HttpClientSendRequestTime,
+-        /**
+-         * Time taken to receive a response from AWS by the http client library,
+-         * excluding any retry.
+-         */
+-        HttpClientReceiveResponseTime,
+-
+-        /**
+-         * Time taken for socket to read.
+-         */
+-        HttpSocketReadTime,
+-
+-        /**
+-         * The number of idle persistent connections.
+-         * 

+-         * Reference: https://hc.apache
+-         * .org/httpcomponents-core-ga/httpcore/apidocs/org/apache
+-         * /http/pool/PoolStats.html
+-         */
+-        HttpClientPoolAvailableCount,
+-        /**
+-         * The number of persistent connections tracked by the connection
+-         * manager currently being used to execute requests.
+-         * 

+-         * Reference: https://hc
+-         * .apache.org/httpcomponents-core-ga/httpcore/apidocs/org/apache
+-         * /http/pool/PoolStats.html
+-         */
+-        HttpClientPoolLeasedCount,
+-        /**
+-         * The number of connection requests being blocked awaiting a free
+-         * connection.
+-         * 

+-         * Reference: https://hc.apache.org/httpcomponents-core-ga/httpcore
+-         * /apidocs/org/apache/http/pool/PoolStats.html
+-         */
+-        HttpClientPoolPendingCount,
+-        RetryPauseTime,
+-        ServiceEndpoint,
+-        ServiceName,
+-        StatusCode, // The http status code
+-        ;
+-    }
+-
+-    protected final TimingInfo timingInfo;
+-
+-    /**
+-     * This constructor should be used only in the case when AWS SDK metrics
+-     * collector is disabled, when minimal timing info is supported for backward
+-     * compatibility reasons.
+-     *
+-     * @see AWSRequestMetricsFullSupport
+-     */
+-    public AWSRequestMetrics() {
+-        this.timingInfo = TimingInfo.startTiming();
+-    }
+-
+-    protected AWSRequestMetrics(TimingInfo timingInfo) {
+-        this.timingInfo = timingInfo;
+-    }
+-
+-    public final TimingInfo getTimingInfo() {
+-        return timingInfo;
+-    }
+-    /**
+-     * Returns true if this metrics is enabled; false otherwise.
+-     * Returns false by default.
+-     * */
+-    public boolean isEnabled() {
+-        return false;
+-    }
+-
+-    public void startEvent(String eventName) {}
+-    public void startEvent(MetricType f) {}
+-    public void endEvent(String eventName) {}
+-    public void endEvent(MetricType f) {}
+-
+-    public void incrementCounter(String event) {}
+-    public void incrementCounter(MetricType f) {}
+-    /** Fluent API of {@link #incrementCounter(String)} */
+-    public final AWSRequestMetrics incrementCounterWith(String event) {
+-        incrementCounter(event);
+-        return this;
+-    }
+-    /** Fluent API of {@link #incrementCounter(MetricType)} */
+-    public final AWSRequestMetrics incrementCounterWith(MetricType f) {
+-        incrementCounter(f);
+-        return this;
+-    }
+-
+-    public void setCounter(String counterName, long count) {}
+-    public void setCounter(MetricType f, long count) {}
+-    /** Fluent API of {@link #setCounter(String, long)} */
+-    public final AWSRequestMetrics withCounter(String counterName, long count) {
+-        setCounter(counterName, count);
+-        return this;
+-    }
+-    /** Fluent API of {@link #setCounter(MetricType, long)} */
+-    public final AWSRequestMetrics withCounter(MetricType f, long count) {
+-        setCounter(f, count);
+-        return this;
+-    }
+-
+-    public void addProperty(String propertyName, Object value) {}
+-    public void addProperty(MetricType f, Object value) {}
+-    /** Fluent API of {@link #addProperty(String, Object)} */
+-    public final AWSRequestMetrics addPropertyWith(String propertyName, Object value) {
+-        addProperty(propertyName, value);
+-        return this;
+-    }
+-    /** Fluent API of {@link #addProperty(MetricType, Object)} */
+-    public final AWSRequestMetrics addPropertyWith(MetricType f, Object value) {
+-        addProperty(f, value);
+-        return this;
+-    }
+-
+-    public void log() {}
+-    public List getProperty(String propertyName){ return Collections.emptyList(); }
+-    public List getProperty(MetricType f) { return Collections.emptyList(); }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/AWSServiceMetrics.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/AWSServiceMetrics.java
+--- ./src/main/java/com/amazonaws/util/AWSServiceMetrics.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/AWSServiceMetrics.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,37 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.util;
+-
+-import com.amazonaws.metrics.ServiceMetricType;
+-
+-/**
+- * Predefined AWS SDK non-request specific metric types general across all AWS
+- * clients. Client specific predefined metrics like S3 or DynamoDB are defined
+- * in the client specific packages.
+- */
+-public enum AWSServiceMetrics implements ServiceMetricType {
+-    /**
+-     * Time taken to get a connection by the http client library.
+-     */
+-    HttpClientGetConnectionTime("HttpClient"),
+-    ;
+-
+-    private final String serviceName;
+-    private AWSServiceMetrics(String serviceName) {
+-        this.serviceName = serviceName;
+-    }
+-    @Override public String getServiceName() { return serviceName; }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/Base16Codec.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/Base16Codec.java
+--- ./src/main/java/com/amazonaws/util/Base16Codec.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/Base16Codec.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,102 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-/**
+- * A Base 16 codec implementation.
+- *
+- * @author Hanson Char
+- */
+-class Base16Codec implements Codec {
+-    private static final int OFFSET_OF_a = 'a' - 10;
+-    private static final int OFFSET_OF_A = 'A' - 10;
+-    private static final int MASK_4BITS = (1 << 4) - 1;
+-
+-    private static class LazyHolder {
+-        private static final byte[] DECODED = decodeTable();
+-
+-        private static byte[] decodeTable() {
+-            final byte[] dest = new byte['f'+1];
+-
+-            for (int i=0; i <= 'f'; i++)
+-            {
+-                if (i >= '0' && i <= '9')
+-                    dest[i] = (byte)(i - '0');
+-                else if (i >= 'A' && i <= 'F')
+-                    dest[i] = (byte)(i - OFFSET_OF_A);
+-                else if (i >= 'a' && i <= 'f')
+-                    dest[i] = (byte)(i - OFFSET_OF_a);
+-                else
+-                    dest[i] = -1;
+-            }
+-            return dest;
+-        }
+-    }
+-
+-    private final byte[] alphabets;
+-
+-    Base16Codec() {
+-        this(true);
+-    }
+-
+-    Base16Codec(boolean upperCase) {
+-        this.alphabets = upperCase
+-                  ? CodecUtils.toBytesDirect("0123456789ABCDEF")
+-                  : CodecUtils.toBytesDirect("0123456789abcdef");
+-    }
+-
+-    @Override
+-    public byte[] encode(byte[] src) {
+-        byte[] dest = new byte[src.length * 2];
+-        byte p;
+-
+-        for (int i=0,j=0; i < src.length; i++) {
+-            dest[j++] = (byte)alphabets[(p=src[i]) >>> 4 & MASK_4BITS];
+-            dest[j++] = (byte)alphabets[p & MASK_4BITS];
+-        }
+-        return dest;
+-    }
+-
+-    @Override
+-    public byte[] decode(byte[] src, final int length)
+-    {
+-        if (length % 2 != 0) {
+-            throw new IllegalArgumentException(
+-                "Input is expected to be encoded in multiple of 2 bytes but found: "
+-                + length
+-            );
+-        }
+-        final byte[] dest = new byte[length / 2];
+-
+-        for (int i=0, j=0; j < dest.length; j++)
+-        {
+-            dest[j] = (byte)
+-                    (
+-                        pos(src[i++]) << 4 | pos(src[i++])
+-                    )
+-                    ;
+-
+-        }
+-        return dest;
+-    }
+-
+-    protected int pos(byte in) {
+-        int pos = LazyHolder.DECODED[in];
+-
+-        if (pos > -1)
+-            return pos;
+-        throw new IllegalArgumentException("Invalid base 16 character: \'" + (char)in + "\'");
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/Base16.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/Base16.java
+--- ./src/main/java/com/amazonaws/util/Base16.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/Base16.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,60 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-/**
+- * A Base 16 codec API, which encodes into hex string in upper case.
+- *
+- * See http://www.ietf.org/rfc/rfc4648.txt
+- *
+- * @author Hanson Char
+- */
+-public enum Base16 {
+-    ;
+-    private static final Base16Codec codec = new Base16Codec();
+-
+-    /**
+-     * Returns a base 16 encoded string (in upper case) of the given bytes.
+-     */
+-    public static String encodeAsString(byte ... bytes) {
+-        if (bytes == null)
+-            return null;
+-        return bytes.length == 0 ? "" : CodecUtils.toStringDirect(codec.encode(bytes));
+-    }
+-
+-    /**
+-     * Returns a base 16 encoded byte array of the given bytes.
+-     */
+-    public static byte[] encode(byte[] bytes) { return bytes == null || bytes.length == 0 ? bytes : codec.encode(bytes); }
+-
+-    /**
+-     * Decodes the given base 16 encoded string,
+-     * skipping carriage returns, line feeds and spaces as needed.
+-     */
+-    public static byte[] decode(String b16) {
+-        if (b16 == null)
+-            return null;
+-        if (b16.length() == 0)
+-            return new byte[0];
+-        byte[] buf = new byte[b16.length()];
+-        int len = CodecUtils.sanitize(b16, buf);
+-        return codec.decode(buf, len);
+-    }
+-
+-    /**
+-     * Decodes the given base 16 encoded bytes.
+-     */
+-    public static byte[] decode(byte[] b16) { return b16 == null || b16.length == 0 ? b16 :  codec.decode(b16, b16.length); }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/Base16Lower.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/Base16Lower.java
+--- ./src/main/java/com/amazonaws/util/Base16Lower.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/Base16Lower.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,60 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-/**
+- * A Base 16 codec API, which encodes into hex string in lower case.
+- *
+- * See http://www.ietf.org/rfc/rfc4648.txt
+- *
+- * @author Hanson Char
+- */
+-public enum Base16Lower {
+-    ;
+-    private static final Base16Codec codec = new Base16Codec(false);
+-
+-    /**
+-     * Returns a base 16 encoded string (in lower case) of the given bytes.
+-     */
+-    public static String encodeAsString(byte ... bytes) {
+-        if (bytes == null)
+-            return null;
+-        return bytes.length == 0 ? "" : CodecUtils.toStringDirect(codec.encode(bytes));
+-    }
+-
+-    /**
+-     * Returns a base 16 encoded byte array of the given bytes.
+-     */
+-    public static byte[] encode(byte[] bytes) { return bytes == null || bytes.length == 0 ? bytes : codec.encode(bytes); }
+-
+-    /**
+-     * Decodes the given base 16 encoded string,
+-     * skipping carriage returns, line feeds and spaces as needed.
+-     */
+-    public static byte[] decode(String b16) {
+-        if (b16 == null)
+-            return null;
+-        if (b16.length() == 0)
+-            return new byte[0];
+-        byte[] buf = new byte[b16.length()];
+-        int len = CodecUtils.sanitize(b16, buf);
+-        return codec.decode(buf, len);
+-    }
+-
+-    /**
+-     * Decodes the given base 16 encoded bytes.
+-     */
+-    public static byte[] decode(byte[] b16) { return b16 == null || b16.length == 0 ? b16 :  codec.decode(b16, b16.length); }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/Base32Codec.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/Base32Codec.java
+--- ./src/main/java/com/amazonaws/util/Base32Codec.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/Base32Codec.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,63 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-/**
+- * A Base 32 codec implementation.
+- * 
+- * @author Hanson Char
+- */
+-class Base32Codec extends AbstractBase32Codec {
+-    private static final int OFFSET_OF_2 = '2' - 26;
+-    
+-    private static class LazyHolder {
+-        private static final byte[] DECODED = decodeTable();
+-        
+-        private static byte[] decodeTable() {
+-            final byte[] dest = new byte['z'+1];
+-            
+-            for (int i=0; i <= 'z'; i++) 
+-            {
+-                if (i >= 'A' && i <= 'Z')
+-                    dest[i] = (byte)(i - 'A');
+-                else if (i >= '2' && i <= '7')
+-                    dest[i] = (byte)(i - OFFSET_OF_2);
+-                else if (i >= 'a' && i <= 'z')
+-                    dest[i] = (byte)(i - 'a');
+-                else 
+-                    dest[i] = -1;
+-            }
+-            return dest;
+-        }
+-    }
+-
+-    private static byte[] alphabets() {
+-        // Base 32 alphabet as defined at http://www.ietf.org/rfc/rfc4648.txt
+-        return CodecUtils.toBytesDirect("ABCDEFGHIJKLMNOPQRSTUVWXYZ234567");
+-    }
+-
+-    Base32Codec() {
+-        super(alphabets());
+-    }
+-    
+-    @Override
+-    protected int pos(byte in) {
+-        int pos = LazyHolder.DECODED[in];
+-        
+-        if (pos > -1)
+-            return pos;
+-        throw new IllegalArgumentException("Invalid base 32 character: \'" + (char)in + "\'");
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/Base32.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/Base32.java
+--- ./src/main/java/com/amazonaws/util/Base32.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/Base32.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,60 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-/**
+- * A Base 32 codec API.
+- * 
+- * See http://www.ietf.org/rfc/rfc4648.txt
+- * 
+- * @author Hanson Char
+- */
+-public enum Base32 {
+-    ;
+-    private static final Base32Codec codec = new Base32Codec();
+-    
+-    /**
+-     * Returns a base 32 encoded string of the given bytes.
+-     */
+-    public static String encodeAsString(byte ... bytes) {
+-        if (bytes == null)
+-            return null;
+-        return bytes.length == 0 ? "" : CodecUtils.toStringDirect(codec.encode(bytes)); 
+-    }
+-    
+-    /**
+-     * Returns a 32 encoded byte array of the given bytes.
+-     */
+-    public static byte[] encode(byte[] bytes) { return bytes == null || bytes.length == 0 ? bytes : codec.encode(bytes); }
+-    
+-    /** 
+-     * Decodes the given base 32 encoded string,
+-     * skipping carriage returns, line feeds and spaces as needed.
+-     */
+-    public static byte[] decode(String b32) {
+-        if (b32 == null)
+-            return null;
+-        if (b32.length() == 0)
+-            return new byte[0];
+-        byte[] buf = new byte[b32.length()];
+-        int len = CodecUtils.sanitize(b32, buf);
+-        return codec.decode(buf, len);
+-    }
+-    
+-    /** 
+-     * Decodes the given base 32 encoded bytes.
+-     */
+-    public static byte[] decode(byte[] b32) { return b32 == null || b32.length == 0 ? b32 :  codec.decode(b32, b32.length); }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/Base64Codec.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/Base64Codec.java
+--- ./src/main/java/com/amazonaws/util/Base64Codec.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/Base64Codec.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,244 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-import static com.amazonaws.util.CodecUtils.sanityCheckLastPos;
+-
+-/**
+- * A Base 64 codec implementation.
+- * 
+- * @author Hanson Char
+- */
+-class Base64Codec implements Codec {
+-    private static final int OFFSET_OF_a = 'a' - 26;
+-    private static final int OFFSET_OF_0 = '0' - 52;
+-    private static final int OFFSET_OF_PLUS = '+' - 62;
+-    private static final int OFFSET_OF_SLASH = '/' - 63;
+-    
+-    private static final int MASK_2BITS = (1 << 2) - 1;
+-    private static final int MASK_4BITS = (1 << 4) - 1;
+-    private static final int MASK_6BITS = (1 << 6) - 1;
+-    // Alphabet as defined at http://www.ietf.org/rfc/rfc4648.txt
+-    private static final byte PAD = '=';
+-    
+-    private static class LazyHolder {
+-        private static final byte[] DECODED = decodeTable();
+-        
+-        private static byte[] decodeTable() {
+-            final byte[] dest = new byte['z'+1];
+-            
+-            for (int i=0; i <= 'z'; i++) 
+-            {
+-                if (i >= 'A' && i <= 'Z')
+-                    dest[i] = (byte)(i - 'A');
+-                else if (i >= '0' && i <= '9')
+-                    dest[i] = (byte)(i - OFFSET_OF_0);
+-                else if (i == '+')
+-                    dest[i] = (byte)(i - OFFSET_OF_PLUS);
+-                else if (i == '/')
+-                    dest[i] = (byte)(i - OFFSET_OF_SLASH);
+-                else if (i >= 'a' && i <= 'z')
+-                    dest[i] = (byte)(i - OFFSET_OF_a);
+-                else 
+-                    dest[i] = -1;
+-            }
+-            return dest;
+-        }
+-    }
+-
+-    private final byte[] alphabets;
+-
+-    Base64Codec() {
+-        this.alphabets = CodecUtils.toBytesDirect("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/");
+-    }
+-    
+-    protected Base64Codec(byte[] alphabets) {
+-        this.alphabets = alphabets;
+-    }
+-
+-    @Override
+-    public byte[] encode(byte[] src) {
+-        final int num3bytes = src.length / 3;
+-        final int remainder = src.length % 3;
+-        
+-        if (remainder == 0)
+-        {
+-            byte[] dest = new byte[num3bytes * 4];
+-    
+-            for (int s=0,d=0; s < src.length; s+=3, d+=4)
+-                encode3bytes(src, s, dest, d);
+-            return dest;
+-        }
+-        
+-        byte[] dest = new byte[(num3bytes+1) * 4];
+-        int s=0, d=0;
+-        
+-        for (; s < src.length-remainder; s+=3, d+=4)
+-            encode3bytes(src, s, dest, d);
+-        
+-        switch(remainder) {
+-            case 1:
+-                encode1byte(src, s, dest, d);
+-                break;
+-            case 2:
+-                encode2bytes(src, s, dest, d);
+-                break;
+-            default:
+-                throw new IllegalStateException();
+-        }
+-        return dest;
+-    }
+-    
+-    void encode3bytes(byte[] src, int s, byte[] dest, int d) {
+-        // operator precedence in descending order: >>> or <<, &, |
+-        byte p;
+-        dest[d++] = (byte)alphabets[(p=src[s++]) >>> 2 & MASK_6BITS];                         // 6 
+-        dest[d++] = (byte)alphabets[(p & MASK_2BITS) << 4 | (p=src[s++]) >>> 4 & MASK_4BITS]; // 2 4
+-        dest[d++] = (byte)alphabets[(p & MASK_4BITS) << 2 | (p=src[s]) >>> 6 & MASK_2BITS];   //   4 2
+-        dest[d] = (byte)alphabets[p & MASK_6BITS];                                            //     6
+-        return;
+-    }
+-    
+-    void encode2bytes(byte[] src, int s, byte[] dest, int d) {
+-        // operator precedence in descending order: >>> or <<, &, |
+-        byte p;
+-        dest[d++] = (byte)alphabets[(p=src[s++]) >>> 2 & MASK_6BITS];                         // 6 
+-        dest[d++] = (byte)alphabets[(p & MASK_2BITS) << 4 | (p=src[s]) >>> 4 & MASK_4BITS];   // 2 4
+-        dest[d++] = (byte)alphabets[(p & MASK_4BITS) << 2];                                   //   4
+-        dest[d] = PAD;
+-        return;
+-    }
+-    
+-    void encode1byte(byte[] src, int s, byte[] dest, int d) {
+-        // operator precedence in descending order: >>> or <<, &, |
+-        byte p;
+-        dest[d++] = (byte)alphabets[(p=src[s]) >>> 2 & MASK_6BITS];                           // 6 
+-        dest[d++] = (byte)alphabets[(p & MASK_2BITS) << 4];                                   // 2
+-        dest[d++] = PAD;
+-        dest[d] = PAD;
+-        return;
+-    }
+-    
+-    void decode4bytes(byte[] src, int s, byte[] dest, int d) {
+-        int p=0;
+-        // operator precedence in descending order: >>> or <<, &, |
+-        dest[d++] = (byte)
+-                    (
+-                        pos(src[s++]) << 2
+-                        | (p=pos(src[s++])) >>> 4 & MASK_2BITS
+-                    )
+-                    ;                                               // 6 2
+-        dest[d++] = (byte)
+-                    (
+-                        (p & MASK_4BITS) << 4 
+-                        | (p=pos(src[s++])) >>> 2 & MASK_4BITS
+-                    )
+-                    ;                                               //   4 4
+-        dest[d] = (byte)
+-                    (
+-                        (p & MASK_2BITS) << 6
+-                        | pos(src[s])
+-                    )
+-                    ;                                               //     2 6
+-        return;
+-    }
+-    
+-    /**
+-     * @param n the number of final quantum in bytes to decode into.  Ranges from 1 to 3, inclusive.
+-     */
+-    void decode1to3bytes(int n, byte[] src, int s, byte[] dest, int d) {
+-        int p=0;
+-        // operator precedence in descending order: >>> or <<, &, |
+-        dest[d++] = (byte)
+-                    (
+-                        pos(src[s++]) << 2
+-                        | (p=pos(src[s++])) >>> 4 & MASK_2BITS
+-                    )
+-                    ;                                               // 6 2
+-        if (n == 1) {
+-            sanityCheckLastPos(p, MASK_4BITS);
+-            return;
+-        }
+-        
+-        dest[d++] = (byte)
+-                    (
+-                        (p & MASK_4BITS) << 4 
+-                        | (p=pos(src[s++])) >>> 2 & MASK_4BITS
+-                    )
+-                    ;                                               //   4 4
+-        if (n == 2) {
+-            sanityCheckLastPos(p, MASK_2BITS);
+-            return;
+-        }
+-        
+-        dest[d] = (byte)
+-                    (
+-                        (p & MASK_2BITS) << 6
+-                        | pos(src[s])
+-                    )
+-                    ;                                               //     2 6
+-        return;
+-    }
+-
+-    @Override
+-    public byte[] decode(byte[] src, final int length) 
+-    {
+-        if (length % 4 != 0)
+-            throw new IllegalArgumentException
+-            ("Input is expected to be encoded in multiple of 4 bytes but found: " + length);
+-
+-        int pads=0;
+-        int last = length-1;
+-        
+-        // max possible padding in b64 encoding is 2
+-        for (; pads < 2 && last > -1; last--, pads++) {
+-            if (src[last] != PAD)
+-                break;
+-        }
+-        
+-        final int fq; // final quantum in unit of bytes
+-        
+-        switch(pads) {
+-            case 0:
+-                fq=3;
+-                break; // final quantum of encoding input is an integral multiple of 24 bits
+-            case 1:
+-                fq=2;
+-                break; // final quantum of encoding input is exactly 16 bits
+-            case 2:
+-                fq=1;
+-                break; // final quantum of encoding input is exactly 8 bits
+-            default:
+-                throw new Error("Impossible");
+-        }
+-        final byte[] dest = new byte[length / 4 * 3 - (3-fq)]; 
+-        int s=0, d=0;
+-        
+-        // % has a higher precedence than - than <
+-        for (; d < dest.length - fq%3; s+=4,d+=3)
+-            decode4bytes(src, s, dest, d);
+-
+-        if (fq < 3)
+-            decode1to3bytes(fq, src, s, dest, d);
+-        return dest;
+-    }
+-    
+-    protected int pos(byte in) {
+-        int pos = LazyHolder.DECODED[in];
+-        
+-        if (pos > -1)
+-            return pos;
+-        throw new IllegalArgumentException("Invalid base 64 character: \'" + (char)in + "\'");
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/Base64.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/Base64.java
+--- ./src/main/java/com/amazonaws/util/Base64.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/Base64.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,96 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import javax.xml.bind.DatatypeConverter;
+-import javax.xml.bind.JAXBContext;
+-import javax.xml.bind.JAXBException;
+-
+-import com.amazonaws.log.InternalLogApi;
+-import com.amazonaws.log.InternalLogFactory;
+-
+-import java.util.HashMap;
+-import java.util.Map;
+-
+-/**
+- * A Base 64 codec API.
+- *
+- * See http://www.ietf.org/rfc/rfc4648.txt
+- *
+- * @author Hanson Char
+- */
+-public enum Base64 {
+-    ;
+-    private static final InternalLogApi LOG = InternalLogFactory.getLog(Base64.class);
+-    private static final Base64Codec codec = new Base64Codec();
+-
+-    static {
+-        Map inconsistentJaxbImpls = new HashMap();
+-        inconsistentJaxbImpls.put("org.apache.ws.jaxme.impl.JAXBContextImpl", "Apache JaxMe");
+-
+-        try {
+-            String className = JAXBContext.newInstance().getClass().getName();
+-            if (inconsistentJaxbImpls.values().contains(className)) {
+-                LOG.warn("A JAXB implementation known to produce base64 encodings that are " +
+-                        "inconsistent with the reference implementation has been detected. The " +
+-                        "results of the encodeAsString() method may be incorrect. Implementation: " +
+-                        inconsistentJaxbImpls.get(className));
+-            }
+-        } catch (JAXBException ignored) {
+-        }
+-    }
+-
+-    /**
+-     * Returns a base 64 encoded string of the given bytes.
+-     */
+-    public static String encodeAsString(byte ... bytes) {
+-        if (bytes == null)
+-            return null;
+-        try {
+-            return DatatypeConverter.printBase64Binary(bytes);
+-        } catch (NullPointerException ex) {
+-            // https://netbeans.org/bugzilla/show_bug.cgi?id=224923
+-            // https://issues.apache.org/jira/browse/CAMEL-4893
+-
+-            // Note the converter should eventually be initialized and printBase64Binary should start working again
+-            LOG.debug("Recovering from JAXB bug: https://netbeans.org/bugzilla/show_bug.cgi?id=224923", ex);
+-        }
+-        return bytes.length == 0 ? "" : CodecUtils.toStringDirect(codec.encode(bytes));
+-    }
+-
+-    /**
+-     * Returns a 64 encoded byte array of the given bytes.
+-     */
+-    public static byte[] encode(byte[] bytes) { return bytes == null || bytes.length == 0 ? bytes : codec.encode(bytes); }
+-
+-    /**
+-     * Decodes the given base 64 encoded string,
+-     * skipping carriage returns, line feeds and spaces as needed.
+-     */
+-    public static byte[] decode(String b64) {
+-        if (b64 == null)
+-            return null;
+-        if (b64.length() == 0)
+-            return new byte[0];
+-        byte[] buf = new byte[b64.length()];
+-        int len = CodecUtils.sanitize(b64, buf);
+-        return codec.decode(buf, len);
+-    }
+-
+-    /**
+-     * Decodes the given base 64 encoded bytes.
+-     */
+-    public static byte[] decode(byte[] b64) { return b64 == null || b64.length == 0 ? b64 :  codec.decode(b64, b64.length); }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/BasicNameValuePair.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/BasicNameValuePair.java
+--- ./src/main/java/com/amazonaws/util/BasicNameValuePair.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/BasicNameValuePair.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,123 +0,0 @@
+-/*
+- * ====================================================================
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *   http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing,
+- * software distributed under the License is distributed on an
+- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+- * KIND, either express or implied.  See the License for the
+- * specific language governing permissions and limitations
+- * under the License.
+- * ====================================================================
+- *
+- * This software consists of voluntary contributions made by many
+- * individuals on behalf of the Apache Software Foundation.  For more
+- * information on the Apache Software Foundation, please see
+- * .
+- *
+- */
+-
+-package com.amazonaws.util;
+-
+-import java.io.Serializable;
+-
+-import com.amazonaws.annotation.Immutable;
+-
+-/**
+- * Basic implementation of {@link NameValuePair}.
+- *
+- * @since 4.0
+- */
+-@Immutable
+-class BasicNameValuePair implements NameValuePair, Cloneable, Serializable {
+-    private static final long serialVersionUID = 1L;
+-    public static final int HASH_SEED = 17;
+-    public static final int HASH_OFFSET = 37;
+-
+-    private final String name;
+-    private final String value;
+-
+-    /**
+-     * Default Constructor taking a name and a value. The value may be null.
+-     *
+-     * @param name The name.
+-     * @param value The value.
+-     */
+-    BasicNameValuePair(final String name, final String value) {
+-        if (name == null)
+-            throw new IllegalArgumentException("Name must not be null");
+-        this.name = name;
+-        this.value = value;
+-    }
+-
+-    @Override
+-    public String getName() {
+-        return this.name;
+-    }
+-
+-    @Override
+-    public String getValue() {
+-        return this.value;
+-    }
+-
+-    @Override
+-    public String toString() {
+-        // don't call complex default formatting for a simple toString
+-
+-        if (this.value == null) {
+-            return name;
+-        }
+-        final int len = this.name.length() + 1 + this.value.length();
+-        final StringBuilder buffer = new StringBuilder(len);
+-        buffer.append(this.name);
+-        buffer.append("=");
+-        buffer.append(this.value);
+-        return buffer.toString();
+-    }
+-
+-    @Override
+-    public boolean equals(final Object object) {
+-        if (this == object) {
+-            return true;
+-        }
+-        if (object instanceof NameValuePair) {
+-            final BasicNameValuePair that = (BasicNameValuePair) object;
+-            return this.name.equals(that.name)
+-                  && equals(this.value, that.value);
+-        }
+-        return false;
+-    }
+-
+-    private static boolean equals(final Object obj1, final Object obj2) {
+-        return obj1 == null ? obj2 == null : obj1.equals(obj2);
+-    }
+-
+-    @Override
+-    public int hashCode() {
+-        int hash = HASH_SEED;
+-        hash = hashCode(hash, this.name);
+-        hash = hashCode(hash, this.value);
+-        return hash;
+-    }
+-
+-    @Override
+-    public Object clone() throws CloneNotSupportedException {
+-        return super.clone();
+-    }
+-
+-    private static int hashCode(final int seed, final Object obj) {
+-        return hashCode(seed, obj != null ? obj.hashCode() : 0);
+-    }
+-
+-    private static int hashCode(final int seed, final int hashcode) {
+-        return seed * HASH_OFFSET + hashcode;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/BinaryUtils.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/BinaryUtils.java
+--- ./src/main/java/com/amazonaws/util/BinaryUtils.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/BinaryUtils.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,155 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Portions copyright 2006-2009 James Murty. Please see LICENSE.txt
+- * for applicable license terms and NOTICE.txt for applicable notices.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import java.io.ByteArrayInputStream;
+-import java.nio.ByteBuffer;
+-import java.util.Arrays;
+-
+-/**
+- * Utilities for encoding and decoding binary data to and from different forms.
+- */
+-public class BinaryUtils {
+-    /**
+-     * Converts byte data to a Hex-encoded string in lower case.
+-     *
+-     * @param data
+-     *            data to hex encode.
+-     *
+-     * @return hex-encoded string.
+-     */
+-    public static String toHex(byte[] data) {
+-        return Base16Lower.encodeAsString(data);
+-    }
+-
+-    /**
+-     * Converts a Hex-encoded data string to the original byte data.
+-     *
+-     * @param hexData
+-     *            hex-encoded data to decode.
+-     * @return decoded data from the hex string.
+-     */
+-    public static byte[] fromHex(String hexData) {
+-        return Base16Lower.decode(hexData);
+-    }
+-
+-    /**
+-     * Converts byte data to a Base64-encoded string.
+-     *
+-     * @param data
+-     *            data to Base64 encode.
+-     * @return encoded Base64 string.
+-     */
+-    public static String toBase64(byte[] data) {
+-        return Base64.encodeAsString(data);
+-    }
+-
+-    /**
+-     * Converts a Base64-encoded string to the original byte data.
+-     *
+-     * @param b64Data
+-     *            a Base64-encoded string to decode.
+-     *
+-     * @return bytes decoded from a Base64 string.
+-     */
+-    public static byte[] fromBase64(String b64Data) {
+-        return b64Data == null ? null : Base64.decode(b64Data);
+-    }
+-
+-    /**
+-     * Wraps a ByteBuffer in an InputStream. If the input {@code byteBuffer}
+-     * is null, returns an empty stream.
+-     *
+-     * @param byteBuffer The ByteBuffer to wrap.
+-     *
+-     * @return An InputStream wrapping the ByteBuffer content.
+-     */
+-    public static ByteArrayInputStream toStream(ByteBuffer byteBuffer) {
+-        if (byteBuffer == null) {
+-            return new ByteArrayInputStream(new byte[0]);
+-        }
+-        return new ByteArrayInputStream(copyBytesFrom(byteBuffer));
+-    }
+-
+-    /**
+-     * Returns a copy of all the bytes from the given ByteBuffer,
+-     * from the beginning to the buffer's limit; or null if the input is null.
+-     * 

+-     * The internal states of the given byte buffer will be restored when this
+-     * method completes execution.
+-     * 

+-     * When handling ByteBuffer from user's input, it's typical to
+-     * call the {@link #copyBytesFrom(ByteBuffer)} instead of
+-     * {@link #copyAllBytesFrom(ByteBuffer)} so as to account for the position
+-     * of the input ByteBuffer. The opposite is typically true,
+-     * however, when handling ByteBuffer from withint the
+-     * unmarshallers of the low-level clients.
+-     */
+-    public static byte[] copyAllBytesFrom(ByteBuffer bb) {
+-        if (bb == null) {
+-            return null;
+-        }
+-
+-        if (bb.hasArray()) {
+-            return Arrays.copyOfRange(
+-                    bb.array(),
+-                    bb.arrayOffset(),
+-                    bb.arrayOffset() + bb.limit());
+-        }
+-
+-        ByteBuffer copy = bb.asReadOnlyBuffer();
+-        copy.rewind();
+-
+-        byte[] dst = new byte[copy.remaining()];
+-        copy.get(dst);
+-        return dst;
+-    }
+-
+-    /**
+-     * Returns a copy of the bytes from the given ByteBuffer,
+-     * ranging from the the buffer's current position to the buffer's limit; or
+-     * null if the input is null.
+-     * 

+-     * The internal states of the given byte buffer will be restored when this
+-     * method completes execution.
+-     * 

+-     * When handling ByteBuffer from user's input, it's typical to
+-     * call the {@link #copyBytesFrom(ByteBuffer)} instead of
+-     * {@link #copyAllBytesFrom(ByteBuffer)} so as to account for the position
+-     * of the input ByteBuffer. The opposite is typically true,
+-     * however, when handling ByteBuffer from withint the
+-     * unmarshallers of the low-level clients.
+-     */
+-    public static byte[] copyBytesFrom(ByteBuffer bb) {
+-        if (bb == null) {
+-            return null;
+-        }
+-
+-        if (bb.hasArray()) {
+-            return Arrays.copyOfRange(
+-                    bb.array(),
+-                    bb.arrayOffset() + bb.position(),
+-                    bb.arrayOffset() + bb.limit());
+-        }
+-
+-        byte[] dst = new byte[bb.remaining()];
+-        bb.asReadOnlyBuffer().get(dst);
+-        return dst;
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/CapacityManager.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/CapacityManager.java
+--- ./src/main/java/com/amazonaws/util/CapacityManager.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/CapacityManager.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,124 +0,0 @@
+-/*
+- * Copyright (c) 2016. Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-/**
+- * Manages capacity of a finite resource.  Capacity can be acquired and
+- * released.
+- */
+-public class CapacityManager {
+-
+-    private volatile int availableCapacity;
+-    private final int maxCapacity;
+-
+-    private final Object lock = new Object();
+-
+-    /**
+-     * Creates a CapacityManager.
+-     *
+-     * @param maxCapacity maximum capacity of this resource.
+-     *                    available capacity will initially be set to this value.
+-     *                    if a negative value is provided the capacity manager will operate in a no-op
+-     *                    passthrough mode in which all acquire calls will return true.
+-     */
+-    public CapacityManager(final int maxCapacity) {
+-        this.maxCapacity = maxCapacity;
+-        this.availableCapacity = maxCapacity;
+-    }
+-
+-    /**
+-     * Attempts to acquire a single capacity unit.
+-     * If acquired, capacity will be consumed from the available pool.
+-
+-     * @return true if capacity can be acquired, false if not
+-     */
+-    public boolean acquire() {
+-        return acquire(1);
+-    }
+-
+-    /**
+-     * Attempts to acquire a given amount of capacity.
+-     * If acquired, capacity will be consumed from the available pool.
+-     *
+-     * @param capacity capacity to acquire
+-     * @return true if capacity can be acquired, false if not
+-     * @throws IllegalArgumentException if given capacity is negative
+-     */
+-    public boolean acquire(int capacity) {
+-        if (capacity < 0) {
+-            throw new IllegalArgumentException("capacity to acquire cannot be negative");
+-        }
+-
+-        if (availableCapacity < 0) {
+-            return true;
+-        }
+-
+-        synchronized (lock) {
+-            if (availableCapacity - capacity >= 0) {
+-                availableCapacity -= capacity;
+-                return true;
+-            } else {
+-                return false;
+-            }
+-        }
+-    }
+-
+-    /**
+-     * Releases a single unit of capacity back to the pool, making it available
+-     * to consumers.
+-     */
+-    public void release() {
+-        release(1);
+-    }
+-
+-    /**
+-     * Releases a given amount of capacity back to the pool, making it available
+-     * to consumers.
+-     *
+-     * @param capacity capacity to release
+-     * @throws IllegalArgumentException if given capacity is negative
+-     */
+-    public void release(int capacity) {
+-        if (capacity < 0) {
+-            throw new IllegalArgumentException("capacity to release cannot be negative");
+-        }
+-
+-        // in the common 'good' case where we have our full capacity available we can
+-        // short circuit going any further and avoid unnecessary locking.
+-        if (availableCapacity >= 0 && availableCapacity != maxCapacity) {
+-            synchronized (lock) {
+-                availableCapacity = Math.min((availableCapacity + capacity), maxCapacity);
+-            }
+-        }
+-    }
+-
+-    /**
+-     * Returns the currently consumed capacity.
+-     *
+-     * @return consumed capacity
+-     */
+-    public int consumedCapacity() {
+-        return (availableCapacity < 0) ? 0 : (maxCapacity - availableCapacity);
+-    }
+-
+-    /**
+-     * Returns the currently available capacity.
+-     *
+-     * @return available capacity
+-     */
+-    public int availableCapacity() {
+-        return availableCapacity;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/Classes.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/Classes.java
+--- ./src/main/java/com/amazonaws/util/Classes.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/Classes.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,85 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Portions copyright 2006-2009 James Murty. Please see LICENSE.txt
+- * for applicable license terms and NOTICE.txt for applicable notices.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.net.URL;
+-import java.util.jar.JarFile;
+-
+-/**
+- * Classes related utilities.
+- */
+-public enum Classes {
+-    ;
+-    /**
+-     * Returns the class of the immediate subclass of the given parent class for
+-     * the given object instance; or null if such immediate subclass cannot be
+-     * uniquely identified for the given object instance.
+-     * 
+-     * @param parentClass
+-     *            the parent class. The child class is {@link Object} if and
+-     *            only if the parent class is null.
+-     * @param instance
+-     *            the given object instance
+-     */
+-    public static Class childClassOf(Class parentClass,
+-            Object instance) {
+-        if (instance == null || instance == Object.class)
+-            return null;
+-        if (parentClass != null) {
+-            if (parentClass.isInterface()) {
+-                // child of an interface class is not injective (ie one-to-one)
+-                return null;
+-            }
+-        }
+-        Class childClass = instance.getClass();
+-        while (true) {
+-            Class parent = childClass.getSuperclass();
+-            if (parent == parentClass)
+-                return childClass;
+-            if (parent == null)
+-                return null;
+-            childClass = parent;
+-        }
+-    }
+-
+-    /**
+-     * Returns the jar file from which the given class is loaded; or null
+-     * if no such jar file can be located.
+-     */
+-    public static JarFile jarFileOf(Class klass) {
+-        URL url = klass.getResource(
+-            "/" + klass.getName().replace('.', '/') + ".class");
+-        if (url == null)
+-            return null;
+-        String s = url.getFile();
+-        int beginIndex = s.indexOf("file:") + "file:".length();
+-        int endIndex = s.indexOf(".jar!");
+-        if (endIndex == -1)
+-            return null;
+-        endIndex += ".jar".length();
+-        String f = s.substring(beginIndex, endIndex);
+-        File file = new File(f);
+-        try {
+-            return file.exists() ? new JarFile(file) : null;
+-        } catch (IOException e) {
+-            throw new IllegalStateException(e);
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/ClassLoaderHelper.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/ClassLoaderHelper.java
+--- ./src/main/java/com/amazonaws/util/ClassLoaderHelper.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/ClassLoaderHelper.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,230 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon Technologies, Inc.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at:
+- *
+- *    http://aws.amazon.com/apache2.0
+- *
+- * This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+- * OR CONDITIONS OF ANY KIND, either express or implied. See the
+- * License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.net.URL;
+-
+-public enum ClassLoaderHelper {
+-    ;
+-    /**
+-     * Retrieves the resource via the context class loader of the current
+-     * thread, and if not found, via the class loaders of the optionally
+-     * specified classes in the order of their specification, and if not
+-     * found, from the class loader of {@link ClassLoaderHelper} as the last
+-     * resort.
+-     * 
+-     * @param resource
+-     *            resource to be loaded
+-     * @param classes class loader providers
+-     * @return the resource loaded as an URL or null if not found.
+-     */
+-    public static URL getResource(String resource, Class ... classes) {
+-        return getResource(resource, false, classes);
+-    }
+-
+-    /**
+-     * If classesFirst is false, retrieves the resource via the context class
+-     * loader of the current thread, and if not found, via the class loaders of
+-     * the optionally specified classes in the order of their specification, and
+-     * if not found, from the class loader of {@link ClassLoaderHelper} as the
+-     * last resort.
+-     * 

+-     * If classesFirst is true, retrieves the resource via the optionally
+-     * specified classes in the order of their specification, and if not found,
+-     * via the context class loader of the current thread, and if not found,
+-     * from the class loader of {@link ClassLoaderHelper} as the last resort.
+-     * 
+-     * @param resource
+-     *            resource to be loaded
+-     * @param classesFirst
+-     *            true if the class loaders of the optionally specified classes
+-     *            take precedence over the context class loader of the current
+-     *            thread; false if the opposite is true.
+-     * @param classes
+-     *            class loader providers
+-     * @return the resource loaded as an URL or null if not found.
+-     */
+-    public static URL getResource(String resource, boolean classesFirst,
+-            Class... classes) {
+-        URL url;
+-        if (classesFirst) {
+-            url = getResourceViaClasses(resource, classes);
+-            if (url == null) {
+-                url = getResourceViaContext(resource);
+-            }
+-        } else {
+-            url = getResourceViaContext(resource);
+-            if (url == null) {
+-                url = getResourceViaClasses(resource, classes);
+-            }
+-        }
+-        return url == null ? ClassLoaderHelper.class.getResource(resource) : url;
+-    }
+-
+-    private static URL getResourceViaClasses(String resource, Class[] classes) {
+-        if (classes != null) {
+-            for (Class c: classes) {
+-                URL url = c.getResource(resource);
+-                if (url != null)
+-                    return url;
+-            }
+-        }
+-        return null;
+-    }
+-
+-    private static URL getResourceViaContext(String resource) {
+-        ClassLoader loader = Thread.currentThread().getContextClassLoader();
+-        return loader == null ? null : loader.getResource(resource);
+-    }
+-
+-    private static Class loadClassViaClasses(String fqcn, Class[] classes) {
+-        if (classes != null) {
+-            for (Class c: classes) {
+-                ClassLoader loader = c.getClassLoader();
+-                if (loader != null) {
+-                    try {
+-                        return loader.loadClass(fqcn);
+-                    } catch (ClassNotFoundException e) {
+-                        // move on to try the next class loader
+-                    }
+-                }
+-            }
+-        }
+-        return null;
+-    }
+-
+-    private static Class loadClassViaContext(String fqcn) {
+-        ClassLoader loader = Thread.currentThread().getContextClassLoader();
+-        try {
+-            return loader == null ? null : loader.loadClass(fqcn);
+-        } catch (ClassNotFoundException e) {
+-        }
+-        return null;
+-    }
+-
+-    /**
+-     * Loads the class via the optionally specified classes in the order of
+-     * their specification, and if not found, via the context class loader of
+-     * the current thread, and if not found, from the caller class loader as the
+-     * last resort.
+-     * 
+-     * @param fqcn
+-     *            fully qualified class name of the target class to be loaded
+-     * @param classes
+-     *            class loader providers
+-     * @return the class loaded; never null
+-     * 
+-     * @throws ClassNotFoundException
+-     *             if failed to load the class
+-     */
+-    public static Class loadClass(String fqcn, Class... classes)
+-            throws ClassNotFoundException {
+-        return loadClass(fqcn, true, classes);
+-    }
+-
+-    /**
+-     * If classesFirst is false, loads the class via the context class
+-     * loader of the current thread, and if not found, via the class loaders of
+-     * the optionally specified classes in the order of their specification, and
+-     * if not found, from the caller class loader as the
+-     * last resort.
+-     * 

+-     * If classesFirst is true, loads the class via the optionally
+-     * specified classes in the order of their specification, and if not found,
+-     * via the context class loader of the current thread, and if not found,
+-     * from the caller class loader as the last resort.
+-     * 
+-     * @param fqcn
+-     *            fully qualified class name of the target class to be loaded
+-     * @param classesFirst
+-     *            true if the class loaders of the optionally specified classes
+-     *            take precedence over the context class loader of the current
+-     *            thread; false if the opposite is true.
+-     * @param classes
+-     *            class loader providers
+-     * @return the class loaded; never null
+-     * 
+-     * @throws ClassNotFoundException if failed to load the class
+-     */
+-    public static Class loadClass(String fqcn, boolean classesFirst,
+-            Class... classes) throws ClassNotFoundException {
+-        Class target = null;
+-        if (classesFirst) {
+-            target = loadClassViaClasses(fqcn, classes);
+-            if (target == null) {
+-                target = loadClassViaContext(fqcn);
+-            }
+-        } else {
+-            target = loadClassViaContext(fqcn);
+-            if (target == null) {
+-                target = loadClassViaClasses(fqcn, classes);
+-            }
+-        }
+-        return target == null ? Class.forName(fqcn) : target;
+-    }
+-
+-    /**
+-     * Retrieves the resource as an input stream via
+-     * the context class loader of the current thread, and if not found, via the
+-     * class loaders of the optionally specified classes in the order of their
+-     * specification, and if not found, from the class loader of
+-     * {@link ClassLoaderHelper} as the last resort.
+-     * 
+-     * @param resource
+-     *            resource to be loaded
+-     * @param classes
+-     *            class loader providers
+-     * @return the resource loaded as an input stream or null if not found.
+-     */
+-    public static InputStream getResourceAsStream(String resource,
+-            Class... classes) {
+-        return getResourceAsStream(resource, false, classes);
+-    }
+-
+-    /**
+-     * If classesFirst is false, retrieves the resource as an input stream via
+-     * the context class loader of the current thread, and if not found, via the
+-     * class loaders of the optionally specified classes in the order of their
+-     * specification, and if not found, from the class loader of
+-     * {@link ClassLoaderHelper} as the last resort.
+-     * 

+-     * If classesFirst is true, retrieves the resource as an input stream via
+-     * the optionally specified classes in the order of their specification, and
+-     * if not found, via the context class loader of the current thread, and if
+-     * not found, from the class loader of {@link ClassLoaderHelper} as the last
+-     * resort.
+-     * 
+-     * @param resource
+-     *            resource to be loaded
+-     * @param classesFirst
+-     *            true if the class loaders of the optionally specified classes
+-     *            take precedence over the context class loader of the current
+-     *            thread; false if the opposite is true.
+-     * @param classes
+-     *            class loader providers
+-     * @return the resource loaded as an input stream or null if not found.
+-     */
+-    public static InputStream getResourceAsStream(String resource,
+-            boolean classesFirst, Class... classes) {
+-        URL url = getResource(resource, classesFirst, classes);
+-        try {
+-            return url != null ? url.openStream() : null;
+-        } catch (IOException e) {
+-            return null;
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/Codec.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/Codec.java
+--- ./src/main/java/com/amazonaws/util/Codec.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/Codec.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,25 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-/**
+- * Codec SPI
+- * 
+- * @author Hanson Char
+- */
+-interface Codec {
+-    public byte[] encode(byte[] src);
+-    public byte[] decode(byte[] src, final int length); 
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/util/CodecUtils.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/CodecUtils.java
+--- ./src/main/java/com/amazonaws/util/CodecUtils.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/CodecUtils.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,111 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-/**
+- * Codec internal utilities
+- * 
+- * @author Hanson Char
+- */
+-public enum CodecUtils {
+-    ;
+-    /**
+-     * Transforms the given string into the given destination byte array
+-     * truncating each character into a byte and skipping carriage returns and
+-     * line feeds if any.
+-     * 

+-     * dmurray: "It so happens that we're currently only calling this method
+-     * with src.length == dest.length, in which case it works, but we could
+-     * theoretically get away with passing a smaller dest if we knew ahead of
+-     * time that src contained some number of spaces. In that case it looks like
+-     * this implementation would truncate the result."
+-     * 

+-     * hchar:
+-     * "Yes, but the truncation is the intentional behavior of this internal 
+-     * routine in that case."
+-     * 
+-     * @param singleOctets
+-     *            non-null string containing only single octet characters
+-     * @param dest
+-     *            destination byte array
+-     * 
+-     * @return the actual length of the destination byte array holding data
+-     * @throws IllegalArgumentException
+-     *             if the input string contains any multi-octet character
+-     */
+-    static int sanitize(final String singleOctets, byte[] dest) {
+-        final int capacity = dest.length;
+-        final char[] src = singleOctets.toCharArray();
+-        int limit=0;
+-
+-        for (int i=0; i < capacity; i++) {
+-            final char c = src[i];
+-            
+-            if (c == '\r' || c == '\n' || c == ' ')
+-                continue;
+-            if (c > Byte.MAX_VALUE)
+-                throw new IllegalArgumentException("Invalid character found at position " + i + " for " + singleOctets);
+-            dest[limit++] = (byte)c;
+-        }
+-        return limit;
+-    }
+-    
+-    /**
+-     * Returns a byte array representing the given string,
+-     * truncating each character into a byte directly.
+-     * 
+-     * @throws IllegalArgumentException if the input string contains any multi-octet character
+-     */
+-    public static byte[] toBytesDirect(final String singleOctets) {
+-        final char[] src = singleOctets.toCharArray();
+-        final byte[] dest = new byte[src.length];
+-        
+-        for (int i=0; i < dest.length; i++) {
+-            final char c = src[i];
+-            
+-            if (c > Byte.MAX_VALUE)
+-                throw new IllegalArgumentException("Invalid character found at position " + i + " for " + singleOctets);
+-            dest[i] = (byte)c;
+-        }
+-        return dest;
+-    }
+-
+-    /**
+-     * Returns a string representing the given byte array,
+-     * treating each byte as a single octet character.
+-     */
+-    public static String toStringDirect(final byte[] bytes) {
+-        final char[] dest = new char[bytes.length];
+-        int i=0;
+-        
+-        for (byte b: bytes)
+-            dest[i++] = (char)b;
+-        
+-        return new String(dest);
+-    }
+-    
+-    /** 
+-     * Sanity check the last decoded position is a possible value.
+-     * 
+-     * @throws IllegalArgumentException if the given decoded position is
+-     * not a possible value produced via the respective encoding 
+-     */
+-    static void sanityCheckLastPos(int pos, int mask) {
+-        if ((pos & mask) != 0) {
+-            throw new IllegalArgumentException
+-                ("Invalid last non-pad character detected");
+-        }
+-    }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/util/ComparableUtils.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/ComparableUtils.java
+--- ./src/main/java/com/amazonaws/util/ComparableUtils.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/ComparableUtils.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,42 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-public class ComparableUtils {
+-
+-    /**
+-     * Does a safe comparison of two {@link Comparable} objects accounting for nulls
+-     * 
+-     * @param d1
+-     *            First object
+-     * @param d2
+-     *            Second object
+-     * @return A positive number if the object double is larger, a negative number if the second
+-     *         object is larger, or 0 if they are equal. Null is considered less than any non-null
+-     *         value
+-     */
+-    public static  int safeCompare(Comparable d1, T d2) {
+-        if (d1 != null && d2 != null) {
+-            return d1.compareTo(d2);
+-        } else if (d1 == null && d2 != null) {
+-            return -1;
+-        } else if (d1 != null && d2 == null) {
+-            return 1;
+-        } else {
+-            return 0;
+-        }
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/CountingInputStream.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/CountingInputStream.java
+--- ./src/main/java/com/amazonaws/util/CountingInputStream.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/CountingInputStream.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,54 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import com.amazonaws.internal.SdkFilterInputStream;
+-
+-/**
+- * Simple input stream wrapper utility to count the bytes read from a stream.
+- */
+-public class CountingInputStream extends SdkFilterInputStream {
+-    private long byteCount = 0;
+-
+-    public CountingInputStream(InputStream in) {
+-        super(in);
+-    }
+-
+-    /**
+-     * Returns the number of bytes read from this stream so far.
+-     *
+-     * @return the number of bytes read from this stream so far.
+-     */
+-    public long getByteCount() {
+-        return byteCount;
+-    }
+-
+-    @Override
+-    public int read() throws IOException {
+-        int tmp = super.read();
+-        byteCount += tmp >= 0 ? 1 : 0;
+-        return tmp;
+-    }
+-
+-    @Override
+-    public int read(byte[] b, int off, int len) throws IOException {
+-        int tmp = super.read(b, off, len);
+-        byteCount += tmp >= 0 ? tmp : 0;
+-        return tmp;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/CRC32ChecksumCalculatingInputStream.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/CRC32ChecksumCalculatingInputStream.java
+--- ./src/main/java/com/amazonaws/util/CRC32ChecksumCalculatingInputStream.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/CRC32ChecksumCalculatingInputStream.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,78 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.util.zip.CRC32;
+-
+-import com.amazonaws.internal.SdkFilterInputStream;
+-
+-/**
+- * Simple InputStream wrapper that examines the wrapped stream's contents as
+- * they are read and calculates and CRC32 checksum.
+- */
+-public class CRC32ChecksumCalculatingInputStream extends SdkFilterInputStream {
+-
+-    /** The CRC32 being calculated by this input stream */
+-    private CRC32 crc32;
+-
+-    public CRC32ChecksumCalculatingInputStream(InputStream in) {
+-        super(in);
+-        crc32 = new CRC32();
+-    }
+-
+-    public long getCRC32Checksum() {
+-        return crc32.getValue();
+-    }
+-
+-    /**
+-     * Resets the wrapped input stream and the CRC32 computation.
+-     *
+-     * @see java.io.InputStream#reset()
+-     */
+-    @Override
+-    public synchronized void reset() throws IOException {
+-        abortIfNeeded();
+-        crc32.reset();
+-        in.reset();
+-    }
+-
+-    /**
+-     * @see java.io.InputStream#read()
+-     */
+-    @Override
+-    public int read() throws IOException {
+-        abortIfNeeded();
+-        int ch = in.read();
+-        if (ch != -1) {
+-            crc32.update(ch);
+-        }
+-        return ch;
+-    }
+-
+-    /**
+-     * @see java.io.InputStream#read(byte[], int, int)
+-     */
+-    @Override
+-    public int read(byte[] b, int off, int len) throws IOException {
+-        abortIfNeeded();
+-        int result = in.read(b, off, len);
+-        if (result != -1) {
+-            crc32.update(b, off, result);
+-        }
+-        return result;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/CredentialUtils.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/CredentialUtils.java
+--- ./src/main/java/com/amazonaws/util/CredentialUtils.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/CredentialUtils.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,53 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights
+- * Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is
+- * distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+- * KIND, either
+- * express or implied. See the License for the specific language
+- * governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import com.amazonaws.AmazonWebServiceRequest;
+-import com.amazonaws.RequestConfig;
+-import com.amazonaws.auth.AWSCredentialsProvider;
+-import com.amazonaws.internal.StaticCredentialsProvider;
+-
+-public class CredentialUtils {
+-
+-    /**
+-     *  Returns the credentials provider that will be used to fetch the
+-     *  credentials when signing the request. Request specific credentials
+-     *  takes precedence over the credentials/credentials provider set in the
+-     *  client.
+-     */
+-    public static AWSCredentialsProvider getCredentialsProvider(
+-            AmazonWebServiceRequest req,
+-            AWSCredentialsProvider base) {
+-
+-        if (req != null && req.getRequestCredentialsProvider() != null) {
+-            return req.getRequestCredentialsProvider();
+-        }
+-        return base;
+-    }
+-
+-    public static AWSCredentialsProvider getCredentialsProvider(
+-            RequestConfig requestConfig,
+-            AWSCredentialsProvider base) {
+-
+-        if (requestConfig.getCredentialsProvider() != null) {
+-            return requestConfig.getCredentialsProvider();
+-        }
+-        return base;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/EncodingSchemeEnum.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/EncodingSchemeEnum.java
+--- ./src/main/java/com/amazonaws/util/EncodingSchemeEnum.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/EncodingSchemeEnum.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,52 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-/**
+- * Currently provided encoding schemes "out of the box".
+- *  
+- * @author Hanson Char
+- * 
+- * See http://www.ietf.org/rfc/rfc4648.txt
+- */
+-public enum EncodingSchemeEnum implements EncodingScheme {
+-    BASE16 {
+-        @Override public String encodeAsString(byte[] bytes) { 
+-            return Base16.encodeAsString(bytes); 
+-        }
+-        @Override public byte[] decode(String encoded) { 
+-            return Base16.decode(encoded); 
+-        }
+-    },
+-    BASE32 {
+-        @Override public String encodeAsString(byte[] bytes) { 
+-            return Base32.encodeAsString(bytes); 
+-        }
+-        @Override public byte[] decode(String encoded) { 
+-            return Base32.decode(encoded); 
+-        }
+-    },
+-    BASE64 {
+-        @Override public String encodeAsString(byte[] bytes) { 
+-            return Base64.encodeAsString(bytes); 
+-        }
+-        @Override public byte[] decode(String encoded) { 
+-            return Base64.decode(encoded); 
+-        }
+-    },
+-    ;
+-
+-    @Override public abstract String encodeAsString(byte[] bytes);
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/EncodingScheme.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/EncodingScheme.java
+--- ./src/main/java/com/amazonaws/util/EncodingScheme.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/EncodingScheme.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,25 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-/**
+- * Encoding scheme.
+- *  
+- * @author Hanson Char
+- */
+-public interface EncodingScheme {
+-    public String encodeAsString(byte[] bytes);
+-    public byte[] decode(String encoded);
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/FakeIOException.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/FakeIOException.java
+--- ./src/main/java/com/amazonaws/util/FakeIOException.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/FakeIOException.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,29 +0,0 @@
+-/*
+- * Copyright (c) 2016. Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.util;
+-
+-import java.io.IOException;
+-
+-/**
+- * Used for simulating an IOException for test purposes.
+- */
+-public class FakeIOException extends IOException {
+-    private static final long serialVersionUID = 1L;
+-
+-    public FakeIOException(String message) {
+-        super(message);
+-    }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/util/HttpClientWrappingInputStream.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/HttpClientWrappingInputStream.java
+--- ./src/main/java/com/amazonaws/util/HttpClientWrappingInputStream.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/HttpClientWrappingInputStream.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,53 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import org.apache.http.client.HttpClient;
+-
+-import com.amazonaws.internal.SdkFilterInputStream;
+-
+-/**
+- * An {@code InputStream} that closes the associated {@code HttpClient}
+- * when the stream is closed.
+- */
+-class HttpClientWrappingInputStream extends SdkFilterInputStream {
+-
+-    private final HttpClient client;
+-
+-    /**
+-     * @param client the {@code HttpClient} to wrap
+-     * @param stream the {@code InputStream} to wrap
+-     */
+-    public HttpClientWrappingInputStream(
+-            final HttpClient client,
+-            final InputStream stream) {
+-
+-        super(stream);
+-        this.client = client;
+-    }
+-
+-    @Override
+-    @SuppressWarnings("deprecation")
+-    public void close() throws IOException {
+-        try {
+-            super.close();
+-        } finally {
+-            client.getConnectionManager().shutdown();
+-        }
+-    }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/util/IdempotentUtils.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/IdempotentUtils.java
+--- ./src/main/java/com/amazonaws/util/IdempotentUtils.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/IdempotentUtils.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,56 +0,0 @@
+-/*
+- * Copyright (c) 2016. Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.util;
+-
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.annotation.SdkTestInternalApi;
+-import com.amazonaws.protocol.DefaultValueSupplier;
+-
+-import java.util.UUID;
+-
+-/**
+- * Utility class to manage idempotency token
+- */
+-@SdkProtectedApi
+-public final class IdempotentUtils {
+-
+-    private static DefaultValueSupplier generator = new DefaultValueSupplier() {
+-        @Override
+-        public String get() {
+-            return UUID.randomUUID().toString();
+-        }
+-    };
+-
+-    /**
+-     * @deprecated By {@link #getGenerator()}
+-     */
+-    @Deprecated
+-    @SdkProtectedApi
+-    public static String resolveString(String token) {
+-        return token != null ? token : generator.get();
+-    }
+-
+-    @SdkProtectedApi
+-    public static DefaultValueSupplier getGenerator() {
+-        return generator;
+-    }
+-
+-
+-    @SdkTestInternalApi
+-    public static void setGenerator(DefaultValueSupplier newGenerator) {
+-        generator = newGenerator;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/ImmutableMapParameter.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/ImmutableMapParameter.java
+--- ./src/main/java/com/amazonaws/util/ImmutableMapParameter.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/ImmutableMapParameter.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,305 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- * 
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- * 
+- *  http://aws.amazon.com/apache2.0
+- * 
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import java.util.Collection;
+-import java.util.Collections;
+-import java.util.HashMap;
+-import java.util.Map;
+-import java.util.Set;
+-
+-/**
+- * An immutable map that could be built by convenient constructors.
+- * 

+- * Example of using map Builder:
+- * 
+- * 
+- * {
+- *     @code
+- *     Map<String, AttibuteValue> item = new ImmutableMapParameter.Builder<String, AttibuteValue>()
+- *             .put("one", new AttibuteValue("1"))
+- *             .put("two", new AttibuteValue("2"))
+- *             .put("three", new AttibuteValue("3")).build();
+- * }
+- * 

+- * 
+- * For small immutable maps (up to five entries), the
+- * {@code ImmutableMapParamter.of()} methods are preferred:
+- * 
+- * 
+- * {@code
+- *   Map item =
+- *       ImmutableMapParameter
+- *           .of("one", new AttributeValue("1"), 
+- *               "two", new AttributeValue("2"),
+- *               "three", new AttributeValue("3"), 
+- * }
+- * 

+- * 
+- * @param 
+- *            Class of the key for the map.
+- * @param 
+- *            Class of the value for the map.
+- */
+-public class ImmutableMapParameter implements Map {
+-
+-    private static final String UNMODIFIABLE_MESSAGE = "This is an immutable map.";
+-    private static final String DUPLICATED_KEY_MESSAGE = "Duplicate keys are provided.";
+-
+-    private final Map map;
+-
+-    private ImmutableMapParameter(Map map) {
+-        this.map = map;
+-    }
+-
+-    /**
+-     * Returns a new MapParameterBuilder instance.
+-     */
+-    public static  Builder builder() {
+-        return new Builder();
+-    }
+-
+-    /**
+-     * Returns an ImmutableMapParameter instance containing a single entry.
+-     * 
+-     * @param k0
+-     *            Key of the single entry.
+-     * @param v0
+-     *            Value of the single entry.
+-     */
+-    public static  ImmutableMapParameter of(K k0, V v0) {
+-        Map map = Collections.singletonMap(k0, v0);
+-        return new ImmutableMapParameter(map);
+-    }
+-
+-    /**
+-     * Returns an ImmutableMapParameter instance containing two entries.
+-     * 
+-     * @param k0
+-     *            Key of the first entry.
+-     * @param v0
+-     *            Value of the first entry.
+-     * @param k1
+-     *            Key of the second entry.
+-     * @param v1
+-     *            Value of the second entry.
+-     */
+-    public static  ImmutableMapParameter of(K k0, V v0, K k1, V v1) {
+-        Map map = new HashMap();
+-        putAndWarnDuplicateKeys(map, k0, v0);
+-        putAndWarnDuplicateKeys(map, k1, v1);
+-        return new ImmutableMapParameter(map);
+-    }
+-
+-    /**
+-     * Returns an ImmutableMapParameter instance containing three entries.
+-     * 
+-     * @param k0
+-     *            Key of the first entry.
+-     * @param v0
+-     *            Value of the first entry.
+-     * @param k1
+-     *            Key of the second entry.
+-     * @param v1
+-     *            Value of the second entry.
+-     * @param k2
+-     *            Key of the third entry.
+-     * @param v2
+-     *            Value of the third entry.
+-     */
+-    public static  ImmutableMapParameter of(K k0, V v0, K k1, V v1,
+-            K k2, V v2) {
+-        Map map = new HashMap();
+-        putAndWarnDuplicateKeys(map, k0, v0);
+-        putAndWarnDuplicateKeys(map, k1, v1);
+-        putAndWarnDuplicateKeys(map, k2, v2);
+-        return new ImmutableMapParameter(map);
+-    }
+-
+-    /**
+-     * Returns an ImmutableMapParameter instance containing four entries.
+-     * 
+-     * @param k0
+-     *            Key of the first entry.
+-     * @param v0
+-     *            Value of the first entry.
+-     * @param k1
+-     *            Key of the second entry.
+-     * @param v1
+-     *            Value of the second entry.
+-     * @param k2
+-     *            Key of the third entry.
+-     * @param v2
+-     *            Value of the third entry.
+-     * @param k3
+-     *            Key of the fourth entry.
+-     * @param v3
+-     *            Value of the fourth entry.
+-     */
+-    public static  ImmutableMapParameter of(K k0, V v0, K k1, V v1,
+-            K k2, V v2, K k3, V v3) {
+-        Map map = new HashMap();
+-        putAndWarnDuplicateKeys(map, k0, v0);
+-        putAndWarnDuplicateKeys(map, k1, v1);
+-        putAndWarnDuplicateKeys(map, k2, v2);
+-        putAndWarnDuplicateKeys(map, k3, v3);
+-        return new ImmutableMapParameter(map);
+-    }
+-
+-    /**
+-     * Returns an ImmutableMapParameter instance containing five entries.
+-     * 
+-     * @param k0
+-     *            Key of the first entry.
+-     * @param v0
+-     *            Value of the first entry.
+-     * @param k1
+-     *            Key of the second entry.
+-     * @param v1
+-     *            Value of the second entry.
+-     * @param k2
+-     *            Key of the third entry.
+-     * @param v2
+-     *            Value of the third entry.
+-     * @param k3
+-     *            Key of the fourth entry.
+-     * @param v3
+-     *            Value of the fourth entry.
+-     * @param k4
+-     *            Key of the fifth entry.
+-     * @param v4
+-     *            Value of the fifth entry.
+-     */
+-    public static  ImmutableMapParameter of(K k0, V v0, K k1, V v1,
+-            K k2, V v2, K k3, V v3, K k4, V v4) {
+-        Map map = new HashMap();
+-        putAndWarnDuplicateKeys(map, k0, v0);
+-        putAndWarnDuplicateKeys(map, k1, v1);
+-        putAndWarnDuplicateKeys(map, k2, v2);
+-        putAndWarnDuplicateKeys(map, k3, v3);
+-        putAndWarnDuplicateKeys(map, k4, v4);
+-        return new ImmutableMapParameter(map);
+-    }
+-
+-    /** Inherited methods **/
+-
+-    public boolean containsKey(Object key) {
+-        return map.containsKey(key);
+-    }
+-
+-    public boolean containsValue(Object value) {
+-        return map.containsValue(value);
+-    }
+-
+-    public Set> entrySet() {
+-        return map.entrySet();
+-    }
+-
+-    public V get(Object key) {
+-        return map.get(key);
+-    }
+-
+-    public boolean isEmpty() {
+-        return map.isEmpty();
+-    }
+-
+-    public Set keySet() {
+-        return map.keySet();
+-    }
+-
+-    public int size() {
+-        return map.size();
+-    }
+-
+-    public Collection values() {
+-        return map.values();
+-    }
+-
+-    /** Unsupported methods **/
+-
+-    public void clear() {
+-        throw new UnsupportedOperationException(UNMODIFIABLE_MESSAGE);
+-    }
+-
+-    public V put(K key, V value) {
+-        throw new UnsupportedOperationException(UNMODIFIABLE_MESSAGE);
+-    }
+-
+-    public void putAll(Map map) {
+-        throw new UnsupportedOperationException(UNMODIFIABLE_MESSAGE);
+-    }
+-
+-    public V remove(Object key) {
+-        throw new UnsupportedOperationException(UNMODIFIABLE_MESSAGE);
+-    }
+-
+-    private static  void putAndWarnDuplicateKeys(Map map, K key,
+-            V value) {
+-        if (map.containsKey(key))
+-            throw new IllegalArgumentException(DUPLICATED_KEY_MESSAGE);
+-        map.put(key, value);
+-    }
+-
+-    @Override
+-    public boolean equals(Object o) {
+-        return map.equals(o);
+-    }
+-
+-    @Override
+-    public int hashCode() {
+-        return map.hashCode();
+-    }
+-
+-    @Override
+-    public String toString() {
+-        return map.toString();
+-    }
+-
+-    /**
+-     * A convenient builder for creating ImmutableMapParameter instances.
+-     */
+-    public static class Builder {
+-
+-        private final Map entries;
+-
+-        public Builder() {
+-            this.entries = new HashMap();
+-        }
+-
+-        /**
+-         * Add a key-value pair into the built map. The method will throw
+-         * IllegalArgumentException immediately when duplicate keys are
+-         * provided.
+-         * 
+-         * @return Returns a reference to this object so that method calls can
+-         *         be chained together.
+-         */
+-        public Builder put(K key, V value) {
+-            putAndWarnDuplicateKeys(entries, key, value);
+-            return this;
+-        }
+-
+-        /**
+-         * Generates and returns a new ImmutableMapParameter instance which
+-         * contains all the entries added into the Builder by {@code put()}
+-         * method.
+-         */
+-        public ImmutableMapParameter build() {
+-            HashMap builtMap = new HashMap();
+-            builtMap.putAll(entries);
+-            return new ImmutableMapParameter(builtMap);
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/IOUtils.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/IOUtils.java
+--- ./src/main/java/com/amazonaws/util/IOUtils.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/IOUtils.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,136 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import com.amazonaws.internal.Releasable;
+-import java.io.ByteArrayOutputStream;
+-import java.io.Closeable;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.io.OutputStream;
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-
+-
+-/**
+- * Utilities for IO operations.
+- */
+-public enum IOUtils {
+-    ;
+-    private static final int BUFFER_SIZE = 1024 * 4;
+-    private static final Log defaultLog = LogFactory.getLog(IOUtils.class);
+-
+-    /**
+-     * Reads and returns the rest of the given input stream as a byte array.
+-     * Caller is responsible for closing the given input stream.
+-     */
+-    public static byte[] toByteArray(InputStream is) throws IOException {
+-        ByteArrayOutputStream output = new ByteArrayOutputStream();
+-        try {
+-            byte[] b = new byte[BUFFER_SIZE];
+-            int n = 0;
+-            while ((n = is.read(b)) != -1) {
+-                output.write(b, 0, n);
+-            }
+-            return output.toByteArray();
+-        } finally {
+-            output.close();
+-        }
+-    }
+-
+-    /**
+-     * Reads and returns the rest of the given input stream as a string.
+-     * Caller is responsible for closing the given input stream.
+-     */
+-    public static String toString(InputStream is) throws IOException {
+-        return new String(toByteArray(is), StringUtils.UTF8);
+-    }
+-
+-    /**
+-     * Closes the given Closeable quietly.
+-     *
+-     * @param is  the given closeable
+-     * @param log logger used to log any failure should the close fail
+-     */
+-    public static void closeQuietly(Closeable is, Log log) {
+-        if (is != null) {
+-            try {
+-                is.close();
+-            } catch (IOException ex) {
+-                Log logger = log == null ? defaultLog : log;
+-                if (logger.isDebugEnabled()) {
+-                    logger.debug("Ignore failure in closing the Closeable", ex);
+-                }
+-            }
+-        }
+-    }
+-
+-    /**
+-     * Releases the given {@link Closeable} especially if it was an instance of
+-     * {@link Releasable}.
+-     * 

+-     * For example, the creation of a ResettableInputStream would entail
+-     * physically opening a file. If the opened file is meant to be closed only
+-     * (in a finally block) by the very same code block that created it, then it
+-     * is necessary that the release method must not be called while the
+-     * execution is made in other stack frames.
+-     *
+-     * In such case, as other stack frames may inadvertently or indirectly call
+-     * the close method of the stream, the creator of the stream would need to
+-     * explicitly disable the accidental closing via
+-     * ResettableInputStream#disableClose(), so that the release method
+-     * becomes the only way to truly close the opened file.
+-     */
+-    public static void release(Closeable is, Log log) {
+-        closeQuietly(is, log);
+-        if (is instanceof Releasable) {
+-            Releasable r = (Releasable) is;
+-            r.release();
+-        }
+-    }
+-
+-    /**
+-     * Copies all bytes from the given input stream to the given output stream.
+-     * Caller is responsible for closing the streams.
+-     *
+-     * @throws IOException if there is any IO exception during read or write.
+-     */
+-    public static long copy(InputStream in, OutputStream out)
+-            throws IOException {
+-        byte[] buf = new byte[BUFFER_SIZE];
+-        long count = 0;
+-        int n = 0;
+-        while ((n = in.read(buf)) > -1) {
+-            out.write(buf, 0, n);
+-            count += n;
+-        }
+-        return count;
+-    }
+-
+-    /**
+-     * Read all remaining data in the stream.
+-     *
+-     * @param in InputStream to read.
+-     */
+-    public static void drainInputStream(InputStream in) {
+-        try {
+-            while (in.read() != -1) {
+-                // Do nothing.
+-            }
+-        } catch (IOException ignored) {
+-            // Stream may be self closed by HTTP client so we ignore any failures.
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/JavaVersionParser.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/JavaVersionParser.java
+--- ./src/main/java/com/amazonaws/util/JavaVersionParser.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/JavaVersionParser.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,268 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import java.util.Arrays;
+-import java.util.regex.Matcher;
+-import java.util.regex.Pattern;
+-
+-/**
+- * @see http://www.oracle.com/technetwork/java/javase/versioning-naming-139433.html
+- */
+-public class JavaVersionParser {
+-
+-    public static final String JAVA_VERSION_PROPERTY = "java.version";
+-
+-    private static String MAJOR_VERSION_FAMILY_PATTERN = "\\d+";
+-    private static String MAJOR_VERSION_PATTERN = "\\d+";
+-    private static String MAINTENANCE_NUMBER_PATTERN = "\\d+";
+-    private static String UPDATE_NUMBER_PATTERN = "\\d+";
+-
+-    private static Pattern VERSION_REGEX = Pattern.compile(String.format("(%s)\\.(%s)\\.(%s)(?:_(%s))?.*",
+-            MAJOR_VERSION_FAMILY_PATTERN, MAJOR_VERSION_PATTERN, MAINTENANCE_NUMBER_PATTERN, UPDATE_NUMBER_PATTERN));
+-
+-    private static final JavaVersion currentJavaVersion = parseJavaVersion(System.getProperty(JAVA_VERSION_PROPERTY));
+-
+-    private JavaVersionParser() {
+-    }
+-
+-    /**
+-     * @return The {@link JavaVersion} of this JVM.
+-     */
+-    public static JavaVersion getCurrentJavaVersion() {
+-        return currentJavaVersion;
+-    }
+-
+-    public static JavaVersion parseJavaVersion(final String fullVersionString) {
+-        if (!StringUtils.isNullOrEmpty(fullVersionString)) {
+-            final Matcher matcher = VERSION_REGEX.matcher(fullVersionString);
+-            if (matcher.matches()) {
+-                final Integer majorVersionFamily = NumberUtils.tryParseInt(matcher.group(1));
+-                final Integer majorVersion = NumberUtils.tryParseInt(matcher.group(2));
+-                final Integer maintenanceNumber = NumberUtils.tryParseInt(matcher.group(3));
+-                final Integer updateNumber = NumberUtils.tryParseInt(matcher.group(4));
+-                return new JavaVersion(majorVersionFamily, majorVersion, maintenanceNumber, updateNumber);
+-            }
+-        }
+-        return JavaVersion.UNKNOWN;
+-    }
+-
+-    /**
+-     * Struct like class representing a specific version of Java. Contains the major and minor
+-     * version identifiers and a descriptive enum identifying which major version this JVM belongs
+-     * to if we are able to identify it
+-     */
+-    public static final class JavaVersion implements Comparable {
+-
+-        public static final JavaVersionParser.JavaVersion UNKNOWN = new JavaVersionParser.JavaVersion(null, null, null,
+-                null);
+-
+-        private final Integer[] tokenizedVersion;
+-        private final Integer majorVersionFamily;
+-        private final Integer majorVersion;
+-        private final Integer maintenanceNumber;
+-        private final Integer updateNumber;
+-        private final KnownJavaVersions knownVersion;
+-
+-        public JavaVersion(final Integer majorVersionFamily, final Integer majorVersion,
+-                final Integer maintenanceNumber, final Integer updateNumber) {
+-            this.majorVersionFamily = majorVersionFamily;
+-            this.majorVersion = majorVersion;
+-            this.maintenanceNumber = maintenanceNumber;
+-            this.updateNumber = updateNumber;
+-            this.knownVersion = KnownJavaVersions.fromMajorVersion(majorVersionFamily, majorVersion);
+-            this.tokenizedVersion = this.getTokenizedVersion();
+-        }
+-
+-        private Integer[] getTokenizedVersion() {
+-            return new Integer[] { this.majorVersionFamily, this.majorVersion, this.maintenanceNumber,
+-                    this.updateNumber };
+-        }
+-
+-        /**
+-         * @return Major version family if available. I.E. if the major version family string is
+-         *         '1.7.0_60' then the major version family will be 1
+-         */
+-        public Integer getMajorVersionFamily() {
+-            return this.majorVersionFamily;
+-        }
+-
+-        /**
+-         * @return Major version ordinal if available. Examples include '6', '7', '8'
+-         */
+-        public Integer getMajorVersion() {
+-            return this.majorVersion;
+-        }
+-
+-        /**
+-         * @return Major version string if available. Examples include '1.6', '1.7', '1.8'
+-         */
+-        public String getMajorVersionString() {
+-            return String.format("%d.%d", this.majorVersionFamily, this.majorVersion);
+-        }
+-
+-        /**
+-         * @return Maintenance number of Java version. If the version is '1.6.1_20' then '1' is the
+-         *         maintenance number
+-         */
+-        public Integer getMaintenanceNumber() {
+-            return this.maintenanceNumber;
+-        }
+-
+-        /**
+-         * @return Update number of Java version. If the version is '1.6.1_20' then '20' is the
+-         *         update number
+-         */
+-        public Integer getUpdateNumber() {
+-            return this.updateNumber;
+-        }
+-
+-        /**
+-         * @return {@link KnownJavaVersions} representing the major version of the Java version if
+-         *         it's identifiable
+-         */
+-        public KnownJavaVersions getKnownVersion() {
+-            return this.knownVersion;
+-        }
+-
+-        @Override
+-        public int compareTo(final JavaVersion other) {
+-            for (int i = 0; i < this.tokenizedVersion.length; i++) {
+-                final int tokenComparison = ComparableUtils.safeCompare(this.tokenizedVersion[i],
+-                        other.tokenizedVersion[i]);
+-                // If one token is larger return the comparison otherwise proceed to next token
+-                if (tokenComparison != 0) {
+-                    return tokenComparison;
+-                }
+-            }
+-            return 0;
+-        }
+-
+-        @Override
+-        public int hashCode() {
+-            final int prime = 31;
+-            int result = 1;
+-            result = (prime * result) + ((this.knownVersion == null) ? 0 : this.knownVersion.hashCode());
+-            result = (prime * result) + ((this.maintenanceNumber == null) ? 0 : this.maintenanceNumber.hashCode());
+-            result = (prime * result) + ((this.majorVersion == null) ? 0 : this.majorVersion.hashCode());
+-            result = (prime * result) + ((this.majorVersionFamily == null) ? 0 : this.majorVersionFamily.hashCode());
+-            result = (prime * result) + Arrays.hashCode(this.tokenizedVersion);
+-            result = (prime * result) + ((this.updateNumber == null) ? 0 : this.updateNumber.hashCode());
+-            return result;
+-        }
+-
+-        @Override
+-        public boolean equals(final Object obj) {
+-            if (this == obj) {
+-                return true;
+-            }
+-            if (obj == null) {
+-                return false;
+-            }
+-            if (this.getClass() != obj.getClass()) {
+-                return false;
+-            }
+-            final JavaVersion other = (JavaVersion) obj;
+-            if (this.knownVersion != other.knownVersion) {
+-                return false;
+-            }
+-            if (this.maintenanceNumber == null) {
+-                if (other.maintenanceNumber != null) {
+-                    return false;
+-                }
+-            } else if (!this.maintenanceNumber.equals(other.maintenanceNumber)) {
+-                return false;
+-            }
+-            if (this.majorVersion == null) {
+-                if (other.majorVersion != null) {
+-                    return false;
+-                }
+-            } else if (!this.majorVersion.equals(other.majorVersion)) {
+-                return false;
+-            }
+-            if (this.majorVersionFamily == null) {
+-                if (other.majorVersionFamily != null) {
+-                    return false;
+-                }
+-            } else if (!this.majorVersionFamily.equals(other.majorVersionFamily)) {
+-                return false;
+-            }
+-            if (!Arrays.equals(this.tokenizedVersion, other.tokenizedVersion)) {
+-                return false;
+-            }
+-            if (this.updateNumber == null) {
+-                if (other.updateNumber != null) {
+-                    return false;
+-                }
+-            } else if (!this.updateNumber.equals(other.updateNumber)) {
+-                return false;
+-            }
+-            return true;
+-        }
+-
+-    }
+-
+-    /**
+-     * Enum representing all the Java versions we know about and a special enum value
+-     * {@link KnownJavaVersions#UNKNOWN} for ones we don't yet know about
+-     */
+-    public enum KnownJavaVersions {
+-        JAVA_6(1, 6),
+-        JAVA_7(1, 7),
+-        JAVA_8(1, 8),
+-        JAVA_9(1, 9),
+-        UNKNOWN(0, -1);
+-
+-        private Integer knownMajorVersionFamily;
+-        private Integer knownMajorVersion;
+-
+-        private KnownJavaVersions(final int majorVersionFamily, final int majorVersion) {
+-            this.knownMajorVersionFamily = majorVersionFamily;
+-            this.knownMajorVersion = Integer.valueOf(majorVersion);
+-        }
+-
+-        /**
+-         * Tries to determine a known version from the parsed major version components
+-         *
+-         * @param majorVersionFamily
+-         *            Major version family of the JVM. Currently only 1 is known (i.e. '1.7')
+-         * @param majorVersion
+-         *            Major version of JVM (6, 7, 8, etc)
+-         * @return A {@link KnownJavaVersions} or {@link KnownJavaVersions#UNKNOWN} if unable to
+-         *         determine
+-         */
+-        public static KnownJavaVersions fromMajorVersion(final Integer majorVersionFamily, final Integer majorVersion) {
+-            for (final KnownJavaVersions version : KnownJavaVersions.values()) {
+-                if (version.isMajorVersion(majorVersionFamily, majorVersion)) {
+-                    return version;
+-                }
+-            }
+-            return UNKNOWN;
+-        }
+-
+-        /**
+-         * @param majorVersionFamily
+-         *            Major version family of the JVM. Currently only 1 is known (i.e. '1.7')
+-         * @param majorVersion
+-         *            Major version of JVM (6, 7, 8, etc)
+-         * @return True if the major version is applicable to this Java Version
+-         */
+-        private boolean isMajorVersion(final Integer majorVersionFamily, final Integer majorVersion) {
+-            return this.knownMajorVersionFamily.equals(majorVersionFamily)
+-                    && this.knownMajorVersion.equals(majorVersion);
+-        }
+-
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/JodaTime.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/JodaTime.java
+--- ./src/main/java/com/amazonaws/util/JodaTime.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/JodaTime.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,210 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- * 
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- * 
+- *  http://aws.amazon.com/apache2.0
+- * 
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import java.text.ParseException;
+-import java.text.SimpleDateFormat;
+-import java.util.Date;
+-import java.util.Locale;
+-import java.util.SimpleTimeZone;
+-import java.util.jar.Attributes;
+-import java.util.jar.JarFile;
+-import java.util.jar.Manifest;
+-
+-import org.joda.time.DateTime;
+-import org.joda.time.DateTimeZone;
+-
+-import com.amazonaws.log.InternalLogFactory;
+-
+-/**
+- * Utilities for accessing joda-time.
+- */
+-public enum JodaTime {
+-    ;
+-    private static final boolean expectedBehavior = checkExpectedBehavior();
+-
+-    /**
+-     * Returns the current version of joda-time used during runtime; or null
+-     * if it cannot be determined.
+-     */
+-    public static String getVersion() {
+-        return LazyHolder.version;
+-    }
+-
+-    /**
+-     * Returns true if the current version of joda-time used during runtime
+-     * behaves as expected by the Java SDK; false otherwise.
+-     */
+-    public static boolean hasExpectedBehavior() {
+-        return expectedBehavior;
+-    }
+-
+-    /**
+-     * A lazy holder class for retrieving the version of joda-time used during
+-     * runtime from the jar file discovered on the classpath.
+-     */
+-    private static class LazyHolder {
+-        static final String version = getVersion();
+-
+-        private static String getVersion() {
+-            try {
+-                JarFile jf = Classes.jarFileOf(DateTimeZone.class);
+-                if (jf == null)
+-                    return null;
+-                Manifest mf = jf.getManifest();
+-                Attributes attrs = mf.getMainAttributes();
+-                String name = attrs.getValue("Bundle-Name");
+-                String version = attrs.getValue("Bundle-Version");
+-                if ("Joda-Time".equals(name) && version != null) {
+-                    return version;
+-                }
+-            } catch (Exception e) {
+-                InternalLogFactory.getLog(JodaTime.class).debug("FYI", e);
+-            }
+-            return null;
+-        }
+-    }
+-    
+-    private static boolean checkExpectedBehavior() {
+-        try {
+-            return checkTT0031561767() 
+-                && checkFormatIso8601Date() 
+-                && checkFormatRfc822Date()
+-                && checkAlternateIso8601DateFormat() 
+-                && checkInvalidDate()
+-                && checkParseCompressedIso8601Date() 
+-                && checkParseIso8601Date()
+-                && checkParseIso8601DateUsingAlternativeFormat()
+-                && checkParseRfc822Date()
+-                ;
+-        } catch (Exception ignore) {
+-        }
+-        return false;
+-    }
+-
+-    private static boolean checkTT0031561767() throws ParseException {
+-        String input = "Fri, 16 May 2014 23:56:46 GMT";
+-        Date date = new Date(DateUtils.rfc822DateFormat.parseMillis(input));
+-        return input.equals(DateUtils.rfc822DateFormat.print(date.getTime()));
+-    }
+-
+-    private static boolean checkFormatIso8601Date() throws ParseException {
+-        Date date = new Date();
+-        SimpleDateFormat sdf = new SimpleDateFormat(
+-                "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+-        sdf.setTimeZone(new SimpleTimeZone(0, "GMT"));
+-        String expected = sdf.format(date);
+-        String actual = DateUtils.iso8601DateFormat.print(date.getTime());
+-        if (expected.equals(actual)) {
+-            Date expectedDate = sdf.parse(expected);
+-            Date actualDate = DateUtils.doParseISO8601Date(actual);
+-            return expectedDate.equals(actualDate);
+-        }
+-        return false;
+-    }
+-
+-    private static boolean checkFormatRfc822Date() throws ParseException {
+-        Date date = new Date();
+-        SimpleDateFormat sdf = new SimpleDateFormat(
+-                "EEE, dd MMM yyyy HH:mm:ss z", Locale.US);
+-        sdf.setTimeZone(new SimpleTimeZone(0, "GMT"));
+-        String expected = sdf.format(date);
+-        String actual = DateUtils.rfc822DateFormat.print(date.getTime());
+-        if (expected.equals(actual)) {
+-            Date expectedDate = sdf.parse(expected);
+-            Date actualDate2 = new Date(DateUtils.rfc822DateFormat.parseMillis(actual));
+-            return expectedDate.equals(actualDate2);
+-        }
+-        return false;
+-    }
+-
+-    private static boolean checkParseCompressedIso8601Date() throws ParseException {
+-        Date date = new Date();
+-        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd'T'HHmmss'Z'");
+-        sdf.setTimeZone(new SimpleTimeZone(0, "GMT"));
+-        String formatted = sdf.format(date);
+-        Date expected = sdf.parse(formatted);
+-        Date actual = new Date(DateUtils.compressedIso8601DateFormat.parseMillis(formatted));
+-        return expected.equals(actual);
+-    }
+-
+-    private static boolean checkParseRfc822Date() throws ParseException {
+-        Date date = new Date();
+-        SimpleDateFormat sdf = new SimpleDateFormat(
+-                "EEE, dd MMM yyyy HH:mm:ss z", Locale.US);
+-        sdf.setTimeZone(new SimpleTimeZone(0, "GMT"));
+-        String formatted = sdf.format(date);
+-        Date expected = sdf.parse(formatted);
+-        Date actual2 = new Date(DateUtils.rfc822DateFormat.parseMillis(formatted));
+-        return expected.equals(actual2);
+-    }
+-
+-    private static boolean checkParseIso8601Date() throws ParseException {
+-        Date date = new Date();
+-        SimpleDateFormat sdf = new SimpleDateFormat(
+-                "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+-        sdf.setTimeZone(new SimpleTimeZone(0, "GMT"));
+-        String formatted = sdf.format(date);
+-        String alternative = DateUtils.iso8601DateFormat.print(date.getTime());
+-        if (formatted.equals(alternative)) {
+-            Date expectedDate = sdf.parse(formatted);
+-            Date actualDate = DateUtils.doParseISO8601Date(formatted);
+-            return expectedDate.equals(actualDate);
+-        }
+-        return false;
+-    }
+-
+-    private static boolean checkParseIso8601DateUsingAlternativeFormat()
+-            throws ParseException {
+-        Date date = new Date();
+-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+-        sdf.setTimeZone(new SimpleTimeZone(0, "GMT"));
+-        String formatted = sdf.format(date);
+-        String alternative = DateUtils.alternateIso8601DateFormat.print(date
+-                .getTime());
+-        if (formatted.equals(alternative)) {
+-            Date expectedDate = sdf.parse(formatted);
+-            Date actualDate = DateUtils.parseISO8601Date(formatted);
+-            return expectedDate.equals(actualDate);
+-        }
+-        return false;
+-    }
+-
+-    private static boolean checkAlternateIso8601DateFormat() throws ParseException {
+-        Date date = new Date();
+-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+-        sdf.setTimeZone(new SimpleTimeZone(0, "GMT"));
+-        String expected = sdf.format(date);
+-        String actual = DateUtils.alternateIso8601DateFormat.print(date
+-                .getTime());
+-        if (expected.equals(actual)) {
+-            Date expectedDate = sdf.parse(expected);
+-            DateTime actualDateTime = DateUtils.alternateIso8601DateFormat
+-                    .parseDateTime(actual);
+-            return expectedDate.getTime() == actualDateTime.getMillis();
+-        }
+-        return false;
+-    }
+-
+-    private static boolean checkInvalidDate() {
+-        final String input = "2014-03-06T14:28:58.000Z.000Z";
+-        try {
+-            DateUtils.doParseISO8601Date(input);
+-            return false;
+-        } catch (RuntimeException expected) {
+-        }
+-        return true;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/json/Jackson.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/json/Jackson.java
+--- ./src/main/java/com/amazonaws/util/json/Jackson.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/json/Jackson.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,99 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon Technologies, Inc.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at:
+- *
+- *    http://aws.amazon.com/apache2.0
+- *
+- * This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+- * OR CONDITIONS OF ANY KIND, either express or implied. See the
+- * License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package com.amazonaws.util.json;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.io.Writer;
+-
+-import com.amazonaws.SdkClientException;
+-import com.fasterxml.jackson.core.JsonFactory;
+-import com.fasterxml.jackson.core.JsonGenerator;
+-import com.fasterxml.jackson.core.JsonParser;
+-import com.fasterxml.jackson.databind.DeserializationFeature;
+-import com.fasterxml.jackson.databind.JsonNode;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-import com.fasterxml.jackson.databind.ObjectWriter;
+-
+-public enum Jackson {
+-    ;
+-    private static final ObjectMapper objectMapper = new ObjectMapper();
+-    static {
+-        objectMapper.configure(JsonParser.Feature.ALLOW_COMMENTS, true);
+-        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+-    };
+-    private static final ObjectWriter writer = objectMapper.writer();
+-    private static final ObjectWriter prettyWriter = objectMapper.writerWithDefaultPrettyPrinter();
+-
+-    public static String toJsonPrettyString(Object value) {
+-        try {
+-            return prettyWriter.writeValueAsString(value);
+-        } catch (Exception e) {
+-            throw new IllegalStateException(e);
+-        }
+-    }
+-
+-    public static String toJsonString(Object value) {
+-        try {
+-            return writer.writeValueAsString(value);
+-        } catch (Exception e) {
+-            throw new IllegalStateException(e);
+-        }
+-    }
+-
+-    /**
+-     * Returns the deserialized object from the given json string and target
+-     * class; or null if the given json string is null.
+-     */
+-    public static  T fromJsonString(String json, Class clazz) {
+-        if (json == null)
+-            return null;
+-        try {
+-            return objectMapper.readValue(json, clazz);
+-        } catch (Exception e) {
+-            throw new SdkClientException("Unable to parse Json String.", e);
+-        }
+-    }
+-
+-    public static JsonNode jsonNodeOf(String json) {
+-        return fromJsonString(json, JsonNode.class);
+-    }
+-
+-    public static JsonGenerator jsonGeneratorOf(Writer writer) throws IOException {
+-        return new JsonFactory().createGenerator(writer);
+-    }
+-
+-    public static  T loadFrom(File file, Class clazz) throws IOException {
+-        try {
+-            return objectMapper.readValue(file, clazz);
+-        } catch (IOException e) {
+-            throw e;
+-        } catch (Exception e) {
+-            throw new IllegalStateException(e);
+-        }
+-    }
+-
+-    public static ObjectMapper getObjectMapper() {
+-        return objectMapper;
+-    }
+-
+-    public static ObjectWriter getWriter() {
+-        return writer;
+-    }
+-
+-    public static ObjectWriter getPrettywriter() {
+-        return prettyWriter;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/LengthCheckInputStream.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/LengthCheckInputStream.java
+--- ./src/main/java/com/amazonaws/util/LengthCheckInputStream.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/LengthCheckInputStream.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,189 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.annotation.NotThreadSafe;
+-import com.amazonaws.internal.SdkFilterInputStream;
+-
+-/**
+- * Used to perform length check to ensure the number of bytes read from the
+- * underlying input stream is the same as the expected total.
+- */
+-@NotThreadSafe
+-public class LengthCheckInputStream extends SdkFilterInputStream {
+-    public static final boolean INCLUDE_SKIPPED_BYTES = true;
+-    public static final boolean EXCLUDE_SKIPPED_BYTES = false;
+-    /**
+-     * Total number of bytes expected to be read from the underlying input
+-     * stream.
+-     */
+-    private final long expectedLength;
+-    /**
+-     * True if skipped bytes are to be included as part of the data length;
+-     * false otherwise.
+-     */
+-    private final boolean includeSkipped;
+-    /**
+-     * The length of the data read from the underlying input stream so far.
+-     */
+-    private long dataLength;
+-    private long marked; // used for mark-and-reset purposes
+-    
+-    /**
+-     * Used for diagnostic purposes. True if reset has been called since last
+-     * marked; False otherwise.
+-     */
+-    private boolean resetSinceLastMarked;
+-    private int markCount, resetCount;
+-
+-    /**
+-     * Constructs an input stream that performs length check to ensure the
+-     * number of bytes read from the underlying input stream is the same as the
+-     * expected total.
+-     * 
+-     * @param in
+-     *            the underlying input stream
+-     * @param expectedLength
+-     *            the total length of the data in bytes expected to be read from
+-     *            the underlying input stream; must be non-negative.
+-     * @param includeSkipped
+-     *            true if bytes skipped are to be considered as part of the data
+-     *            length; false otherwise. Typically, this parameter should be
+-     *            set to false for uploading data to AWS, but set to true for
+-     *            receiving data from AWS.
+-     */
+-    public LengthCheckInputStream(InputStream in, long expectedLength,
+-            boolean includeSkipped) {
+-        super(in);
+-        if (expectedLength < 0)
+-            throw new IllegalArgumentException();
+-        this.expectedLength = expectedLength;
+-        this.includeSkipped = includeSkipped;
+-    }
+-
+-    /**
+-     * {@inheritDoc}
+-     * 
+-     * @throws SdkClientException
+-     *             if the data length read has exceeded the expected total, or
+-     *             if the total data length is not the same as the expected
+-     *             total.
+-     */
+-    @Override
+-    public int read() throws IOException {
+-        final int c = super.read();
+-        if (c >= 0)
+-            dataLength++;
+-        checkLength(c == -1);
+-        return c;
+-    }
+-
+-    /**
+-     * {@inheritDoc}
+-     * 
+-     * @throws SdkClientException
+-     *             if the data length read has exceeded the expected total, or
+-     *             if the total data length is not the same as the expected
+-     *             total.
+-     */
+-    @Override
+-    public int read(byte[] b, int off, int len) throws IOException {
+-        int readLen = super.read(b, off, len);
+-        dataLength += readLen >= 0 ? readLen : 0;
+-        checkLength(readLen == -1);
+-        return readLen;
+-    }
+-
+-    @Override
+-    public void mark(int readlimit) {
+-        if (markSupported()) {
+-            super.mark(readlimit);
+-            marked = dataLength;
+-            markCount++;
+-            resetSinceLastMarked = false;
+-        }
+-    }
+-
+-    @Override
+-    public void reset() throws IOException {
+-        if (markSupported()) {
+-            super.reset();
+-            dataLength = marked;
+-            resetCount++;
+-            resetSinceLastMarked = true;
+-        } else {
+-            throw new IOException("mark/reset not supported");
+-        }
+-    }
+-
+-    /**
+-     * Checks the data length read so far against the expected total.
+-     * 
+-     * @param eof
+-     *            true if end of stream has been encountered; false otherwise
+-     * 
+-     * @throws SdkClientException
+-     *             if the data length read has exceeded the expected total, or
+-     *             if the total data length is not the same as the expected
+-     *             total.
+-     */
+-    private void checkLength(boolean eof) {
+-        if (eof) {
+-            if (dataLength != expectedLength) {
+-                throw new SdkClientException(
+-                        "Data read has a different length than the expected: "
+-                                + diagnosticInfo());
+-            }
+-        } else if (dataLength > expectedLength) {
+-            throw new SdkClientException("More data read than expected: "
+-                    + diagnosticInfo());
+-        }
+-    }
+-
+-    private String diagnosticInfo() {
+-        return new StringBuilder()
+-            .append("dataLength=").append(dataLength)
+-            .append("; expectedLength=").append(expectedLength)
+-            .append("; includeSkipped=").append(includeSkipped)
+-            .append("; in.getClass()=").append(in.getClass())
+-            .append("; markedSupported=").append(markSupported())
+-            .append("; marked=").append(marked)
+-            .append("; resetSinceLastMarked=").append(resetSinceLastMarked)
+-            .append("; markCount=").append(markCount)
+-            .append("; resetCount=").append(resetCount)
+-            .toString();
+-    }
+-
+-    /**
+-     * {@inheritDoc}
+-     * 
+-     * @throws SdkClientException
+-     *             if {@link #includeSkipped} is true and the data length
+-     *             skipped has exceeded the expected total.
+-     */
+-    @Override
+-    public long skip(long n) throws IOException {
+-        final long skipped = super.skip(n);
+-        if (includeSkipped && skipped > 0) {
+-            dataLength += skipped;
+-            checkLength(false);
+-        }
+-        return skipped;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/Md5Utils.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/Md5Utils.java
+--- ./src/main/java/com/amazonaws/util/Md5Utils.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/Md5Utils.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,106 +0,0 @@
+-/*
+- * Copyright 2012-2018 Amazon Technologies, Inc.
+- *
+- * Portions copyright 2006-2009 James Murty. Please see LICENSE.txt
+- * for applicable license terms and NOTICE.txt for applicable notices.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at:
+- *
+- *    http://aws.amazon.com/apache2.0
+- *
+- * This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+- * OR CONDITIONS OF ANY KIND, either express or implied. See the
+- * License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import java.io.BufferedInputStream;
+-import java.io.File;
+-import java.io.FileInputStream;
+-import java.io.FileNotFoundException;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.security.MessageDigest;
+-import java.security.NoSuchAlgorithmException;
+-
+-import org.apache.commons.logging.LogFactory;
+-
+-/**
+- * Utility methods for computing MD5 sums.
+- */
+-public class Md5Utils {
+-    private static final int SIXTEEN_K = 1 << 14;
+-    /**
+-     * Computes the MD5 hash of the data in the given input stream and returns
+-     * it as an array of bytes.
+-     * Note this method closes the given input stream upon completion.
+-     */
+-    public static byte[] computeMD5Hash(InputStream is) throws IOException {
+-        BufferedInputStream bis = new BufferedInputStream(is);
+-        try {
+-            MessageDigest messageDigest = MessageDigest.getInstance("MD5");
+-            byte[] buffer = new byte[SIXTEEN_K];
+-            int bytesRead;
+-            while ( (bytesRead = bis.read(buffer, 0, buffer.length)) != -1 ) {
+-                messageDigest.update(buffer, 0, bytesRead);
+-            }
+-            return messageDigest.digest();
+-        } catch (NoSuchAlgorithmException e) {
+-            // should never get here
+-            throw new IllegalStateException(e);
+-        } finally {
+-            try {
+-                bis.close();
+-            } catch (Exception e) {
+-                LogFactory.getLog(Md5Utils.class).debug(
+-                        "Unable to close input stream of hash candidate: " + e);
+-            }
+-        }
+-    }
+-
+-    /**
+-     * Returns the MD5 in base64 for the data from the given input stream.
+-     * Note this method closes the given input stream upon completion.
+-     */
+-    public static String md5AsBase64(InputStream is) throws IOException {
+-        return Base64.encodeAsString(computeMD5Hash(is));
+-    }
+-
+-    /**
+-     * Computes the MD5 hash of the given data and returns it as an array of
+-     * bytes.
+-     */
+-    public static byte[] computeMD5Hash(byte[] input) {
+-        try {
+-            MessageDigest md = MessageDigest.getInstance("MD5");
+-            return md.digest(input);
+-        } catch (NoSuchAlgorithmException e) {
+-            // should never get here
+-            throw new IllegalStateException(e);
+-        }
+-    }
+-
+-    /**
+-     * Returns the MD5 in base64 for the given byte array.
+-     */
+-    public static String md5AsBase64(byte[] input) {
+-        return Base64.encodeAsString(computeMD5Hash(input));
+-    }
+-
+-    /**
+-     * Computes the MD5 of the given file.
+-     */
+-    public static byte[] computeMD5Hash(File file) throws FileNotFoundException, IOException {
+-        return computeMD5Hash(new FileInputStream(file));
+-    }
+-
+-    /**
+-     * Returns the MD5 in base64 for the given file.
+-     */
+-    public static String md5AsBase64(File file) throws FileNotFoundException, IOException {
+-        return Base64.encodeAsString(computeMD5Hash(file));
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/MetadataCache.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/MetadataCache.java
+--- ./src/main/java/com/amazonaws/util/MetadataCache.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/MetadataCache.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,49 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights
+- * Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import com.amazonaws.ResponseMetadata;
+-import com.amazonaws.annotation.SdkInternalApi;
+-
+-/**
+- * Interface for caches interacting with response metadata.
+- */
+-@SdkInternalApi
+-public interface MetadataCache {
+-
+-    /**
+-     * Adds a new entry to this cache, possibly evicting the oldest entry if the
+-     * cache is at its size limit.
+-     *
+-     * @param obj
+-     *            The key by which to store the metadata.
+-     * @param metadata
+-     *            The metadata for this entry.
+-     */
+-    void add(Object obj, ResponseMetadata metadata);
+-
+-    /**
+-     * Returns the response metadata associated with the specified object, or
+-     * null if no metadata is associated with that object.
+-     *
+-     * @param obj
+-     *            The key by which the desired metadata is stored.
+-     *
+-     * @return The response metadata associated with the given object key,
+-     *         otherwise null if no metadata is associated with that object.
+-     */
+-    ResponseMetadata get(Object obj);
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/NamespaceRemovingInputStream.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/NamespaceRemovingInputStream.java
+--- ./src/main/java/com/amazonaws/util/NamespaceRemovingInputStream.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/NamespaceRemovingInputStream.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,171 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import java.io.BufferedInputStream;
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import com.amazonaws.internal.SdkFilterInputStream;
+-
+-/**
+- * FilterInputStream implementation that wraps an InputStream containing an XML
+- * document, and removes the XML namespace attribute from the XML document.
+- */
+-class NamespaceRemovingInputStream extends SdkFilterInputStream {
+-
+-    /** look ahead buffer */
+-    private byte[] lookAheadData = new byte[200];
+-
+-    /** Set to true once the namespace has been removed */
+-    private boolean hasRemovedNamespace = false;
+-
+-    /**
+-     * Constructs a new NamespaceRemovingInputStream wrapping the specified
+-     * InputStream.
+-     *
+-     * @param in
+-     *            The InputStream containing an XML document whose XML namespace
+-     *            is to be removed.
+-     */
+-    public NamespaceRemovingInputStream(InputStream in) {
+-        // Wrap our input stream in a buffered input stream to ensure
+-        // that it support mark/reset
+-        super(new BufferedInputStream(in));
+-    }
+-
+-    /* (non-Javadoc)
+-     * @see java.io.FilterInputStream#read()
+-     */
+-    @Override
+-    public int read() throws IOException {
+-        abortIfNeeded();
+-        int b = in.read();
+-        if (b == 'x' && !hasRemovedNamespace) {
+-            lookAheadData[0] = (byte)b;
+-            in.mark(lookAheadData.length);
+-            int bytesRead = in.read(lookAheadData, 1, lookAheadData.length - 1);
+-            in.reset();
+-
+-            String string = new String(lookAheadData, 0, bytesRead + 1, StringUtils.UTF8);
+-
+-            int numberCharsMatched = matchXmlNamespaceAttribute(string);
+-            if (numberCharsMatched > 0) {
+-                for (int i = 0; i < numberCharsMatched - 1; i++) {
+-                    in.read();
+-                }
+-                b = in.read();
+-                hasRemovedNamespace = true;
+-            }
+-        }
+-
+-        return b;
+-    }
+-
+-    /* (non-Javadoc)
+-     * @see java.io.FilterInputStream#read(byte[], int, int)
+-     */
+-    @Override
+-    public int read(byte[] b, int off, int len) throws IOException {
+-        for (int i = 0; i < len; i++) {
+-            int j = this.read();
+-            if (j == -1) {
+-                if (i == 0) return -1;
+-                return i;
+-            }
+-
+-            b[i + off] = (byte)j;
+-        }
+-
+-        return len;
+-    }
+-
+-    /* (non-Javadoc)
+-     * @see java.io.FilterInputStream#read(byte[])
+-     */
+-    @Override
+-    public int read(byte[] b) throws IOException {
+-        return this.read(b, 0, b.length);
+-    }
+-
+-    /**
+-     * Checks if the string starts with a complete XML namespace attribute, and
+-     * if so, returns the number of characters that match.
+-     *
+-     * @param s
+-     *            The string to check for an XML namespace definition.
+-     *
+-     * @return -1 if no XML namespace definition was found, otherwise the length
+-     *         of the identified XML namespace definition.
+-     */
+-    private int matchXmlNamespaceAttribute(String s) {
+-        /*
+-         * The regex we're simulating is: "xmlns\\s*=\\s*\".+?\".*"
+-         */
+-        StringPrefixSlicer stringSlicer = new StringPrefixSlicer(s);
+-        if (stringSlicer.removePrefix("xmlns") == false) return -1;
+-
+-        stringSlicer.removeRepeatingPrefix(" ");
+-        if (stringSlicer.removePrefix("=") == false) return -1;
+-        stringSlicer.removeRepeatingPrefix(" ");
+-
+-        if (stringSlicer.removePrefix("\"") == false) return -1;
+-        if (stringSlicer.removePrefixEndingWith("\"") == false) return -1;
+-
+-        return s.length() - stringSlicer.getString().length();
+-    }
+-
+-    /**
+-     * Utility class to help test and remove specified prefixes from a string.
+-     */
+-    private static final class StringPrefixSlicer {
+-        private String s;
+-
+-        public StringPrefixSlicer(String s) {
+-            this.s = s;
+-        }
+-
+-        /**
+-         * @return The remaining String (minus any prefixes that have been
+-         *         removed).
+-         */
+-        public String getString() {
+-            return s;
+-        }
+-
+-        public boolean removePrefix(String prefix) {
+-            if (s.startsWith(prefix) == false) return false;
+-            s = s.substring(prefix.length());
+-            return true;
+-        }
+-
+-        public boolean removeRepeatingPrefix(String prefix) {
+-            if (s.startsWith(prefix) == false) return false;
+-
+-            while (s.startsWith(prefix)) {
+-                s = s.substring(prefix.length());
+-            }
+-            return true;
+-        }
+-
+-        public boolean removePrefixEndingWith(String marker) {
+-            int i = s.indexOf(marker);
+-            if (i < 0) return false;
+-            s = s.substring(i + marker.length());
+-            return true;
+-        }
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/NameValuePair.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/NameValuePair.java
+--- ./src/main/java/com/amazonaws/util/NameValuePair.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/NameValuePair.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,47 +0,0 @@
+-/*
+- * ====================================================================
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *   http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing,
+- * software distributed under the License is distributed on an
+- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+- * KIND, either express or implied.  See the License for the
+- * specific language governing permissions and limitations
+- * under the License.
+- * ====================================================================
+- *
+- * This software consists of voluntary contributions made by many
+- * individuals on behalf of the Apache Software Foundation.  For more
+- * information on the Apache Software Foundation, please see
+- * .
+- *
+- */
+-
+-package com.amazonaws.util;
+-
+-/**
+- * A name / value pair parameter used as an element of HTTP messages.
+- * 
+- * parameter               = attribute "=" value
+- * attribute               = token
+- * value                   = token | quoted-string
+- * 

+- *
+- *
+- * @since 4.0
+- */
+-interface NameValuePair {
+-
+-    String getName();
+-
+-    String getValue();
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/NullResponseMetadataCache.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/NullResponseMetadataCache.java
+--- ./src/main/java/com/amazonaws/util/NullResponseMetadataCache.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/NullResponseMetadataCache.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,39 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights
+- * Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.ResponseMetadata;
+-import com.amazonaws.annotation.SdkInternalApi;
+-
+-/**
+- * No-op response metadata cache used when a client instance is configured
+- * without response metadata caching enabled.
+- */
+-@SdkInternalApi
+-public class NullResponseMetadataCache implements MetadataCache {
+-
+-    @Override
+-    public void add(Object obj, ResponseMetadata metadata) {
+-        // deliberately left blank
+-    }
+-
+-    @Override
+-    public ResponseMetadata get(Object obj) {
+-        throw new SdkClientException("Response metadata caching is not enabled");
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/NumberUtils.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/NumberUtils.java
+--- ./src/main/java/com/amazonaws/util/NumberUtils.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/NumberUtils.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,34 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-public final class NumberUtils {
+-
+-    private NumberUtils() {
+-    }
+-
+-    /**
+-     * @param toParse
+-     * @return {@link Integer} or null if string can't be parsed
+-     */
+-    public static Integer tryParseInt(String toParse) {
+-        try {
+-            return Integer.parseInt(toParse);
+-        } catch (NumberFormatException e) {
+-            return null;
+-        }
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/ResponseMetadataCache.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/ResponseMetadataCache.java
+--- ./src/main/java/com/amazonaws/util/ResponseMetadataCache.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/ResponseMetadataCache.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,77 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import java.util.LinkedHashMap;
+-import java.util.Map.Entry;
+-
+-import com.amazonaws.ResponseMetadata;
+-import com.amazonaws.annotation.SdkInternalApi;
+-
+-/**
+- * Cache of response metadata for recently executed requests for diagnostic
+- * purposes. This cache has a max size and as entries are added, the oldest
+- * entry is aged out once the max size has been reached.
+- */
+-@SdkInternalApi
+-public class ResponseMetadataCache implements MetadataCache {
+-    private final InternalCache internalCache;
+-
+-    /**
+-     * Creates a new cache that will contain, at most the specified number of
+-     * entries.
+-     *
+-     * @param maxEntries
+-     *            The maximum size of this cache.
+-     */
+-    public ResponseMetadataCache(int maxEntries) {
+-        internalCache = new InternalCache(maxEntries);
+-    }
+-
+-    @Override
+-    public synchronized void add(Object obj, ResponseMetadata metadata) {
+-        if (obj == null) return;
+-        internalCache.put(System.identityHashCode(obj), metadata);
+-    }
+-
+-    @Override
+-    public synchronized ResponseMetadata get(Object obj) {
+-        // System.identityHashCode isn't guaranteed to be unique
+-        // on all platforms, but should be reasonable enough to use
+-        // for a few requests at a time.  We can always easily move
+-        // to our own unique IDs if needed.
+-        return internalCache.get(System.identityHashCode(obj));
+-    }
+-
+-    /**
+-     * Simple implementation of LinkedHashMap that overrides the
+-     * removeEldestEntry method to turn LinkedHashMap into a
+-     * FIFO cache that automatically evicts old entries.
+-     */
+-    private static final class InternalCache extends LinkedHashMap {
+-        private static final long serialVersionUID = 1L;
+-        private int maxSize;
+-
+-        InternalCache(int maxSize) {
+-            super(maxSize);
+-            this.maxSize = maxSize;
+-        }
+-
+-        @Override
+-        protected boolean removeEldestEntry(Entry eldest) {
+-            return size() > maxSize;
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/RuntimeHttpUtils.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/RuntimeHttpUtils.java
+--- ./src/main/java/com/amazonaws/util/RuntimeHttpUtils.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/RuntimeHttpUtils.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,256 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import com.amazonaws.ClientConfiguration;
+-import com.amazonaws.Protocol;
+-import com.amazonaws.Request;
+-import com.amazonaws.SdkClientException;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-import org.apache.http.HttpHost;
+-import org.apache.http.HttpResponse;
+-import org.apache.http.auth.AuthScope;
+-import org.apache.http.auth.NTCredentials;
+-import org.apache.http.client.methods.HttpGet;
+-import org.apache.http.conn.params.ConnRoutePNames;
+-import org.apache.http.impl.client.DefaultHttpClient;
+-import org.apache.http.params.BasicHttpParams;
+-import org.apache.http.params.HttpConnectionParams;
+-import org.apache.http.params.HttpParams;
+-import org.apache.http.params.HttpProtocolParams;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.net.MalformedURLException;
+-import java.net.URI;
+-import java.net.URISyntaxException;
+-import java.net.URL;
+-import java.util.List;
+-import java.util.Map;
+-
+-public class RuntimeHttpUtils {
+-    private static final String COMMA = ", ";
+-    private static final String SPACE = " ";
+-
+-    private static final String AWS_EXECUTION_ENV_PREFIX = "exec-env/";
+-    private static final String AWS_EXECUTION_ENV_NAME = "AWS_EXECUTION_ENV";
+-
+-
+-    /**
+-     * Fetches a file from the URI given and returns an input stream to it.
+-     *
+-     * @param uri the uri of the file to fetch
+-     * @param config optional configuration overrides
+-     * @return an InputStream containing the retrieved data
+-     * @throws IOException on error
+-     */
+-    @SuppressWarnings("deprecation")
+-    public static InputStream fetchFile(
+-            final URI uri,
+-            final ClientConfiguration config) throws IOException {
+-
+-        HttpParams httpClientParams = new BasicHttpParams();
+-        HttpProtocolParams.setUserAgent(
+-                httpClientParams, getUserAgent(config, null));
+-
+-        HttpConnectionParams.setConnectionTimeout(
+-                httpClientParams, getConnectionTimeout(config));
+-        HttpConnectionParams.setSoTimeout(
+-                httpClientParams, getSocketTimeout(config));
+-
+-        DefaultHttpClient httpclient = new DefaultHttpClient(httpClientParams);
+-
+-        if (config != null) {
+-            String proxyHost = config.getProxyHost();
+-            int proxyPort = config.getProxyPort();
+-
+-            if (proxyHost != null && proxyPort > 0) {
+-
+-                HttpHost proxy = new HttpHost(proxyHost, proxyPort);
+-                httpclient.getParams().setParameter(
+-                        ConnRoutePNames.DEFAULT_PROXY, proxy);
+-
+-                if (config.getProxyUsername() != null
+-                    && config.getProxyPassword() != null) {
+-
+-                    httpclient.getCredentialsProvider().setCredentials(
+-                            new AuthScope(proxyHost, proxyPort),
+-                            new NTCredentials(config.getProxyUsername(),
+-                                              config.getProxyPassword(),
+-                                              config.getProxyWorkstation(),
+-                                              config.getProxyDomain()));
+-                }
+-            }
+-        }
+-
+-        HttpResponse response = httpclient.execute(new HttpGet(uri));
+-
+-        if (response.getStatusLine().getStatusCode() != 200) {
+-            throw new IOException("Error fetching file from " + uri + ": "
+-                                  + response);
+-        }
+-
+-        return new HttpClientWrappingInputStream(
+-                httpclient,
+-                response.getEntity().getContent());
+-    }
+-
+-    public static String getUserAgent(final ClientConfiguration config, final String userAgentMarker) {
+-        String userDefinedPrefix = config != null ? config.getUserAgentPrefix() : "";
+-        String userDefinedSuffix = config != null ? config.getUserAgentSuffix() : "";
+-        String awsExecutionEnvironment = getEnvironmentVariable(AWS_EXECUTION_ENV_NAME);
+-
+-        StringBuilder userAgent = new StringBuilder(userDefinedPrefix.trim());
+-
+-        if(!ClientConfiguration.DEFAULT_USER_AGENT.equals(userDefinedPrefix)) {
+-            userAgent.append(COMMA).append(ClientConfiguration.DEFAULT_USER_AGENT);
+-        }
+-
+-        if(StringUtils.hasValue(userDefinedSuffix)) {
+-            userAgent.append(COMMA).append(userDefinedSuffix.trim());
+-        }
+-
+-        if(StringUtils.hasValue(awsExecutionEnvironment)) {
+-            userAgent.append(SPACE).append(AWS_EXECUTION_ENV_PREFIX).append(awsExecutionEnvironment.trim());
+-        }
+-
+-        if(StringUtils.hasValue(userAgentMarker)) {
+-            userAgent.append(SPACE).append(userAgentMarker.trim());
+-        }
+-
+-        return userAgent.toString();
+-    }
+-
+-    private static String getEnvironmentVariable(String environmentVariableName) {
+-        try {
+-            return System.getenv(environmentVariableName);
+-        } catch (Exception e) {
+-            // Return an empty string if unable to get environment variable
+-            return "";
+-        }
+-    }
+-
+-    private static int getConnectionTimeout(final ClientConfiguration config) {
+-        if (config != null) {
+-            return config.getConnectionTimeout();
+-        }
+-        return ClientConfiguration.DEFAULT_CONNECTION_TIMEOUT;
+-    }
+-
+-    private static int getSocketTimeout(final ClientConfiguration config) {
+-        if (config != null) {
+-            return config.getSocketTimeout();
+-        }
+-        return ClientConfiguration.DEFAULT_SOCKET_TIMEOUT;
+-    }
+-
+-    /**
+-     * Returns an URI for the given endpoint.
+-     * Prefixes the protocol if the endpoint given does not have it.
+-     *
+-     * @throws IllegalArgumentException if the inputs are null.
+-     */
+-    public static URI toUri(String endpoint, ClientConfiguration config) {
+-
+-        if (config == null) {
+-            throw new IllegalArgumentException("ClientConfiguration cannot be null");
+-        }
+-        return toUri(endpoint, config.getProtocol());
+-    }
+-
+-    /**
+-     * Returns an URI for the given endpoint.
+-     * Prefixes the protocol if the endpoint given does not have it.
+-     *
+-     * @throws IllegalArgumentException if the inputs are null.
+-     */
+-    public static URI toUri(String endpoint, Protocol protocol) {
+-        if (endpoint == null) {
+-            throw new IllegalArgumentException("endpoint cannot be null");
+-        }
+-
+-        /*
+-         * If the endpoint doesn't explicitly specify a protocol to use, then
+-         * we'll defer to the default protocol specified in the client
+-         * configuration.
+-         */
+-        if (!endpoint.contains("://")) {
+-            endpoint = protocol.toString() + "://" + endpoint;
+-        }
+-
+-        try {
+-            return new URI(endpoint);
+-        } catch (URISyntaxException e) {
+-            throw new IllegalArgumentException(e);
+-        }
+-    }
+-
+-    /**
+-     * Converts the specified request object into a URL, containing all the specified parameters, the specified request endpoint,
+-     * etc.
+-     *
+-     * @param request                          The request to convert into a URL.
+-     * @param removeLeadingSlashInResourcePath Whether the leading slash in resource-path should be removed before appending to
+-     *                                         the endpoint.
+-     * @param urlEncode                        True if request resource path should be URL encoded
+-     * @return A new URL representing the specified request.
+-     * @throws SdkClientException If the request cannot be converted to a well formed URL.
+-     */
+-    @SdkProtectedApi
+-    public static URL convertRequestToUrl(Request request,
+-                                          boolean removeLeadingSlashInResourcePath,
+-                                          boolean urlEncode) {
+-        String resourcePath = urlEncode ?
+-                SdkHttpUtils.urlEncode(request.getResourcePath(), true)
+-                : request.getResourcePath();
+-
+-        // Removed the padding "/" that was already added into the request's resource path.
+-        if (removeLeadingSlashInResourcePath
+-            && resourcePath.startsWith("/")) {
+-            resourcePath = resourcePath.substring(1);
+-        }
+-
+-        // Some http client libraries (e.g. Apache HttpClient) cannot handle
+-        // consecutive "/"s between URL authority and path components.
+-        // So we escape "////..." into "/%2F%2F%2F...", in the same way as how
+-        // we treat consecutive "/"s in AmazonS3Client#presignRequest(...)
+-
+-        String urlPath = "/" + resourcePath;
+-        urlPath = urlPath.replaceAll("(?<=/)/", "%2F");
+-        StringBuilder url = new StringBuilder(request.getEndpoint().toString());
+-        url.append(urlPath);
+-
+-        StringBuilder queryParams = new StringBuilder();
+-        Map> requestParams = request.getParameters();
+-        for (Map.Entry> entry : requestParams.entrySet()) {
+-            for (String value : entry.getValue()) {
+-                queryParams = queryParams.length() > 0 ? queryParams
+-                        .append("&") : queryParams.append("?");
+-                queryParams.append(SdkHttpUtils.urlEncode(entry.getKey(), false))
+-                        .append("=")
+-                        .append(SdkHttpUtils.urlEncode(value, false));
+-            }
+-        }
+-        url.append(queryParams.toString());
+-
+-        try {
+-            return new URL(url.toString());
+-        } catch (MalformedURLException e) {
+-            throw new SdkClientException(
+-                    "Unable to convert request to well formed URL: " + e.getMessage(), e);
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/SdkHttpUtils.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/SdkHttpUtils.java
+--- ./src/main/java/com/amazonaws/util/SdkHttpUtils.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/SdkHttpUtils.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,216 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import java.io.UnsupportedEncodingException;
+-import java.net.URI;
+-import java.net.URLDecoder;
+-import java.net.URLEncoder;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Map.Entry;
+-import java.util.regex.Matcher;
+-import java.util.regex.Pattern;
+-
+-import com.amazonaws.SignableRequest;
+-import com.amazonaws.http.HttpMethodName;
+-
+-public class SdkHttpUtils {
+-
+-    private static final String DEFAULT_ENCODING = "UTF-8";
+-
+-    /**
+-     * Regex which matches any of the sequences that we need to fix up after
+-     * URLEncoder.encode().
+-     */
+-    private static final Pattern ENCODED_CHARACTERS_PATTERN;
+-    static {
+-        StringBuilder pattern = new StringBuilder();
+-
+-        pattern
+-            .append(Pattern.quote("+"))
+-            .append("|")
+-            .append(Pattern.quote("*"))
+-            .append("|")
+-            .append(Pattern.quote("%7E"))
+-            .append("|")
+-            .append(Pattern.quote("%2F"));
+-
+-        ENCODED_CHARACTERS_PATTERN = Pattern.compile(pattern.toString());
+-    }
+-
+-    /**
+-     * Encode a string for use in the path of a URL; uses URLEncoder.encode,
+-     * (which encodes a string for use in the query portion of a URL), then
+-     * applies some postfilters to fix things up per the RFC. Can optionally
+-     * handle strings which are meant to encode a path (ie include '/'es
+-     * which should NOT be escaped).
+-     *
+-     * @param value the value to encode
+-     * @param path true if the value is intended to represent a path
+-     * @return the encoded value
+-     */
+-    public static String urlEncode(final String value, final boolean path) {
+-        if (value == null) {
+-            return "";
+-        }
+-
+-        try {
+-            String encoded = URLEncoder.encode(value, DEFAULT_ENCODING);
+-
+-            Matcher matcher = ENCODED_CHARACTERS_PATTERN.matcher(encoded);
+-            StringBuffer buffer = new StringBuffer(encoded.length());
+-
+-            while (matcher.find()) {
+-                String replacement = matcher.group(0);
+-
+-                if ("+".equals(replacement)) {
+-                    replacement = "%20";
+-                } else if ("*".equals(replacement)) {
+-                    replacement = "%2A";
+-                } else if ("%7E".equals(replacement)) {
+-                    replacement = "~";
+-                } else if (path && "%2F".equals(replacement)) {
+-                    replacement = "/";
+-                }
+-
+-                matcher.appendReplacement(buffer, replacement);
+-            }
+-
+-            matcher.appendTail(buffer);
+-            return buffer.toString();
+-
+-        } catch (UnsupportedEncodingException ex) {
+-            throw new RuntimeException(ex);
+-        }
+-    }
+-
+-    /**
+-     * Decode a string for use in the path of a URL; uses URLDecoder.decode,
+-     * which decodes a string for use in the query portion of a URL.
+-     *
+-     * @param value The value to decode
+-     * @return The decoded value if parameter is not null, otherwise, null is returned.
+-     */
+-    public static String urlDecode(final String value) {
+-        if (value == null) {
+-            return null;
+-        }
+-
+-        try {
+-            return URLDecoder.decode(value, DEFAULT_ENCODING);
+-
+-        } catch (UnsupportedEncodingException ex) {
+-            throw new RuntimeException(ex);
+-        }
+-    }
+-
+-    /**
+-     * Returns true if the specified URI is using a non-standard port (i.e. any
+-     * port other than 80 for HTTP URIs or any port other than 443 for HTTPS
+-     * URIs).
+-     *
+-     * @param uri
+-     *
+-     * @return True if the specified URI is using a non-standard port, otherwise
+-     *         false.
+-     */
+-    public static boolean isUsingNonDefaultPort(URI uri) {
+-        String scheme = StringUtils.lowerCase(uri.getScheme());
+-        int port = uri.getPort();
+-
+-        if (port <= 0) return false;
+-        if (scheme.equals("http") && port == 80) return false;
+-        if (scheme.equals("https") && port == 443) return false;
+-
+-        return true;
+-    }
+-
+-    public static boolean usePayloadForQueryParameters(SignableRequest request) {
+-        boolean requestIsPOST = HttpMethodName.POST.equals(request.getHttpMethod());
+-        boolean requestHasNoPayload = (request.getContent() == null);
+-
+-        return requestIsPOST && requestHasNoPayload;
+-    }
+-
+-    /**
+-     * Creates an encoded query string from all the parameters in the specified
+-     * request.
+-     *
+-     * @param request
+-     *            The request containing the parameters to encode.
+-     *
+-     * @return Null if no parameters were present, otherwise the encoded query
+-     *         string for the parameters present in the specified request.
+-     */
+-    public static String encodeParameters(SignableRequest request) {
+-
+-        final Map> requestParams = request.getParameters();
+-
+-        if (requestParams.isEmpty()) return null;
+-
+-        final List nameValuePairs = new ArrayList();
+-
+-        for (Entry> entry : requestParams.entrySet()) {
+-            String parameterName = entry.getKey();
+-            for (String value : entry.getValue()) {
+-                nameValuePairs
+-                    .add(new BasicNameValuePair(parameterName, value));
+-            }
+-        }
+-
+-        return URLEncodedUtils.format(nameValuePairs, DEFAULT_ENCODING);
+-    }
+-
+-    /**
+-     * Append the given path to the given baseUri.
+-     * By default, all slash characters in path will not be url-encoded.
+-     */
+-    public static String appendUri(String baseUri, String path) {
+-        return appendUri(baseUri, path, false);
+-    }
+-
+-    /**
+-     * Append the given path to the given baseUri.
+-     *
+-     * @param baseUri The URI to append to (required, may be relative)
+-     * @param path The path to append (may be null or empty).  Path should be pre-encoded.
+-     * @param escapeDoubleSlash Whether double-slash in the path should be escaped to "/%2F"
+-     * @return The baseUri with the path appended
+-     */
+-    public static String appendUri(final String baseUri, String path, final boolean escapeDoubleSlash) {
+-        String resultUri = baseUri;
+-        if (path != null && path.length() > 0) {
+-            if (path.startsWith("/")) {
+-                // trim the trailing slash in baseUri, since the path already starts with a slash
+-                if (resultUri.endsWith("/")) {
+-                    resultUri = resultUri.substring(0, resultUri.length() - 1);
+-                }
+-            } else if (!resultUri.endsWith("/")) {
+-                resultUri += "/";
+-            }
+-            if (escapeDoubleSlash) {
+-                resultUri += path.replace("//", "/%2F");
+-            } else {
+-                resultUri += path;
+-            }
+-        } else if (!resultUri.endsWith("/")) {
+-            resultUri += "/";
+-        }
+-
+-        return resultUri;
+-    }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/util/SdkRuntime.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/SdkRuntime.java
+--- ./src/main/java/com/amazonaws/util/SdkRuntime.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/SdkRuntime.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,27 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-public enum SdkRuntime {
+-    ;
+-
+-    /**
+-     * Returns true if the current operation should abort; false otherwise.
+-     * Note the interrupted status of the thread is cleared by this method.
+-     */
+-    public static boolean shouldAbort() {
+-        return Thread.interrupted();
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/ServiceClientHolderInputStream.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/ServiceClientHolderInputStream.java
+--- ./src/main/java/com/amazonaws/util/ServiceClientHolderInputStream.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/ServiceClientHolderInputStream.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,39 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon Technologies, Inc.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at:
+- *
+- *    http://aws.amazon.com/apache2.0
+- *
+- * This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+- * OR CONDITIONS OF ANY KIND, either express or implied. See the
+- * License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import java.io.InputStream;
+-
+-import com.amazonaws.AmazonWebServiceClient;
+-import com.amazonaws.internal.SdkFilterInputStream;
+-
+-/**
+- * This wrapper input stream holds a reference to the service client. This is
+- * mainly done to avoid the AmazonWebServiceClient object being garbage
+- * collected when the client reads data from the input stream.
+- * 
+- */
+-public class ServiceClientHolderInputStream extends SdkFilterInputStream {
+-
+-	
+-	@SuppressWarnings("unused")
+-	private AmazonWebServiceClient client;
+-
+-	public ServiceClientHolderInputStream(InputStream in,
+-			AmazonWebServiceClient client) {
+-		super(in);
+-		this.client = client;
+-	}	
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/StringInputStream.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/StringInputStream.java
+--- ./src/main/java/com/amazonaws/util/StringInputStream.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/StringInputStream.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,44 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-import static com.amazonaws.util.StringUtils.UTF8;
+-
+-import java.io.ByteArrayInputStream;
+-import java.io.UnsupportedEncodingException;
+-
+-/**
+- * Simple wrapper for ByteArrayInputStream that will automatically encode the
+- * string as UTF-8 data, and still allows access to the original string.
+- */
+-public class StringInputStream extends ByteArrayInputStream {
+-
+-    private final String string;
+-
+-    public StringInputStream(String s) throws UnsupportedEncodingException {
+-        super(s.getBytes(UTF8));
+-        this.string = s;
+-    }
+-
+-    /**
+-     * Returns the original string specified when this input stream was
+-     * constructed.
+-     *
+-     * @return The original string specified when this input stream was
+-     *         constructed.
+-     */
+-    public String getString() {
+-        return string;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/StringMapBuilder.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/StringMapBuilder.java
+--- ./src/main/java/com/amazonaws/util/StringMapBuilder.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/StringMapBuilder.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,26 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- * 
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- * 
+- *  http://aws.amazon.com/apache2.0
+- * 
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-/**
+- * A convenient map builder for Strings.
+- */
+-public class StringMapBuilder extends
+-    ImmutableMapParameter.Builder {
+-    public StringMapBuilder() {}
+-    public StringMapBuilder(String key, String value) {
+-        super.put(key, value);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/Throwables.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/Throwables.java
+--- ./src/main/java/com/amazonaws/util/Throwables.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/Throwables.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,78 +0,0 @@
+-/*
+- * Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import org.apache.commons.logging.LogFactory;
+-
+-import com.amazonaws.AbortedException;
+-import com.amazonaws.AmazonClientException;
+-
+-/**
+- * Utility for use with errors or exceptions.
+- */
+-public enum Throwables {
+-    ;
+-    /**
+-     * Returns the root cause of the given throwable, or null if the given
+-     * throwable is null. If the root cause is over 1000 level deep, the
+-     * original throwable will be returned defensively as this is heuristically
+-     * considered a circular reference, however unlikely.
+-     */
+-    public static Throwable getRootCause(Throwable orig) {
+-        if (orig == null)
+-            return orig;
+-        Throwable t = orig;
+-        // defend against (malicious?) circularity
+-        for (int i=0; i < 1000; i++) {
+-            Throwable cause = t.getCause();
+-            if (cause == null)
+-                return t;
+-            t = cause;
+-        }
+-        // Too bad.  Return the original exception.
+-        LogFactory.getLog(Throwables.class).debug(
+-            "Possible circular reference detected on " + orig.getClass()
+-                    + ": [" + orig + "]");
+-        return orig;
+-    }
+-
+-    /**
+-     * Used to help perform common throw-up with minimal wrapping.
+-     */
+-    public static RuntimeException failure(Throwable t) {
+-        if (t instanceof RuntimeException)
+-            return (RuntimeException)t;
+-        if (t instanceof Error)
+-            throw (Error)t;
+-        return t instanceof InterruptedException
+-             ? new AbortedException(t)
+-             : new AmazonClientException(t);
+-    }
+-
+-    /**
+-     * Same as {@link #failure(Throwable)}, but the given errmsg will be used if
+-     * it was wrapped as either an {@link AmazonClientException} or
+-     * {@link AbortedException}.
+-     */
+-    public static RuntimeException failure(Throwable t, String errmsg) {
+-        if (t instanceof RuntimeException)
+-            return (RuntimeException)t;
+-        if (t instanceof Error)
+-            throw (Error)t;
+-        return t instanceof InterruptedException 
+-             ? new AbortedException(errmsg, t)
+-             : new AmazonClientException(errmsg, t);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/TimingInfoFullSupport.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/TimingInfoFullSupport.java
+--- ./src/main/java/com/amazonaws/util/TimingInfoFullSupport.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/TimingInfoFullSupport.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,142 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import com.amazonaws.annotation.NotThreadSafe;
+-
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-
+-import org.apache.commons.logging.LogFactory;
+-
+-/**
+- * In contrast to {@link TimingInfo}, which is intended to be a minimal support
+- * of the timing info, this class is the full support of timing info including
+- * features related to sub-measurements and counters.
+- * 

+- * This class is instantiated instead of {@link TimingInfo} when
+- * request metric collection is required during a particular service
+- * request/response cycle.
+- */
+-@NotThreadSafe
+-class TimingInfoFullSupport extends TimingInfo {
+-    private final Map> subMeasurementsByName = new HashMap>();
+-    private final Map countersByName = new HashMap();
+-
+-    /**
+-     * A private ctor to facilitate the deprecation of using millisecond and
+-     * migration to using nanosecond for timing measurement.
+-     * 
+-     * @param startEpochTimeMilli start time since epoch in millisecond
+-     * @param startTimeNano start time in nanosecond
+-     * @param endTimeNano end time in nanosecond; or null if not known
+-     * 
+-     * @see TimingInfo#startTimingFullSupport()
+-     * @see TimingInfo#startTimingFullSupport(long)
+-     * @see TimingInfo#newTimingInfoFullSupport(long, long)
+-     * @see TimingInfo#newTimingInfoFullSupport(long, long, long)
+-     */
+-    TimingInfoFullSupport(Long startEpochTimeMilli, long startTimeNano, Long endTimeNano) {
+-        super(startEpochTimeMilli, startTimeNano, endTimeNano);
+-    }
+-
+-    @Override
+-    public void addSubMeasurement(String subMeasurementName, TimingInfo ti) {
+-        List timings = subMeasurementsByName.get(subMeasurementName);
+-        if (timings == null) {
+-            timings = new ArrayList();
+-            subMeasurementsByName.put(subMeasurementName, timings);
+-        }
+-        if (ti.isEndTimeKnown()) {
+-            timings.add(ti);
+-        } else {
+-            LogFactory.getLog(getClass()).debug(
+-                "Skip submeasurement timing info with no end time for "
+-                + subMeasurementName);
+-        }
+-    }
+-
+-    @Override
+-    public TimingInfo getSubMeasurement(String subMeasurementName) {
+-        return getSubMeasurement(subMeasurementName, 0);
+-    }
+-
+-    @Override
+-    public TimingInfo getSubMeasurement(String subMesurementName, int index) {
+-
+-        List timings = subMeasurementsByName.get(subMesurementName);
+-        if (index < 0 || timings == null || timings.size() == 0
+-                || index >= timings.size()) {
+-            return null;
+-        }
+-
+-        return timings.get(index);
+-    }
+-
+-    @Override
+-    public TimingInfo getLastSubMeasurement(String subMeasurementName) {
+-
+-        if (subMeasurementsByName == null || subMeasurementsByName.size() == 0) {
+-            return null;
+-        }
+-
+-        List timings = subMeasurementsByName.get(subMeasurementName);
+-        if (timings == null || timings.size() == 0) {
+-            return null;
+-        }
+-
+-        return timings.get(timings.size() - 1);
+-    }
+-
+-    @Override
+-    public List getAllSubMeasurements(String subMeasurementName) {
+-        return subMeasurementsByName.get(subMeasurementName);
+-    }
+-
+-    @Override
+-    public Map> getSubMeasurementsByName() {
+-        return subMeasurementsByName;
+-    }
+-
+-    @Override
+-    public Number getCounter(String key) {
+-        return countersByName.get(key);
+-    }
+-
+-    @Override
+-    public Map getAllCounters() {
+-        return countersByName;
+-    }
+-
+-    @Override
+-    public void setCounter(String key, long count) {
+-        countersByName.put(key, count);
+-    }
+-
+-    @Override
+-    public void incrementCounter(String key) {
+-
+-        int count = 0;
+-        Number counter = getCounter(key);
+-
+-        if (counter != null) {
+-            count = counter.intValue();
+-        }
+-
+-        setCounter(key, ++count);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/TimingInfo.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/TimingInfo.java
+--- ./src/main/java/com/amazonaws/util/TimingInfo.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/TimingInfo.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,271 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import com.amazonaws.annotation.NotThreadSafe;
+-
+-import java.util.Collections;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.concurrent.TimeUnit;
+-
+-/**
+- * Used both as a base class and a minimal support of timing info.
+- * 

+- * In contrast to {@link TimingInfoFullSupport}, which is intended to be a full
+- * support of the timing info, this class only provides a minimal support of
+- * start and end time (ie with no-ops for sub-event measurements) for backward
+- * compatiblity reasons.
+- * 

+- * This class is instantiated instead of {@link TimingInfoFullSupport} when
+- * request metric collection is not required during a particular service
+- * request/response cycle.
+- */
+-@NotThreadSafe
+-public class TimingInfo {
+-    static final int UNKNOWN = -1;
+-    /**
+-     * The wall clock time (as the number of milliseconds since Epoch)
+-     * of when the timing measurement starts; or null if unknown.
+-     * This field is not meant to be used for timing measurement.
+-     * For more info, see:
+-     * https://blogs.oracle.com/dholmes/entry/inside_the_hotspot_vm_clocks
+-     */
+-    private final Long startEpochTimeMilli;
+-    /** 
+-     * Start time in nanosecond used for timing measurement.
+-     * Note the value in this field may have nothing to do with
+-     * the wall clock time.
+-     * The wall clock time of when the timing measurement starts
+-     * can optionally be captured in {@link #startEpochTimeMilli}.
+-     * For more info, see:
+-     * https://blogs.oracle.com/dholmes/entry/inside_the_hotspot_vm_clocks
+-     * 

+-     * Note System.nanoTime() can return negative values.
+-     */
+-    private final long startTimeNano;
+-    /** 
+-     * End time in nanosecond used for timing measurement or null if unknown.
+-     * Note the value in this field is only meant to be used for timing
+-     * measurement, and is not directly related to the wall clock time.
+-     * For more info, see:
+-     * https://blogs.oracle.com/dholmes/entry/inside_the_hotspot_vm_clocks
+-     * 

+-     * Note System.nanoTime() can return negative values.
+-     */
+-    private Long endTimeNano;
+-
+-    /**
+-     * Captures the current wall clock time (since epoch in millisecond)
+-     * and the current time (in nanosecond) used for timing measurement.
+-     * For more info, see:
+-     * https://blogs.oracle.com/dholmes/entry/inside_the_hotspot_vm_clocks
+-     */
+-    public static TimingInfo startTiming() {
+-        return new TimingInfo(Long.valueOf(System.currentTimeMillis()), System.nanoTime(), null);
+-    }
+-
+-    /**
+-     * Captures the current wall clock time (since epoch in millisecond)
+-     * and the current time (in nanosecond) used for timing measurement.
+-     * For more info, see:
+-     * https://blogs.oracle.com/dholmes/entry/inside_the_hotspot_vm_clocks
+-     */
+-    public static TimingInfo startTimingFullSupport() {
+-        return new TimingInfoFullSupport(Long.valueOf(System.currentTimeMillis()), System.nanoTime(), null);
+-    }
+-
+-    /**
+-     * Captures the given start time in nanosecond, ignoring the wall clock time.
+-     *
+-     * @param startTimeNano start time in nanosecond
+-     */
+-    public static TimingInfo startTimingFullSupport(long startTimeNano) {
+-        return new TimingInfoFullSupport(null, startTimeNano, null);
+-    }
+-
+-    /**
+-     * Returns a {@link TimingInfoFullSupport} based on the given
+-     * start and end time in nanosecond, ignoring the wall clock time.
+-     *
+-     * @param startTimeNano start time in nanosecond
+-     * @param endTimeNano end time in nanosecond
+-     */
+-    public static TimingInfo newTimingInfoFullSupport(long startTimeNano, long endTimeNano) {
+-        return new TimingInfoFullSupport(null, startTimeNano, Long.valueOf(endTimeNano));
+-    }
+-
+-    /**
+-     * Returns a {@link TimingInfoFullSupport} based on the given
+-     * start time since epoch in millisecond,
+-     * and the given start and end time in nanosecond.
+-     *
+-     * @param startEpochTimeMilli start time since epoch in millisecond
+-     * @param startTimeNano start time in nanosecond
+-     * @param endTimeNano end time in nanosecond
+-     */
+-    public static TimingInfo newTimingInfoFullSupport(
+-        long startEpochTimeMilli, long startTimeNano, long endTimeNano) {
+-        return new TimingInfoFullSupport(Long.valueOf(startEpochTimeMilli), startTimeNano, Long.valueOf(endTimeNano));
+-    }
+-
+-    /**
+-     * Returns an instance of {@link TimingInfo} that is not modifiable, given
+-     * the start and end nano times.
+-     */
+-    public static TimingInfo unmodifiableTimingInfo(long startTimeNano, Long endTimeNano) {
+-        return new TimingInfoUnmodifiable(null, startTimeNano, endTimeNano);
+-    }
+-
+-    /**
+-     * Returns an instance of {@link TimingInfo} that is not modifiable.
+-     *
+-     * @param startEpochTimeMilli start time since epoch in millisecond
+-     * @param startTimeNano start time in nanosecond
+-     * @param endTimeNano end time in nanosecond; or null if not known
+-     */
+-    public static TimingInfo unmodifiableTimingInfo(long startEpochTimeMilli, long startTimeNano, Long endTimeNano) {
+-        return new TimingInfoUnmodifiable(startEpochTimeMilli, startTimeNano, endTimeNano);
+-    }
+-
+-    /**
+-     * A private ctor to facilitate the deprecation of using millisecond and
+-     * migration to using nanosecond for timing measurement.
+-     * 
+-     * @param startEpochTimeMilli start time since epoch in millisecond
+-     * @param startTimeNano start time in nanosecond
+-     * @param endTimeNano end time in nanosecond; or null if not known
+-     */
+-    protected TimingInfo(Long startEpochTimeMilli, long startTimeNano, Long endTimeNano) {
+-        this.startEpochTimeMilli = startEpochTimeMilli;
+-        this.startTimeNano = startTimeNano;
+-        this.endTimeNano = endTimeNano;
+-    }
+-
+-    @Deprecated
+-    public final long getStartTime() {
+-        return isStartEpochTimeMilliKnown()
+-             ? startEpochTimeMilli
+-               // best effort even though technically this is incorrect
+-             : TimeUnit.NANOSECONDS.toMillis(startTimeNano)
+-             ;
+-    }
+-
+-    @Deprecated
+-    public final long getStartEpochTimeMilli() {
+-        Long v = getStartEpochTimeMilliIfKnown();
+-        return v == null ? UNKNOWN : v.longValue();
+-    }
+-
+-    public final Long getStartEpochTimeMilliIfKnown() {
+-        return startEpochTimeMilli;
+-    }
+-
+-    public final long getStartTimeNano() {
+-        return startTimeNano;
+-    }
+-
+-    @Deprecated
+-    public final long getEndTime() {
+-        return getEndEpochTimeMilli();
+-    }
+-
+-    @Deprecated
+-    public final long getEndEpochTimeMilli() {
+-        Long v = getEndEpochTimeMilliIfKnown();
+-        return v == null ? UNKNOWN : v.longValue();
+-    }
+-
+-    public final Long getEndEpochTimeMilliIfKnown() {
+-        return isStartEpochTimeMilliKnown() && isEndTimeKnown()
+-               // make use of the wall clock time and elpased time
+-             ? startEpochTimeMilli.longValue()
+-                 + TimeUnit.NANOSECONDS.toMillis(endTimeNano.longValue() - startTimeNano)
+-             : null;
+-    }
+-
+-    public final long getEndTimeNano() {
+-        return endTimeNano == null ? UNKNOWN : endTimeNano;
+-    }
+-
+-    public final Long getEndTimeNanoIfKnown() {
+-        return endTimeNano;
+-    }
+-
+-    @Deprecated
+-    public final double getTimeTakenMillis() {
+-        Double v = getTimeTakenMillisIfKnown();
+-        return v == null ? UNKNOWN : v.doubleValue();
+-    }
+-
+-    public final Double getTimeTakenMillisIfKnown() {
+-        return isEndTimeKnown() 
+-             ? durationMilliOf(startTimeNano, endTimeNano)
+-             : null
+-             ;
+-    }
+-
+-    /**
+-     * Returns the duration in milliseconds as double, preserving the decimal
+-     * precision as necessary, for the given start and end time in nanoseconds.
+-     */
+-    public static double durationMilliOf(long startTimeNano, long endTimeNano) {
+-        double micros = (double)TimeUnit.NANOSECONDS.toMicros(endTimeNano - startTimeNano);
+-        return micros / 1000.0; // convert microseconds to milliseconds in double rather than long, preserving the precision
+-    }
+-
+-    @Deprecated
+-    public final long getElapsedTimeMillis() {
+-        Double v = getTimeTakenMillisIfKnown();
+-        return v == null ? UNKNOWN : v.longValue();
+-    }
+-
+-    public final boolean isEndTimeKnown() {
+-        return endTimeNano != null;
+-    }
+-
+-    public final boolean isStartEpochTimeMilliKnown() {
+-        return startEpochTimeMilli != null;
+-    }
+-
+-    public final String toString() {
+-        return String.valueOf(getTimeTakenMillis());
+-    }
+-
+-    @Deprecated
+-    public void setEndTime(long endTimeMilli) {
+-        this.endTimeNano = Long.valueOf(TimeUnit.MILLISECONDS.toNanos(endTimeMilli));
+-    }
+-
+-    public void setEndTimeNano(long endTimeNano) {
+-        this.endTimeNano = endTimeNano;
+-    }
+-
+-    public TimingInfo endTiming() {
+-        this.endTimeNano = Long.valueOf(System.nanoTime());
+-        return this;
+-    }
+-
+-    public void addSubMeasurement(String subMeasurementName, TimingInfo timingInfo) {}
+-    public TimingInfo getSubMeasurement(String subMeasurementName) { return null; }
+-    public TimingInfo getSubMeasurement(String subMesurementName, int index) { return null; }
+-    public TimingInfo getLastSubMeasurement(String subMeasurementName) { return null; }
+-    public List getAllSubMeasurements(String subMeasurementName) { return null; }
+-    public Map> getSubMeasurementsByName() { return Collections.emptyMap(); }
+-    public Number getCounter(String key) { return null; }
+-    public Map getAllCounters() { return Collections.emptyMap(); }
+-    public void setCounter(String key, long count) {}
+-    public void incrementCounter(String key) {}
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/TimingInfoUnmodifiable.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/TimingInfoUnmodifiable.java
+--- ./src/main/java/com/amazonaws/util/TimingInfoUnmodifiable.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/TimingInfoUnmodifiable.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,57 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import com.amazonaws.annotation.ThreadSafe;
+-
+-/**
+- * A {@link TimingInfo} that is unmodifiable.
+- */
+-@ThreadSafe
+-final class TimingInfoUnmodifiable extends TimingInfo {
+-    /**
+-     * @see TimingInfo#unmodifiableTimingInfo(long, Long)
+-     * @see TimingInfo#unmodifiableTimingInfo(long, long, Long)
+-     * 
+-     * @param startEpochTimeMilli
+-     *            start time since epoch in millisecond; or null if not known
+-     * @param startTimeNano
+-     *            start time in nanosecond
+-     * @param endTimeNano
+-     *            end time in nanosecond; or null if not known
+-     */
+-    TimingInfoUnmodifiable(Long startEpochTimeMilli, long startTimeNano, Long endTimeNano) {
+-        super(startEpochTimeMilli, startTimeNano, endTimeNano);
+-    }
+-
+-    /**
+-     * Always throws {@link UnsupportedOperationException}.
+-     */
+-    @Override public void setEndTime(long _) {
+-        throw new UnsupportedOperationException();
+-    }
+-    /**
+-     * Always throws {@link UnsupportedOperationException}.
+-     */
+-    @Override public void setEndTimeNano(long _) {
+-        throw new UnsupportedOperationException();
+-    }
+-    /**
+-     * Always throws {@link UnsupportedOperationException}.
+-     */
+-    @Override public TimingInfo endTiming() {
+-        throw new UnsupportedOperationException();
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/UnreliableFilterInputStream.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/UnreliableFilterInputStream.java
+--- ./src/main/java/com/amazonaws/util/UnreliableFilterInputStream.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/UnreliableFilterInputStream.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,167 +0,0 @@
+-/*
+- * Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import java.io.FilterInputStream;
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import com.amazonaws.util.json.Jackson;
+-
+-/**
+- * An internal class used solely for the purpose of testing via failure
+- * injection.
+- */
+-public class UnreliableFilterInputStream extends FilterInputStream {
+-    /**
+-     * Max number of errors that can be triggered.
+-     */
+-    private int maxNumErrors = 1;
+-    /**
+-     * Current number of errors that have been triggered.
+-     */
+-    private int currNumErrors;
+-    
+-    private int bytesReadBeforeException = 100;
+-    private int marked;
+-    private int position;
+-    // True to throw a FakeIOException; false to throw a RuntimeException
+-    private final boolean isFakeIOException;
+-    private int resetCount; // number of times the reset method has been called
+-    /**
+-     * used to control whether an exception would be thrown based on the reset
+-     * recurrence; not applicable if set to zero. For example, if
+-     * resetIntervalBeforeException == n, the exception can only be thrown
+-     * before the n_th reset (or after the n_th minus 1 reset), 2n_th reset (or
+-     * after the 2n_th minus 1) reset), etc.
+-     */
+-    private int resetIntervalBeforeException; 
+-
+-    public UnreliableFilterInputStream(InputStream in, boolean isFakeIOException) {
+-        super(in);
+-        this.isFakeIOException = isFakeIOException;
+-    }
+-
+-    @Override
+-    public int read() throws IOException {
+-        int read = super.read();
+-        if (read != -1) position++;
+-        triggerError();
+-        return read;
+-    }
+-
+-    @Override
+-    public int read(byte[] b, int off, int len) throws IOException {
+-        triggerError();
+-        int read = super.read(b, off, len);
+-        position += read;
+-        triggerError();
+-        return read;
+-    }
+-
+-    @Override
+-    public void mark(int readlimit) {
+-        super.mark(readlimit);
+-        marked = position;
+-    }
+-
+-    @Override
+-    public void reset() throws IOException {
+-        resetCount++;
+-        super.reset();
+-        position = marked;
+-    }
+-
+-    private void triggerError() throws FakeIOException {
+-        if (currNumErrors >= maxNumErrors)
+-            return;
+-
+-        if (position >= bytesReadBeforeException) {
+-            if (resetIntervalBeforeException > 0
+-            &&  resetCount % resetIntervalBeforeException != (resetIntervalBeforeException-1))
+-                return;
+-            currNumErrors++;
+-            if (isFakeIOException)
+-                throw new FakeIOException("Fake IO error " + currNumErrors
+-                    + " on UnreliableFileInputStream: " + this);
+-            else
+-                throw new RuntimeException("Injected runtime error " + currNumErrors
+-                        + " on UnreliableFileInputStream: " + this);
+-        }
+-    }
+-
+-    public int getCurrNumErrors() {
+-        return currNumErrors;
+-    }
+-
+-    public int getMaxNumErrors() {
+-        return maxNumErrors;
+-    }
+-
+-    public UnreliableFilterInputStream withMaxNumErrors(int maxNumErrors) {
+-        this.maxNumErrors = maxNumErrors;
+-        return this; 
+-    }
+-
+-    public UnreliableFilterInputStream withBytesReadBeforeException(
+-            int bytesReadBeforeException) {
+-        this.bytesReadBeforeException = bytesReadBeforeException;
+-        return this;
+-    }
+-
+-    public int getBytesReadBeforeException() {
+-        return bytesReadBeforeException;
+-    }
+-
+-    /**
+-     * @param resetIntervalBeforeException
+-     *            used to control whether an exception would be thrown based on
+-     *            the reset recurrence; not applicable if set to zero. For
+-     *            example, if resetIntervalBeforeException == n, the exception
+-     *            can only be thrown before the n_th reset (or after the n_th
+-     *            minus 1 reset), 2n_th reset (or after the 2n_th minus 1)
+-     *            reset), etc.
+-     */
+-    public UnreliableFilterInputStream withResetIntervalBeforeException(
+-            int resetIntervalBeforeException) {
+-        this.resetIntervalBeforeException = resetIntervalBeforeException;
+-        return this;
+-    }
+-
+-    public int getResetIntervalBeforeException() {
+-        return resetIntervalBeforeException;
+-    }
+- 
+-    public int getMarked() {
+-        return marked;
+-    }
+-
+-    public int getPosition() {
+-        return position;
+-    }
+-
+-    public boolean isFakeIOException() {
+-        return isFakeIOException;
+-    }
+-
+-    public int getResetCount() {
+-        return resetCount;
+-    }
+-    
+-    @Override
+-    public String toString() {
+-        return Jackson.toJsonString(this);
+-    }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/util/UriResourcePathUtils.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/UriResourcePathUtils.java
+--- ./src/main/java/com/amazonaws/util/UriResourcePathUtils.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/UriResourcePathUtils.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,52 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import com.amazonaws.Request;
+-
+-public final class UriResourcePathUtils {
+-
+-    /**
+-     * Identifies the static query parameters in Uri resource path for and adds it to
+-     * request.
+-     *
+-     * Returns the updated uriResourcePath.
+-     */
+-    public static String addStaticQueryParamtersToRequest(final Request request,
+-                                                        final String uriResourcePath) {
+-
+-        if (request == null || uriResourcePath == null) {
+-            return null;
+-        }
+-
+-        String resourcePath = uriResourcePath;
+-
+-        int index = resourcePath.indexOf("?");
+-        if (index != -1) {
+-            String queryString = resourcePath.substring(index + 1);
+-            resourcePath = resourcePath.substring(0, index);
+-
+-            for (String s : queryString.split("[;&]")) {
+-                index = s.indexOf("=");
+-                if (index != -1) {
+-                    request.addParameter(s.substring(0, index), s.substring(index + 1));
+-                } else {
+-                    request.addParameter(s, (String)null);
+-                }
+-            }
+-        }
+-        return resourcePath;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/URLEncodedUtils.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/URLEncodedUtils.java
+--- ./src/main/java/com/amazonaws/util/URLEncodedUtils.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/URLEncodedUtils.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,347 +0,0 @@
+-/*
+- * ====================================================================
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *   http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing,
+- * software distributed under the License is distributed on an
+- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+- * KIND, either express or implied.  See the License for the
+- * specific language governing permissions and limitations
+- * under the License.
+- * ====================================================================
+- *
+- * This software consists of voluntary contributions made by many
+- * individuals on behalf of the Apache Software Foundation.  For more
+- * information on the Apache Software Foundation, please see
+- * .
+- *
+- */
+-
+-package com.amazonaws.util;
+-
+-import java.nio.ByteBuffer;
+-import java.nio.charset.Charset;
+-import java.util.BitSet;
+-import java.util.List;
+-
+-import com.amazonaws.annotation.Immutable;
+-
+-// Copied and extracted from httpcomponents-client-4.3.6.
+-/**
+- * A collection of utilities for encoding URLs.
+- *
+- * @since 4.0
+- */
+-@Immutable
+-class URLEncodedUtils {
+-    private static final char QP_SEP_A = '&';
+-    private static final String NAME_VALUE_SEPARATOR = "=";
+-
+-    /**
+-     * Returns a String that is suitable for use as an {@code application/x-www-form-urlencoded}
+-     * list of parameters in an HTTP PUT or HTTP POST.
+-     *
+-     * @param parameters  The parameters to include.
+-     * @param charset The encoding to use.
+-     * @return An {@code application/x-www-form-urlencoded} string
+-     */
+-    public static String format(
+-            final List  parameters,
+-            final String charset) {
+-        return format(parameters, QP_SEP_A, charset);
+-    }
+-
+-    /**
+-     * Returns a String that is suitable for use as an {@code application/x-www-form-urlencoded}
+-     * list of parameters in an HTTP PUT or HTTP POST.
+-     *
+-     * @param parameters  The parameters to include.
+-     * @param parameterSeparator The parameter separator, by convention, {@code '&'} or {@code ';'}.
+-     * @param charset The encoding to use.
+-     * @return An {@code application/x-www-form-urlencoded} string
+-     *
+-     * @since 4.3
+-     */
+-    public static String format(
+-            final List  parameters,
+-            final char parameterSeparator,
+-            final String charset) {
+-        final StringBuilder result = new StringBuilder();
+-        for (final NameValuePair parameter : parameters) {
+-            final String encodedName = encodeFormFields(parameter.getName(), charset);
+-            final String encodedValue = encodeFormFields(parameter.getValue(), charset);
+-            if (result.length() > 0) {
+-                result.append(parameterSeparator);
+-            }
+-            result.append(encodedName);
+-            if (encodedValue != null) {
+-                result.append(NAME_VALUE_SEPARATOR);
+-                result.append(encodedValue);
+-            }
+-        }
+-        return result.toString();
+-    }
+-
+-    /**
+-     * Returns a String that is suitable for use as an {@code application/x-www-form-urlencoded}
+-     * list of parameters in an HTTP PUT or HTTP POST.
+-     *
+-     * @param parameters  The parameters to include.
+-     * @param charset The encoding to use.
+-     * @return An {@code application/x-www-form-urlencoded} string
+-     *
+-     * @since 4.2
+-     */
+-    public static String format(
+-            final Iterable parameters,
+-            final Charset charset) {
+-        return format(parameters, QP_SEP_A, charset);
+-    }
+-
+-    /**
+-     * Returns a String that is suitable for use as an {@code application/x-www-form-urlencoded}
+-     * list of parameters in an HTTP PUT or HTTP POST.
+-     *
+-     * @param parameters  The parameters to include.
+-     * @param parameterSeparator The parameter separator, by convention, {@code '&'} or {@code ';'}.
+-     * @param charset The encoding to use.
+-     * @return An {@code application/x-www-form-urlencoded} string
+-     *
+-     * @since 4.3
+-     */
+-    public static String format(
+-            final Iterable parameters,
+-            final char parameterSeparator,
+-            final Charset charset) {
+-        final StringBuilder result = new StringBuilder();
+-        for (final NameValuePair parameter : parameters) {
+-            final String encodedName = encodeFormFields(parameter.getName(), charset);
+-            final String encodedValue = encodeFormFields(parameter.getValue(), charset);
+-            if (result.length() > 0) {
+-                result.append(parameterSeparator);
+-            }
+-            result.append(encodedName);
+-            if (encodedValue != null) {
+-                result.append(NAME_VALUE_SEPARATOR);
+-                result.append(encodedValue);
+-            }
+-        }
+-        return result.toString();
+-    }
+-
+-    /**
+-     * Unreserved characters, i.e. alphanumeric, plus: {@code _ - ! . ~ ' ( ) *}
+-     * 

+-     *  This list is the same as the {@code unreserved} list in
+-     *  RFC 2396
+-     */
+-    private static final BitSet UNRESERVED   = new BitSet(256);
+-    /**
+-     * Punctuation characters: , ; : $ & + =
+-     * 

+-     * These are the additional characters allowed by userinfo.
+-     */
+-    private static final BitSet PUNCT        = new BitSet(256);
+-    /** Characters which are safe to use in userinfo,
+-     * i.e. {@link #UNRESERVED} plus {@link #PUNCT}uation */
+-    private static final BitSet USERINFO     = new BitSet(256);
+-    /** Characters which are safe to use in a path,
+-     * i.e. {@link #UNRESERVED} plus {@link #PUNCT}uation plus / @ */
+-    private static final BitSet PATHSAFE     = new BitSet(256);
+-    /** Characters which are safe to use in a query or a fragment,
+-     * i.e. {@link #RESERVED} plus {@link #UNRESERVED} */
+-    private static final BitSet URIC     = new BitSet(256);
+-
+-    /**
+-     * Reserved characters, i.e. {@code ;/?:@&=+$,[]}
+-     * 

+-     *  This list is the same as the {@code reserved} list in
+-     *  RFC 2396
+-     *  as augmented by
+-     *  RFC 2732
+-     */
+-    private static final BitSet RESERVED     = new BitSet(256);
+-
+-
+-    /**
+-     * Safe characters for x-www-form-urlencoded data, as per java.net.URLEncoder and browser behaviour,
+-     * i.e. alphanumeric plus {@code "-", "_", ".", "*"}
+-     */
+-    private static final BitSet URLENCODER   = new BitSet(256);
+-
+-    static {
+-        // unreserved chars
+-        // alpha characters
+-        for (int i = 'a'; i <= 'z'; i++) {
+-            UNRESERVED.set(i);
+-        }
+-        for (int i = 'A'; i <= 'Z'; i++) {
+-            UNRESERVED.set(i);
+-        }
+-        // numeric characters
+-        for (int i = '0'; i <= '9'; i++) {
+-            UNRESERVED.set(i);
+-        }
+-        UNRESERVED.set('_'); // these are the charactes of the "mark" list
+-        UNRESERVED.set('-');
+-        UNRESERVED.set('.');
+-        UNRESERVED.set('*');
+-        URLENCODER.or(UNRESERVED); // skip remaining unreserved characters
+-        UNRESERVED.set('!');
+-        UNRESERVED.set('~');
+-        UNRESERVED.set('\'');
+-        UNRESERVED.set('(');
+-        UNRESERVED.set(')');
+-        // punct chars
+-        PUNCT.set(',');
+-        PUNCT.set(';');
+-        PUNCT.set(':');
+-        PUNCT.set('$');
+-        PUNCT.set('&');
+-        PUNCT.set('+');
+-        PUNCT.set('=');
+-        // Safe for userinfo
+-        USERINFO.or(UNRESERVED);
+-        USERINFO.or(PUNCT);
+-
+-        // URL path safe
+-        PATHSAFE.or(UNRESERVED);
+-        PATHSAFE.set('/'); // segment separator
+-        PATHSAFE.set(';'); // param separator
+-        PATHSAFE.set(':'); // rest as per list in 2396, i.e. : @ & = + $ ,
+-        PATHSAFE.set('@');
+-        PATHSAFE.set('&');
+-        PATHSAFE.set('=');
+-        PATHSAFE.set('+');
+-        PATHSAFE.set('$');
+-        PATHSAFE.set(',');
+-
+-        RESERVED.set(';');
+-        RESERVED.set('/');
+-        RESERVED.set('?');
+-        RESERVED.set(':');
+-        RESERVED.set('@');
+-        RESERVED.set('&');
+-        RESERVED.set('=');
+-        RESERVED.set('+');
+-        RESERVED.set('$');
+-        RESERVED.set(',');
+-        RESERVED.set('['); // added by RFC 2732
+-        RESERVED.set(']'); // added by RFC 2732
+-
+-        URIC.or(RESERVED);
+-        URIC.or(UNRESERVED);
+-    }
+-
+-    private static final int RADIX = 16;
+-
+-    private static String urlEncode(
+-            final String content,
+-            final Charset charset,
+-            final BitSet safechars,
+-            final boolean blankAsPlus) {
+-        if (content == null) {
+-            return null;
+-        }
+-        final StringBuilder buf = new StringBuilder();
+-        final ByteBuffer bb = charset.encode(content);
+-        while (bb.hasRemaining()) {
+-            final int b = bb.get() & 0xff;
+-            if (safechars.get(b)) {
+-                buf.append((char) b);
+-            } else if (blankAsPlus && b == ' ') {
+-                buf.append('+');
+-            } else {
+-                buf.append("%");
+-                final char hex1 = Character.toUpperCase(Character.forDigit((b >> 4) & 0xF, RADIX));
+-                final char hex2 = Character.toUpperCase(Character.forDigit(b & 0xF, RADIX));
+-                buf.append(hex1);
+-                buf.append(hex2);
+-            }
+-        }
+-        return buf.toString();
+-    }
+-
+-    /**
+-     * Encode/escape www-url-form-encoded content.
+-     * 

+-     * Uses the {@link #URLENCODER} set of characters, rather than
+-     * the {@link #UNRSERVED} set; this is for compatibilty with previous
+-     * releases, URLEncoder.encode() and most browsers.
+-     *
+-     * @param content the content to encode, will convert space to '+'
+-     * @param charset the charset to use
+-     * @return encoded string
+-     */
+-    private static String encodeFormFields(final String content, final String charset) {
+-        if (content == null) {
+-            return null;
+-        }
+-        return urlEncode(content, charset != null ? Charset.forName(charset) : StringUtils.UTF8, URLENCODER, true);
+-    }
+-
+-    /**
+-     * Encode/escape www-url-form-encoded content.
+-     * 

+-     * Uses the {@link #URLENCODER} set of characters, rather than
+-     * the {@link #UNRSERVED} set; this is for compatibilty with previous
+-     * releases, URLEncoder.encode() and most browsers.
+-     *
+-     * @param content the content to encode, will convert space to '+'
+-     * @param charset the charset to use
+-     * @return encoded string
+-     */
+-    private static String encodeFormFields (final String content, final Charset charset) {
+-        if (content == null) {
+-            return null;
+-        }
+-        return urlEncode(content, charset != null ? charset : StringUtils.UTF8, URLENCODER, true);
+-    }
+-
+-    /**
+-     * Encode a String using the {@link #USERINFO} set of characters.
+-     * 

+-     * Used by URIBuilder to encode the userinfo segment.
+-     *
+-     * @param content the string to encode, does not convert space to '+'
+-     * @param charset the charset to use
+-     * @return the encoded string
+-     */
+-    static String encUserInfo(final String content, final Charset charset) {
+-        return urlEncode(content, charset, USERINFO, false);
+-    }
+-
+-    /**
+-     * Encode a String using the {@link #URIC} set of characters.
+-     * 

+-     * Used by URIBuilder to encode the query and fragment segments.
+-     *
+-     * @param content the string to encode, does not convert space to '+'
+-     * @param charset the charset to use
+-     * @return the encoded string
+-     */
+-    static String encUric(final String content, final Charset charset) {
+-        return urlEncode(content, charset, URIC, false);
+-    }
+-
+-    /**
+-     * Encode a String using the {@link #PATHSAFE} set of characters.
+-     * 

+-     * Used by URIBuilder to encode path segments.
+-     *
+-     * @param content the string to encode, does not convert space to '+'
+-     * @param charset the charset to use
+-     * @return the encoded string
+-     */
+-    static String encPath(final String content, final Charset charset) {
+-        return urlEncode(content, charset, PATHSAFE, false);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/ValidationUtils.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/ValidationUtils.java
+--- ./src/main/java/com/amazonaws/util/ValidationUtils.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/ValidationUtils.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,93 +0,0 @@
+-/*
+- * Copyright 2015-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import java.util.Collection;
+-
+-/**
+- * Useful utilities to validate dependencies
+- */
+-public class ValidationUtils {
+-
+-    /**
+-     * Asserts that the given object is non-null and returns it.
+-     *
+-     * @param object
+-     *         Object to assert on
+-     * @param fieldName
+-     *         Field name to display in exception message if null
+-     * @return Object if non null
+-     * @throws IllegalArgumentException
+-     *         If object was null
+-     */
+-    public static  T assertNotNull(T object, String fieldName) throws IllegalArgumentException {
+-        if (object == null) {
+-            throw new IllegalArgumentException(String.format("%s cannot be null", fieldName));
+-        }
+-        return object;
+-    }
+-
+-    /**
+-     * Asserts that all of the objects are null.
+-     *
+-     * @throws IllegalArgumentException
+-     *         if any object provided was NOT null.
+-     */
+-    public static void assertAllAreNull(String messageIfNull, Object... objects) throws IllegalArgumentException {
+-        for (Object object : objects) {
+-            if (object != null) {
+-                throw new IllegalArgumentException(messageIfNull);
+-            }
+-        }
+-    }
+-
+-    /**
+-     * Asserts that the given number is positive (non-negative and non-zero).
+-     *
+-     * @param num       Number to validate
+-     * @param fieldName Field name to display in exception message if not positive.
+-     * @return Number if positive.
+-     */
+-    public static int assertIsPositive(int num, String fieldName) {
+-        if (num <= 0) {
+-            throw new IllegalArgumentException(String.format("%s must be positive", fieldName));
+-        }
+-        return num;
+-    }
+-
+-    public static > T assertNotEmpty(T collection, String fieldName) throws IllegalArgumentException{
+-        assertNotNull(collection, fieldName);
+-        if (collection.isEmpty()) {
+-            throw new IllegalArgumentException(String.format("%s cannot be empty", fieldName));
+-        }
+-        return collection;
+-    }
+-
+-    public static  T[] assertNotEmpty(T[] array, String fieldName) throws IllegalArgumentException {
+-        assertNotNull(array, fieldName);
+-        if (array.length == 0) {
+-            throw new IllegalArgumentException(String.format("%s cannot be empty", fieldName));
+-        }
+-        return array;
+-    }
+-
+-    public static String assertStringNotEmpty(String string, String fieldName) throws IllegalArgumentException {
+-        assertNotNull(string, fieldName);
+-        if (string.isEmpty()) {
+-            throw new IllegalArgumentException(String.format("%s cannot be empty", fieldName));
+-        }
+-        return string;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/VersionInfoUtils.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/VersionInfoUtils.java
+--- ./src/main/java/com/amazonaws/util/VersionInfoUtils.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/VersionInfoUtils.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,298 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import java.io.InputStream;
+-import java.util.Properties;
+-import java.util.jar.JarInputStream;
+-
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-
+-import com.amazonaws.annotation.ThreadSafe;
+-import com.amazonaws.internal.config.InternalConfig;
+-
+-import static com.amazonaws.util.IOUtils.closeQuietly;
+-
+-/**
+- * Utility class for accessing AWS SDK versioning information.
+- */
+-@ThreadSafe
+-public class VersionInfoUtils {
+-    /** The AWS SDK version info file with SDK versioning info */
+-    static final String VERSION_INFO_FILE = "/com/amazonaws/sdk/versionInfo.properties";
+-
+-    /** SDK version info */
+-    private static volatile String version;
+-
+-    /** SDK platform info */
+-    private static volatile String platform;
+-
+-    /** User Agent info */
+-    private static volatile String userAgent;
+-
+-    /** Shared logger for any issues while loading version information */
+-    private static final Log log = LogFactory.getLog(VersionInfoUtils.class);
+-
+-    private static final String UNKNOWN = "unknown";
+-
+-    /**
+-     * Returns the current version for the AWS SDK in which this class is
+-     * running. Version information is obtained from from the
+-     * versionInfo.properties file which the AWS Java SDK build process
+-     * generates.
+-     *
+-     * @return The current version for the AWS SDK, if known, otherwise
+-     *         returns a string indicating that the version information is
+-     *         not available.
+-     */
+-    public static String getVersion() {
+-        if (version == null) {
+-            synchronized(VersionInfoUtils.class) {
+-                if (version == null)
+-                    initializeVersion();
+-            }
+-        }
+-        return version;
+-    }
+-
+-    /**
+-     * Returns the current platform for the AWS SDK in which this class is
+-     * running. Version information is obtained from from the
+-     * versionInfo.properties file which the AWS Java SDK build process
+-     * generates.
+-     *
+-     * @return The current platform for the AWS SDK, if known, otherwise
+-     *         returns a string indicating that the platform information is
+-     *         not available.
+-     */
+-    public static String getPlatform() {
+-        if (platform == null) {
+-            synchronized(VersionInfoUtils.class) {
+-                if (platform == null)
+-                    initializeVersion();
+-            }
+-        }
+-        return platform;
+-    }
+-
+-     /**
+-     * @return Returns the User Agent string to be used when communicating with
+-	 * the AWS services.  The User Agent encapsulates SDK, Java, OS and
+-	 * region information.
+-     */
+-    public static String getUserAgent() {
+-        if (userAgent == null) {
+-            synchronized(VersionInfoUtils.class) {
+-                if (userAgent == null)
+-                    initializeUserAgent();
+-            }
+-        }
+-        return userAgent;
+-    }
+-
+-   /**
+-     * Loads the versionInfo.properties file from the AWS Java SDK and
+-     * stores the information so that the file doesn't have to be read the
+-     * next time the data is needed.
+-     */
+-    private static void initializeVersion() {
+-        InputStream inputStream = ClassLoaderHelper.getResourceAsStream(
+-                VERSION_INFO_FILE, true, VersionInfoUtils.class);
+-        Properties versionInfoProperties = new Properties();
+-        try {
+-            if (inputStream == null)
+-                throw new Exception(VERSION_INFO_FILE + " not found on classpath");
+-
+-            versionInfoProperties.load(inputStream);
+-            version = versionInfoProperties.getProperty("version");
+-            platform = versionInfoProperties.getProperty("platform");
+-        } catch (Exception e) {
+-            log.info("Unable to load version information for the running SDK: " + e.getMessage());
+-            version = "unknown-version";
+-            platform = "java";
+-        } finally {
+-            closeQuietly(inputStream, log);
+-        }
+-    }
+-
+-    /**
+-     * Initializes the user agent string by loading a template from
+-     * {@code InternalConfig} and filling in the detected version/platform
+-     * info.
+-     */
+-    private static void initializeUserAgent() {
+-        userAgent = userAgent();
+-    }
+-
+-    static String userAgent() {
+-
+-        String ua = InternalConfig.Factory.getInternalConfig()
+-                .getUserAgentTemplate();
+-
+-        if (ua == null) {
+-            return "aws-sdk-java";
+-        }
+-
+-        ua = ua
+-            .replace("{platform}",  StringUtils.lowerCase(getPlatform()))
+-            .replace("{version}", getVersion())
+-            .replace("{os.name}", replaceSpaces(System.getProperty("os.name")))
+-            .replace("{os.version}", replaceSpaces(System.getProperty("os.version")))
+-            .replace("{java.vm.name}", replaceSpaces(System.getProperty("java.vm.name")))
+-            .replace("{java.vm.version}", replaceSpaces(System.getProperty("java.vm.version")))
+-            .replace("{java.version}", replaceSpaces(System.getProperty("java.version")));
+-
+-        if (ua.contains("{additional.languages}")) {
+-            ua = ua.replace("{additional.languages}", getAdditionalJvmLanguages());
+-        }
+-
+-
+-        String language = System.getProperty("user.language");
+-        String region = System.getProperty("user.region");
+-
+-        String languageAndRegion = "";
+-        if (language != null && region != null) {
+-            languageAndRegion =
+-                    " " + replaceSpaces(language) + "_" + replaceSpaces(region);
+-        }
+-        ua = ua.replace("{language.and.region}", languageAndRegion);
+-
+-        return ua;
+-    }
+-
+-    /**
+-     * Replace any spaces in the input with underscores.
+-     *
+-     * @param input the input
+-     * @return the input with spaces replaced by underscores
+-     */
+-    private static String replaceSpaces(final String input) {
+-        return input == null ? UNKNOWN : input.replace(' ', '_');
+-    }
+-
+-    private static String getAdditionalJvmLanguages() {
+-        StringBuilder versions = new StringBuilder();
+-        concat(versions, scalaVersion(), " ");
+-        concat(versions, clojureVersion(), " ");
+-        concat(versions, groovyVersion(), " ");
+-        concat(versions, jythonVersion(), " ");
+-        concat(versions, jrubyVersion(), " ");
+-        concat(versions, kotlinVersion(), " ");
+-        return versions.toString();
+-    }
+-
+-    private static String scalaVersion() {
+-        return languageVersion("scala", "scala.util.Properties", "versionNumberString", true);
+-    }
+-
+-    private static String clojureVersion() {
+-        return languageVersion("clojure", "clojure.core$clojure_version", "invokeStatic", true);
+-    }
+-
+-    private static String groovyVersion() {
+-        return languageVersion("groovy", "groovy.lang.GroovySystem", "getVersion", true);
+-    }
+-
+-    private static String jythonVersion() {
+-        return languageVersion("jython", "org.python.Version", "PY_VERSION", false);
+-    }
+-
+-    private static String jrubyVersion() {
+-        return languageVersion("jruby", "org.jruby.runtime.Constants", "VERSION", false);
+-    }
+-
+-    /**
+-     * Attempt to determine if Kotlin is on the classpath and if so what version is in use.
+-     * Can do this by either using the KotlinVersion class that was introduced in 1.1 or
+-     * via looking at the JAR's manifest versions for earlier versions.
+-     *
+-     * @return Kotlin version if any, else empty string
+-     */
+-    private static String kotlinVersion() {
+-        String version = kotlinVersionByClass();
+-        return version.equals("") ? kotlinVersionByJar() : version;
+-    }
+-
+-    private static String kotlinVersionByClass() {
+-        StringBuilder kotlinVersion = new StringBuilder("");
+-        try {
+-            Class versionClass = Class.forName("kotlin.KotlinVersion");
+-            kotlinVersion.append("kotlin");
+-            String version = versionClass.getField("CURRENT").get(null).toString();
+-            concat(kotlinVersion, version, "/");
+-        } catch (ClassNotFoundException e) {
+-            //ignore
+-        } catch (Exception e) {
+-            if (log.isTraceEnabled()){
+-                log.trace("Exception attempting to get Kotlin version.", e);
+-            }
+-
+-        }
+-        return kotlinVersion.toString();
+-    }
+-
+-    private static String kotlinVersionByJar() {
+-        StringBuilder kotlinVersion = new StringBuilder("");
+-        JarInputStream kotlinJar = null;
+-        try {
+-            Class kotlinUnit = Class.forName("kotlin.Unit");
+-            kotlinVersion.append("kotlin");
+-            kotlinJar = new JarInputStream(kotlinUnit.getProtectionDomain().getCodeSource().getLocation().openStream());
+-            String version = kotlinJar.getManifest().getMainAttributes().getValue("Implementation-Version");
+-            concat(kotlinVersion, version, "/");
+-        } catch (ClassNotFoundException e) {
+-            //Ignore
+-        } catch (Exception e) {
+-            if (log.isTraceEnabled()) {
+-                log.trace("Exception attempting to get Kotlin version.", e);
+-            }
+-        } finally {
+-            closeQuietly(kotlinJar, log);
+-        }
+-        return kotlinVersion.toString();
+-    }
+-
+-    /**
+-     * Attempt to determine if this language exists on the classpath and what it's version is
+-     * @param language the name of the language
+-     * @param className a class of that lanauge that exposes runtime version information
+-     * @param methodOrFieldName the static field or method name that holds the version number
+-     * @param isMethod whether the above is a field or method
+-     * @return the version number or empty string if the language does not exist on the classpath
+-     */
+-    private static String languageVersion(String language, String className, String methodOrFieldName, boolean isMethod) {
+-        StringBuilder sb = new StringBuilder();
+-        try {
+-            Class clz = Class.forName(className);
+-            sb.append(language);
+-            String version = isMethod ? (String) clz.getMethod(methodOrFieldName).invoke(null) : (String) clz.getField(methodOrFieldName).get(null);
+-            concat(sb, version, "/");
+-        } catch (ClassNotFoundException e) {
+-            //Ignore
+-        } catch (Exception e) {
+-            if (log.isTraceEnabled()){
+-                log.trace("Exception attempting to get " + language + " version.", e);
+-            }
+-        }
+-        return sb.toString();
+-    }
+-
+-    private static void concat(StringBuilder prefix, String suffix, String separator) {
+-        if (suffix != null && !suffix.isEmpty()) {
+-            prefix.append(separator).append(suffix);
+-        }
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/XmlUtils.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/XmlUtils.java
+--- ./src/main/java/com/amazonaws/util/XmlUtils.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/XmlUtils.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,68 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- * 
+- *  http://aws.amazon.com/apache2.0
+- * 
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import javax.xml.stream.XMLInputFactory;
+-import org.xml.sax.ContentHandler;
+-import org.xml.sax.InputSource;
+-import org.xml.sax.SAXException;
+-import org.xml.sax.XMLReader;
+-import org.xml.sax.helpers.XMLReaderFactory;
+-
+-public class XmlUtils {
+-
+-    /**
+-     * Shared factory for creating XML event readers
+-     */
+-    private static final ThreadLocal xmlInputFactory = new ThreadLocal() {
+-        @Override
+-        protected XMLInputFactory initialValue() {
+-            return createXmlInputFactory();
+-        }
+-    };
+-
+-    public static XMLReader parse(InputStream in, ContentHandler handler)
+-        throws SAXException, IOException {
+-
+-        XMLReader reader = XMLReaderFactory.createXMLReader();
+-        reader.setContentHandler(handler);
+-        reader.parse(new InputSource(in));
+-        in.close();
+-        return reader;
+-    }
+-
+-    /**
+-     * @return A {@link ThreadLocal} copy of {@link XMLInputFactory}.
+-     */
+-    public static XMLInputFactory getXmlInputFactory() {
+-        return xmlInputFactory.get();
+-    }
+-
+-    /**
+-     * Disables certain dangerous features that attempt to automatically fetch DTDs
+-     *
+-     * See OWASP XXE Cheat Sheet
+-     */
+-    private static XMLInputFactory createXmlInputFactory() {
+-        XMLInputFactory factory = XMLInputFactory.newInstance();
+-        factory.setProperty(XMLInputFactory.SUPPORT_DTD, false);
+-        factory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false);
+-        return factory;
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/XMLWriter.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/XMLWriter.java
+--- ./src/main/java/com/amazonaws/util/XMLWriter.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/XMLWriter.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,195 +0,0 @@
+-/*
+- * Copyright 2011-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-
+-import java.io.IOException;
+-import java.io.Writer;
+-import java.nio.ByteBuffer;
+-import java.util.Date;
+-import java.util.Stack;
+-
+-import com.amazonaws.SdkClientException;
+-
+-/**
+- * Utility for creating easily creating XML documents, one element at a time.
+- */
+-public class XMLWriter {
+-
+-    /** Standard XML prolog to add to the beginning of each XML document. */
+-    private static final String PROLOG = "";
+-
+-    /** The writer to which the XML document created by this writer will be written. */
+-    private final Writer writer;
+-
+-    /** Optional XML namespace attribute value to include in the root element. */
+-    private final String xmlns;
+-
+-    private Stack elementStack = new Stack();
+-    private boolean rootElement = true;
+-
+-
+-    /**
+-     * Creates a new XMLWriter, ready to write an XML document to the specified
+-     * writer.  The XML document will not specify an xmlns attribute.
+-     *
+-     * @param w
+-     *            The writer this XMLWriter will write to.
+-     */
+-    public XMLWriter(Writer w) {
+-        this(w, null);
+-    }
+-
+-    /**
+-     * Creates a new XMLWriter, ready to write an XML document to the specified
+-     * writer. The root element in the XML document will specify an xmlns
+-     * attribute with the specified namespace parameter.
+-     *
+-     * @param w
+-     *            The writer this XMLWriter will write to.
+-     * @param xmlns
+-     *            The XML namespace to include in the xmlns attribute of the
+-     *            root element.
+-     */
+-    public XMLWriter(Writer w, String xmlns) {
+-        this.writer = w;
+-        this.xmlns = xmlns;
+-        append(PROLOG);
+-    }
+-
+-    /**
+-     * Starts a new element with the specified name at the current position in
+-     * the in-progress XML document.
+-     *
+-     * @param element
+-     *            The name of the new element.
+-     *
+-     * @return This XMLWriter so that additional method calls can be chained
+-     *         together.
+-     */
+-    public XMLWriter startElement(String element) {
+-        append("<" + element);
+-        if (rootElement && xmlns != null) {
+-            append(" xmlns=\"" + xmlns + "\"");
+-            rootElement = false;
+-        }
+-        append(">");
+-        elementStack.push(element);
+-        return this;
+-    }
+-
+-    /**
+-     * Closes the last opened element at the current position in the in-progress
+-     * XML document.
+-     *
+-     * @return This XMLWriter so that additional method calls can be chained
+-     *         together.
+-     */
+-    public XMLWriter endElement() {
+-        String lastElement = elementStack.pop();
+-        append("");
+-        return this;
+-    }
+-
+-    /**
+-     * Adds the specified value as text to the current position of the in
+-     * progress XML document.
+-     *
+-     * @param s
+-     *            The text to add to the XML document.
+-     *
+-     * @return This XMLWriter so that additional method calls can be chained
+-     *         together.
+-     */
+-    public XMLWriter value(String s) {
+-        append(escapeXMLEntities(s));
+-        return this;
+-    }
+-
+-    /**
+-     * Adds the specified value as Base64 encoded text to the current position of the in
+-     * progress XML document.
+-     *
+-     * @param b
+-     *            The binary data to add to the XML document.
+-     *
+-     * @return This XMLWriter so that additional method calls can be chained
+-     *         together.
+-     */
+-    public XMLWriter value(ByteBuffer b) {
+-        append(escapeXMLEntities(Base64.encodeAsString(BinaryUtils.copyBytesFrom(b))));
+-        return this;
+-    }
+-
+-    /**
+-     * Adds the specified date as text to the current position of the
+-     * in-progress XML document.
+-     *
+-     * @param date
+-     *            The date to add to the XML document.
+-     *
+-     * @return This XMLWriter so that additional method calls can be chained
+-     *         together.
+-     */
+-    public XMLWriter value(Date date) {
+-        append(escapeXMLEntities(StringUtils.fromDate(date)));
+-        return this;
+-    }
+-
+-    /**
+-     * Adds the string representation of the specified object to the current
+-     * position of the in progress XML document.
+-     *
+-     * @param obj
+-     *            The object to translate to a string and add to the XML
+-     *            document.
+-     *
+-     * @return This XMLWriter so that additional method calls can be chained
+-     *         together.
+-     */
+-    public XMLWriter value(Object obj) {
+-        append(escapeXMLEntities(obj.toString()));
+-        return this;
+-    }
+-
+-    private void append(String s) {
+-        try {
+-            writer.append(s);
+-        } catch (IOException e) {
+-            throw new SdkClientException("Unable to write XML document", e);
+-        }
+-    }
+-    
+-    private String escapeXMLEntities(String s) {
+-    	/** 
+-    	 * Unescape any escaped characters.
+-    	 */
+-    	if (s.contains("&")) {
+-        	s = s.replace(""", "\"");
+-        	s = s.replace("'", "'");
+-        	s = s.replace("<", "<");
+-        	s = s.replace(">", ">");
+-        	// Ampersands should always be the last to unescape
+-        	s = s.replace("&", "&");
+-    	}
+-    	// Ampersands should always be the first to escape
+-    	s = s.replace("&", "&");
+-    	s = s.replace("\"", """);
+-    	s = s.replace("'", "'");
+-    	s = s.replace("<", "<");
+-    	s = s.replace(">", ">");
+-    	return s;
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/util/XpathUtils.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/XpathUtils.java
+--- ./src/main/java/com/amazonaws/util/XpathUtils.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/util/XpathUtils.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,607 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-package com.amazonaws.util;
+-import java.io.ByteArrayInputStream;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.lang.reflect.Method;
+-import java.net.URL;
+-import java.nio.ByteBuffer;
+-import java.util.Date;
+-
+-import javax.xml.parsers.DocumentBuilder;
+-import javax.xml.parsers.DocumentBuilderFactory;
+-import javax.xml.parsers.ParserConfigurationException;
+-import javax.xml.xpath.XPath;
+-import javax.xml.xpath.XPathConstants;
+-import javax.xml.xpath.XPathExpressionException;
+-import javax.xml.xpath.XPathFactory;
+-
+-import org.apache.commons.logging.Log;
+-import org.apache.commons.logging.LogFactory;
+-import org.w3c.dom.Document;
+-import org.w3c.dom.Node;
+-import org.w3c.dom.NodeList;
+-import org.xml.sax.ErrorHandler;
+-import org.xml.sax.SAXException;
+-import org.xml.sax.SAXParseException;
+-
+-/**
+- * Utility methods for extracting data from XML documents using Xpath
+- * expressions.
+- */
+-public class XpathUtils {
+-
+-    /** The default property name to load the Xalan DTM manager. */
+-    private static final String DTM_MANAGER_DEFAULT_PROP_NAME = "com.sun.org.apache.xml.internal.dtm.DTMManager";
+-
+-    /** The default property name to load the Xalan Document Builder Factory. */
+-    private static final String DOCUMENT_BUILDER_FACTORY_PROP_NAME = "javax.xml.parsers.DocumentBuilderFactory";
+-
+-    /** The FQCN of the desired DocumentBuilderFactory implementation. */
+-    private static final String DOCUMENT_BUILDER_FACTORY_IMPL_CLASS_NAME = "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl";
+-
+-    /** The FQCN of the internal XPathContext class. */
+-    private static final String XPATH_CONTEXT_CLASS_NAME = "com.sun.org.apache.xpath.internal.XPathContext";
+-
+-    /** The FQCN of the desired DTMManager implementation. */
+-    private static final String DTM_MANAGER_IMPL_CLASS_NAME = "com.sun.org.apache.xml.internal.dtm.ref.DTMManagerDefault";
+-
+-    private static final Log log = LogFactory.getLog(XpathUtils.class);
+-
+-    private static final ErrorHandler ERROR_HANDLER = new ErrorHandler() {
+-
+-        @Override
+-        public void warning(SAXParseException e) throws SAXException {
+-            if (log.isDebugEnabled()) {
+-                log.debug("xml parse warning: " + e.getMessage(), e);
+-            }
+-        }
+-
+-        @Override
+-        public void fatalError(SAXParseException e) throws SAXException {
+-            throw e;
+-        }
+-
+-        @Override
+-        public void error(SAXParseException e) throws SAXException {
+-            if (log.isDebugEnabled()) {
+-                log.debug("xml parse error: " + e.getMessage(), e);
+-            }
+-        }
+-    };
+-
+-    /**
+-     * Used to optimize performance by avoiding expensive file access every time
+-     * a DTMManager is constructed as a result of constructing a Xalan xpath
+-     * context!
+-     */
+-    private static void speedUpDTMManager() throws Exception {
+-        // https://github.com/aws/aws-sdk-java/issues/238
+-        // http://stackoverflow.com/questions/6340802/java-xpath-apache-jaxp-implementation-performance
+-        if (System.getProperty(DTM_MANAGER_DEFAULT_PROP_NAME) == null) {
+-            Class XPathContextClass = Class.forName(XPATH_CONTEXT_CLASS_NAME);
+-            Method getDTMManager = XPathContextClass.getMethod("getDTMManager");
+-            Object XPathContext = XPathContextClass.newInstance();
+-            Object dtmManager = getDTMManager.invoke(XPathContext);
+-
+-            if (DTM_MANAGER_IMPL_CLASS_NAME.equals(dtmManager.getClass().getName())) {
+-                // This would avoid the file system to be accessed every time
+-                // the internal XPathContext is instantiated.
+-                System.setProperty(DTM_MANAGER_DEFAULT_PROP_NAME,
+-                        DTM_MANAGER_IMPL_CLASS_NAME);
+-            }
+-        }
+-    }
+-
+-    /**
+-     * Used to optimize performance by avoiding expensive file access every time
+-     * a DocumentBuilderFactory is constructed as a result of constructing a
+-     * Xalan document factory.
+-     */
+-    private static void speedUpDcoumentBuilderFactory() {
+-        if (System.getProperty(DOCUMENT_BUILDER_FACTORY_PROP_NAME) == null) {
+-            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+-            if (DOCUMENT_BUILDER_FACTORY_IMPL_CLASS_NAME.equals(factory.getClass().getName())) {
+-                // This would avoid the file system to be accessed every time
+-                // the internal DocumentBuilderFactory is instantiated.
+-                System.setProperty(DOCUMENT_BUILDER_FACTORY_PROP_NAME,
+-                        DOCUMENT_BUILDER_FACTORY_IMPL_CLASS_NAME);
+-            }
+-        }
+-    }
+-
+-    // static initialization block to conservatively speed things up whenever we
+-    // can
+-    static {
+-        try {
+-            speedUpDcoumentBuilderFactory();
+-        } catch(Throwable t) {
+-            log.debug("Ingore failure in speeding up DocumentBuilderFactory", t);
+-        }
+-        try {
+-            speedUpDTMManager();
+-        } catch(Throwable t) {
+-            log.debug("Ingore failure in speeding up DTMManager", t);
+-        }
+-    }
+-
+-    // XPath is not thread safe and not reentrant.
+-    /**
+-     * Returns a new instance of XPath, which is not thread safe and not
+-     * reentrant.
+-     */
+-    public static XPath xpath() {
+-        return XPathFactory.newInstance().newXPath();
+-    }
+-
+-    /**
+-     * This method closes the given input stream upon completion.
+-     */
+-    public static Document documentFrom(InputStream is)
+-            throws SAXException, IOException, ParserConfigurationException {
+-        is = new NamespaceRemovingInputStream(is);
+-        // DocumentBuilderFactory is not thread safe
+-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+-        DocumentBuilder builder = factory.newDocumentBuilder();
+-        // ensure that parser writes error/warning messages to the logger
+-        // rather than stderr
+-        builder.setErrorHandler(ERROR_HANDLER);
+-        Document doc = builder.parse(is);
+-        is.close();
+-        return doc;
+-    }
+-
+-    public static Document documentFrom(String xml) throws SAXException,
+-            IOException, ParserConfigurationException {
+-        return documentFrom(new ByteArrayInputStream(xml.getBytes(StringUtils.UTF8)));
+-    }
+-
+-    public static Document documentFrom(URL url) throws SAXException,
+-            IOException, ParserConfigurationException {
+-        return documentFrom(url.openStream());
+-    }
+-
+-    /**
+-     * Evaluates the specified XPath expression and returns the results as a
+-     * Double.
+-     * 

+-     * This method can be expensive as a new xpath is instantiated per
+-     * invocation. Consider passing in the xpath explicitly via {
+-     * {@link #asDouble(String, Node, XPath)} instead.  Note {@link XPath} is
+-     * not thread-safe and not reentrant.
+-     *
+-     * @param expression
+-     *            The XPath expression to evaluate.
+-     * @param node
+-     *            The node to run the expression on.
+-     *
+-     * @return The Double result.
+-     *
+-     * @throws XPathExpressionException
+-     *             If there was a problem processing the specified XPath
+-     *             expression.
+-     */
+-    public static Double asDouble(String expression, Node node)
+-            throws XPathExpressionException {
+-        return asDouble(expression, node, xpath());
+-    }
+-
+-    /**
+-     * Same as {@link #asDouble(String, Node)} but allows an xpath to be passed
+-     * in explicitly for reuse.
+-     */
+-    public static Double asDouble(String expression, Node node, XPath xpath)
+-            throws XPathExpressionException {
+-        String doubleString = evaluateAsString(expression, node, xpath);
+-        return (isEmptyString(doubleString)) ? null : Double.parseDouble(doubleString);
+-    }
+-
+-    /**
+-     * Evaluates the specified XPath expression and returns the result as a
+-     * string.
+-     * 

+-     * This method can be expensive as a new xpath is instantiated per
+-     * invocation. Consider passing in the xpath explicitly via {
+-     * {@link #asDouble(String, Node, XPath)} instead.  Note {@link XPath} is
+-     * not thread-safe and not reentrant.
+-     *
+-     * @param expression
+-     *            The XPath expression to evaluate.
+-     * @param node
+-     *            The node to run the expression on.
+-     *
+-     * @return The string result.
+-     *
+-     * @throws XPathExpressionException
+-     *             If there was a problem processing the specified XPath
+-     *             expression.
+-     */
+-    public static String asString(String expression, Node node)
+-            throws XPathExpressionException {
+-        return evaluateAsString(expression, node, xpath());
+-    }
+-
+-    /**
+-     * Same as {@link #asString(String, Node)} but allows an xpath to be passed
+-     * in explicitly for reuse.
+-     */
+-    public static String asString(String expression, Node node, XPath xpath)
+-            throws XPathExpressionException {
+-        return evaluateAsString(expression, node, xpath);
+-    }
+-
+-    /**
+-     * Evaluates the specified XPath expression and returns the result as an
+-     * Integer.
+-     * 

+-     * This method can be expensive as a new xpath is instantiated per
+-     * invocation. Consider passing in the xpath explicitly via {
+-     * {@link #asDouble(String, Node, XPath)} instead.  Note {@link XPath} is
+-     * not thread-safe and not reentrant.
+-     *
+-     * @param expression
+-     *            The XPath expression to evaluate.
+-     * @param node
+-     *            The node to run the expression on.
+-     *
+-     * @return The Integer result.
+-     *
+-     * @throws XPathExpressionException
+-     *             If there was a problem processing the specified XPath
+-     *             expression.
+-     */
+-    public static Integer asInteger(String expression, Node node)
+-            throws XPathExpressionException {
+-        return asInteger(expression, node, xpath());
+-    }
+-
+-    /**
+-     * Same as {@link #asInteger(String, Node)} but allows an xpath to be passed
+-     * in explicitly for reuse.
+-     */
+-    public static Integer asInteger(String expression, Node node, XPath xpath)
+-            throws XPathExpressionException {
+-        String intString = evaluateAsString(expression, node, xpath);
+-        return (isEmptyString(intString)) ? null : Integer.parseInt(intString);
+-    }
+-
+-    /**
+-     * Evaluates the specified XPath expression and returns the result as a
+-     * Boolean.
+-     * 

+-     * This method can be expensive as a new xpath is instantiated per
+-     * invocation. Consider passing in the xpath explicitly via {
+-     * {@link #asDouble(String, Node, XPath)} instead.  Note {@link XPath} is
+-     * not thread-safe and not reentrant.
+-     *
+-     * @param expression
+-     *            The XPath expression to evaluate.
+-     * @param node
+-     *            The node to run the expression on.
+-     *
+-     * @return The Boolean result.
+-     *
+-     * @throws XPathExpressionException
+-     *             If there was a problem processing the specified XPath
+-     *             expression.
+-     */
+-    public static Boolean asBoolean(String expression, Node node)
+-            throws XPathExpressionException {
+-        return asBoolean(expression, node, xpath());
+-    }
+-
+-    /**
+-     * Same as {@link #asBoolean(String, Node)} but allows an xpath to be passed
+-     * in explicitly for reuse.
+-     */
+-    public static Boolean asBoolean(String expression, Node node, XPath xpath)
+-            throws XPathExpressionException {
+-        String booleanString = evaluateAsString(expression, node, xpath);
+-        return (isEmptyString(booleanString)) ? null : Boolean.parseBoolean(booleanString);
+-    }
+-
+-    /**
+-     * Evaluates the specified XPath expression and returns the result as a
+-     * Float.
+-     * 

+-     * This method can be expensive as a new xpath is instantiated per
+-     * invocation. Consider passing in the xpath explicitly via {
+-     * {@link #asDouble(String, Node, XPath)} instead.  Note {@link XPath} is
+-     * not thread-safe and not reentrant.
+-     *
+-     * @param expression
+-     *            The XPath expression to evaluate.
+-     * @param node
+-     *            The node to run the expression on.
+-     *
+-     * @return The Float result.
+-     *
+-     * @throws XPathExpressionException
+-     *             If there was a problem processing the specified XPath
+-     *             expression.
+-     */
+-    public static Float asFloat(String expression, Node node)
+-            throws XPathExpressionException {
+-        return asFloat(expression, node, xpath());
+-    }
+-
+-    /**
+-     * Same as {@link #asFloat(String, Node)} but allows an xpath to be passed
+-     * in explicitly for reuse.
+-     */
+-    public static Float asFloat(String expression, Node node, XPath xpath)
+-            throws XPathExpressionException {
+-        String floatString = evaluateAsString(expression, node, xpath);
+-        return (isEmptyString(floatString)) ? null : Float.valueOf(floatString);
+-    }
+-
+-    /**
+-     * Evaluates the specified XPath expression and returns the result as a
+-     * Long.
+-     * 

+-     * This method can be expensive as a new xpath is instantiated per
+-     * invocation. Consider passing in the xpath explicitly via {
+-     * {@link #asDouble(String, Node, XPath)} instead.  Note {@link XPath} is
+-     * not thread-safe and not reentrant.
+-     *
+-     * @param expression
+-     *            The XPath expression to evaluate.
+-     * @param node
+-     *            The node to run the expression on.
+-     *
+-     * @return The Long result.
+-     *
+-     * @throws XPathExpressionException
+-     *             If there was a problem processing the specified XPath
+-     *             expression.
+-     */
+-    public static Long asLong(String expression, Node node)
+-            throws XPathExpressionException {
+-        return asLong(expression, node, xpath());
+-    }
+-
+-    /**
+-     * Same as {@link #asLong(String, Node)} but allows an xpath to be passed
+-     * in explicitly for reuse.
+-     */
+-    public static Long asLong(String expression, Node node, XPath xpath)
+-            throws XPathExpressionException {
+-        String longString = evaluateAsString(expression, node, xpath);
+-        return (isEmptyString(longString)) ? null : Long.parseLong(longString);
+-    }
+-
+-    /**
+-     * Evaluates the specified XPath expression and returns the result as a
+-     * Byte.
+-     * 

+-     * This method can be expensive as a new xpath is instantiated per
+-     * invocation. Consider passing in the xpath explicitly via {
+-     * {@link #asDouble(String, Node, XPath)} instead.  Note {@link XPath} is
+-     * not thread-safe and not reentrant.
+-     *
+-     * @param expression
+-     *            The XPath expression to evaluate.
+-     * @param node
+-     *            The node to run the expression on.
+-     *
+-     * @return The Byte result.
+-     *
+-     * @throws XPathExpressionException
+-     *             If there was a problem processing the specified XPath
+-     *             expression.
+-     */
+-    public static Byte asByte(String expression, Node node)
+-            throws XPathExpressionException {
+-        return asByte(expression, node, xpath());
+-    }
+-
+-    /**
+-     * Same as {@link #asByte(String, Node)} but allows an xpath to be passed
+-     * in explicitly for reuse.
+-     */
+-    public static Byte asByte(String expression, Node node, XPath xpath)
+-            throws XPathExpressionException {
+-        String byteString = evaluateAsString(expression, node, xpath);
+-        return (isEmptyString(byteString)) ? null : Byte.valueOf(byteString);
+-    }
+-
+-    /**
+-     * Evaluates the specified XPath expression and returns the result as a
+-     * Date. Assumes that the node's text is formatted as an ISO 8601 date, as
+-     * specified by xs:dateTime.
+-     * 

+-     * This method can be expensive as a new xpath is instantiated per
+-     * invocation. Consider passing in the xpath explicitly via {
+-     * {@link #asDouble(String, Node, XPath)} instead.  Note {@link XPath} is
+-     * not thread-safe and not reentrant.
+-     *
+-     * @param expression
+-     *            The XPath expression to evaluate.
+-     * @param node
+-     *            The node to run the expression on.
+-     *
+-     * @return The Date result.
+-     *
+-     * @throws XPathExpressionException
+-     *             If there was a problem processing the specified XPath
+-     *             expression.
+-     */
+-    public static Date asDate(String expression, Node node)
+-            throws XPathExpressionException {
+-        return asDate(expression, node, xpath());
+-    }
+-
+-    /**
+-     * Same as {@link #asDate(String, Node)} but allows an xpath to be passed
+-     * in explicitly for reuse.
+-     */
+-    public static Date asDate(String expression, Node node, XPath xpath)
+-            throws XPathExpressionException {
+-        String dateString = evaluateAsString(expression, node, xpath);
+-        if (isEmptyString(dateString)) return null;
+-
+-        try {
+-            return DateUtils.parseISO8601Date(dateString);
+-        } catch (Exception e) {
+-            log.warn("Unable to parse date '" + dateString + "':  " + e.getMessage(), e);
+-            return null;
+-        }
+-    }
+-
+-    /**
+-     * Evaluates the specified xpath expression, base64 decodes the data and
+-     * returns the result as a ByteBuffer.
+-     * 

+-     * This method can be expensive as a new xpath is instantiated per
+-     * invocation. Consider passing in the xpath explicitly via {
+-     * {@link #asDouble(String, Node, XPath)} instead.  Note {@link XPath} is
+-     * not thread-safe and not reentrant.
+-     *
+-     * @param expression
+-     *            The Xpath expression to evaluate.
+-     * @param node
+-     *            The node on which to evaluate the expression.
+-     *
+-     * @return A ByteBuffer of base64 decoded data from the result of evaluating
+-     *         the specified Xpath expression.
+-     *
+-     * @throws XPathExpressionException
+-     *             If there are any problems evaluating the Xpath expression.
+-     */
+-    public static ByteBuffer asByteBuffer(String expression, Node node)
+-            throws XPathExpressionException {
+-        return asByteBuffer(expression, node, xpath());
+-    }
+-
+-    /**
+-     * Same as {@link #asByteBuffer(String, Node)} but allows an xpath to be
+-     * passed in explicitly for reuse.
+-     */
+-    public static ByteBuffer asByteBuffer(String expression, Node node, XPath xpath)
+-            throws XPathExpressionException {
+-        String base64EncodedString = evaluateAsString(expression, node, xpath);
+-        if (isEmptyString(base64EncodedString)) return null;
+-
+-        if (!isEmpty(node)) {
+-            byte[] decodedBytes = Base64.decode(base64EncodedString);
+-            return ByteBuffer.wrap(decodedBytes);
+-        }
+-        return null;
+-    }
+-
+-    /**
+-     * Returns true if the specified node is null or has no children.
+-     *
+-     * @param node
+-     *            The node to test.
+-     *
+-     * @return True if the specified node is null or has no children.
+-     */
+-    public static boolean isEmpty(Node node) {
+-        return (node == null);
+-    }
+-
+-    /**
+-     * Evaluates the specified XPath expression and returns the result as a
+-     * Node.
+-     *
+-     * @param nodeName
+-     *            The XPath expression to evaluate.
+-     * @param node
+-     *            The node to run the expression on.
+-     *
+-     * @return The Node result.
+-     *
+-     * @throws XPathExpressionException
+-     *             If there was a problem processing the specified XPath
+-     *             expression.
+-     */
+-    public static Node asNode(String nodeName, Node node)
+-            throws XPathExpressionException {
+-        return asNode(nodeName, node, xpath());
+-    }
+-
+-    /**
+-     * Same as {@link #asNode(String, Node)} but allows an xpath to be
+-     * passed in explicitly for reuse.
+-     */
+-    public static Node asNode(String nodeName, Node node, XPath xpath)
+-            throws XPathExpressionException {
+-        if (node == null) return null;
+-        return (Node) xpath.evaluate(nodeName, node, XPathConstants.NODE);
+-    }
+-
+-    /**
+-     * Returns the length of the specified node list.
+-     *
+-     * @param list
+-     *            The node list to measure.
+-     *
+-     * @return The length of the specified node list.
+-     */
+-    public static int nodeLength(NodeList list) {
+-        return list == null ? 0 : list.getLength();
+-    }
+-
+-    /**
+-     * Evaluates the specified expression on the specified node and returns the
+-     * result as a String.
+-     *
+-     * @param expression
+-     *            The Xpath expression to evaluate.
+-     * @param node
+-     *            The node on which to evaluate the expression.
+-     *
+-     * @return The result of evaluating the specified expression, or null if the
+-     *         evaluation didn't return any result.
+-     *
+-     * @throws XPathExpressionException
+-     *             If there are any problems evaluating the Xpath expression.
+-     */
+-    private static String evaluateAsString(String expression, Node node,
+-            XPath xpath) throws XPathExpressionException {
+-        if (isEmpty(node)) return null;
+-
+-        if (!expression.equals(".")) {
+-            /*
+-             * If the expression being evaluated doesn't select a node, we want
+-             * to return null to distinguish between cases where a node isn't
+-             * present (which should be represented as null) and when a node is
+-             * present, but empty (which should be represented as the empty
+-             * string).
+-             *
+-             * We skip this test if the expression is "." since we've already
+-             * checked that the node exists.
+-             */
+-            if (asNode(expression, node, xpath) == null) return null;
+-        }
+-
+-        String s = xpath.evaluate(expression, node);
+-
+-        return s.trim();
+-    }
+-
+-    /**
+-     * Returns true if the specified string is null or empty.
+-     *
+-     * @param s
+-     *            The string to test.
+-     * @return True if the specified string is null or empty.
+-     */
+-    private static boolean isEmptyString(String s) {
+-        return s == null || s.trim().length() == 0;
+-    }
+-}
+\ No newline at end of file
+diff -Nau8r ./src/main/java/com/amazonaws/waiters/AcceptorPathMatcher.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/AcceptorPathMatcher.java
+--- ./src/main/java/com/amazonaws/waiters/AcceptorPathMatcher.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/AcceptorPathMatcher.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,91 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.waiters;
+-
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.fasterxml.jackson.databind.JsonNode;
+-
+-@SdkProtectedApi
+-public class AcceptorPathMatcher {
+-
+-    /**
+-     * PathAll matcher that checks if each element of the final
+-     * result matches the expected result
+-     *
+-     * @param expectedResult Expected result given by the waiter definition
+-     * @param finalResult    Final result of the resource got by the execution
+-     *                       of the JmesPath expression given by the waiter
+-     *                       definition
+-     * @return True if all elements of the final result matches
+-     * the expected result, False otherwise
+-     */
+-    public static boolean pathAll(JsonNode expectedResult, JsonNode finalResult) {
+-        if (finalResult.isNull()) {
+-            return false;
+-        }
+-        if (!finalResult.isArray()) {
+-            throw new RuntimeException("Expected an array");
+-        }
+-        for (JsonNode element : finalResult) {
+-            if (!element.equals(expectedResult)) {
+-                return false;
+-            }
+-        }
+-        return true;
+-    }
+-
+-    /**
+-     * PathAny matcher that checks if any element of the final
+-     * result matches the expected result
+-     *
+-     * @param expectedResult Expected result given by the waiter definition
+-     * @param finalResult    Final result of the resource got by the execution
+-     *                       of the JmesPath expression given by the waiter
+-     *                       definition
+-     * @return True if any single element of the final result matches
+-     * the expected result, False if none matched
+-     */
+-    public static boolean pathAny(JsonNode expectedResult, JsonNode finalResult) {
+-        if (finalResult.isNull()) {
+-            return false;
+-        }
+-        if (!finalResult.isArray()) {
+-            throw new RuntimeException("Expected an array");
+-        }
+-        for (JsonNode element : finalResult) {
+-            if (element.equals(expectedResult)) {
+-                return true;
+-            }
+-        }
+-        return false;
+-
+-    }
+-
+-    /**
+-     * Path matcher that checks if the final result
+-     * matches the expected result
+-     *
+-     * @param expectedResult Expected result given by the waiter definition
+-     * @param finalResult    Final result of the resource got by the execution
+-     *                       of the JmesPath expression given by the waiter
+-     *                       definition
+-     * @return True if the final result matches the expected result,
+-     * False otherwise
+-     */
+-    public static boolean path(JsonNode expectedResult, JsonNode finalResult) {
+-        return finalResult.equals(expectedResult);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/waiters/CompositeAcceptor.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/CompositeAcceptor.java
+--- ./src/main/java/com/amazonaws/waiters/CompositeAcceptor.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/CompositeAcceptor.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,90 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.waiters;
+-
+-import com.amazonaws.AmazonServiceException;
+-import com.amazonaws.annotation.SdkInternalApi;
+-import com.amazonaws.util.ValidationUtils;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-@SdkInternalApi
+-class CompositeAcceptor {
+-
+-    /**
+-     * List of acceptors defined for each waiter
+-     */
+-    private List> acceptors = new ArrayList>();
+-
+-    /**
+-     * Constructs a new Composite Acceptor with the given list of acceptors.
+-     * Throws an assertion exception if the acceptor list is empty or null
+-     *
+-     * @param acceptors List of acceptors defined for each waiter. It shouldn't
+-     *                  be null or empty
+-     */
+-    public CompositeAcceptor(List> acceptors) {
+-        this.acceptors = ValidationUtils.assertNotEmpty(acceptors, "acceptors");
+-    }
+-
+-    /**
+-     * @return List of acceptors defined for each waiter
+-     */
+-    public List> getAcceptors() {
+-        return this.acceptors;
+-    }
+-
+-    /**
+-     * Compares the response against each response acceptor and returns
+-     * the state of the acceptor it matches on. If none is matched, returns
+-     * retry state by default
+-     *
+-     * @param response Response object got by executing the specified
+-     *                 waiter operation
+-     * @return (Enum) Corresponding waiter state defined by the acceptor or
+-     * retry state if none matched
+-     */
+-    public WaiterState accepts(Output response) {
+-        for (WaiterAcceptor acceptor : acceptors) {
+-            if (acceptor.matches(response)) {
+-                return acceptor.getState();
+-            }
+-        }
+-        return WaiterState.RETRY;
+-
+-    }
+-
+-    /**
+-     * Compares the exception thrown against each exception acceptor and
+-     * returns the state of the acceptor it matches on. If none is
+-     * matched, it rethrows the exception to the caller
+-     *
+-     * @param exception Exception thrown by executing the specified
+-     *                  waiter operation
+-     * @return (Enum) Corresponding waiter state defined by the acceptor or
+-     * rethrows the exception back to the caller if none matched
+-     * @throws Exception
+-     */
+-    public WaiterState accepts(AmazonServiceException exception) throws AmazonServiceException {
+-        for (WaiterAcceptor acceptor : acceptors) {
+-            if (acceptor.matches(exception)) {
+-                return acceptor.getState();
+-            }
+-        }
+-        throw exception;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/waiters/FixedDelayStrategy.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/FixedDelayStrategy.java
+--- ./src/main/java/com/amazonaws/waiters/FixedDelayStrategy.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/FixedDelayStrategy.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,47 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.waiters;
+-
+-public class FixedDelayStrategy implements PollingStrategy.DelayStrategy{
+-
+-    /**
+-     * Represents default delay time in seconds
+-     */
+-    private final int defaultDelayInSeconds;
+-
+-    /**
+-     * Constructs a new FixedDelayStrategy with the given
+-     * default delay time
+-     *
+-     * @param defaultDelayInSeconds
+-     */
+-    public FixedDelayStrategy(int defaultDelayInSeconds) {
+-        this.defaultDelayInSeconds = defaultDelayInSeconds;
+-    }
+-
+-    /**
+-     * Defines a default way of delaying the polling bound by
+-     * the default delay associated with the corresponding
+-     * waiter definition
+-     *
+-     * @param pollingStrategyContext Provides the polling context required to define custom delay
+-     * @throws InterruptedException
+-     */
+-    @Override
+-    public void delayBeforeNextRetry(PollingStrategyContext pollingStrategyContext) throws InterruptedException {
+-        Thread.sleep(defaultDelayInSeconds * 1000);
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/waiters/HttpFailureStatusAcceptor.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/HttpFailureStatusAcceptor.java
+--- ./src/main/java/com/amazonaws/waiters/HttpFailureStatusAcceptor.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/HttpFailureStatusAcceptor.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,41 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.waiters;
+-
+-import com.amazonaws.AmazonServiceException;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-@SdkProtectedApi
+-public class HttpFailureStatusAcceptor extends WaiterAcceptor {
+-
+-    private final int expectedStatusCode;
+-    private final WaiterState waiterState;
+-
+-    public HttpFailureStatusAcceptor(int expectedStatusCode, WaiterState waiterState) {
+-        this.expectedStatusCode = expectedStatusCode;
+-        this.waiterState = waiterState;
+-    }
+-
+-    @Override
+-    public boolean matches(AmazonServiceException ase) {
+-        return expectedStatusCode == ase.getStatusCode();
+-    }
+-
+-    @Override
+-    public WaiterState getState() {
+-        return waiterState;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/waiters/HttpSuccessStatusAcceptor.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/HttpSuccessStatusAcceptor.java
+--- ./src/main/java/com/amazonaws/waiters/HttpSuccessStatusAcceptor.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/HttpSuccessStatusAcceptor.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,38 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.waiters;
+-
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-@SdkProtectedApi
+-public class HttpSuccessStatusAcceptor extends WaiterAcceptor{
+-
+-    private final WaiterState waiterState;
+-
+-    public HttpSuccessStatusAcceptor(WaiterState waiterState) {
+-        this.waiterState = waiterState;
+-    }
+-
+-    @Override
+-    public boolean matches(Output output) {
+-        return true;
+-    }
+-
+-    @Override
+-    public WaiterState getState() {
+-        return waiterState;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/waiters/MaxAttemptsRetryStrategy.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/MaxAttemptsRetryStrategy.java
+--- ./src/main/java/com/amazonaws/waiters/MaxAttemptsRetryStrategy.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/MaxAttemptsRetryStrategy.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,47 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.waiters;
+-
+-public class MaxAttemptsRetryStrategy implements PollingStrategy.RetryStrategy {
+-
+-    /**
+-     * Represents default number of maximum attempts allowed
+-     * for polling
+-     */
+-    private final int defaultMaxAttempts;
+-
+-    /**
+-     * Constructs a new MaxAttemptsRetryStrategy with the given
+-     * default number of attempts
+-     *
+-     * @param defaultMaxAttempts
+-     */
+-    public MaxAttemptsRetryStrategy(int defaultMaxAttempts) {
+-        this.defaultMaxAttempts = defaultMaxAttempts;
+-    }
+-
+-    /**
+-     * Default way of checking if polling should be retried
+-     * or fast failed
+-     *
+-     * @param pollingStrategyContext Provides the polling context required to make the retry decision
+-     * @return false if the number of re
+-     */
+-    @Override
+-    public boolean shouldRetry(PollingStrategyContext pollingStrategyContext) {
+-        return pollingStrategyContext.getRetriesAttempted() < defaultMaxAttempts;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/waiters/NoOpWaiterHandler.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/NoOpWaiterHandler.java
+--- ./src/main/java/com/amazonaws/waiters/NoOpWaiterHandler.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/NoOpWaiterHandler.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,32 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.waiters;
+-
+-import com.amazonaws.AmazonWebServiceRequest;
+-import com.amazonaws.annotation.SdkInternalApi;
+-
+-@SdkInternalApi
+-public class NoOpWaiterHandler extends WaiterHandler{
+-
+-    @Override
+-    public void onWaitSuccess(AmazonWebServiceRequest request) {
+-    }
+-
+-    @Override
+-    public void onWaitFailure(Exception e) {
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/waiters/PollingStrategyContext.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/PollingStrategyContext.java
+--- ./src/main/java/com/amazonaws/waiters/PollingStrategyContext.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/PollingStrategyContext.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,60 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.waiters;
+-
+-import com.amazonaws.AmazonWebServiceRequest;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-@SdkProtectedApi
+-public class PollingStrategyContext {
+-
+-    /**
+-     * Represents the original input of the operation.
+-     */
+-    private final AmazonWebServiceRequest originalRequest;
+-
+-    /**
+-     * Represents the number of retries made so far
+-     */
+-    private final int retriesAttempted;
+-
+-    /**
+-     * Constructs a new polling strategy context with the given
+-     * request and retries attempted required for custom polling
+-     *
+-     * @param originalRequest
+-     * @param retriesAttempted
+-     */
+-    PollingStrategyContext(AmazonWebServiceRequest originalRequest, int retriesAttempted) {
+-        this.originalRequest = originalRequest;
+-        this.retriesAttempted = retriesAttempted;
+-    }
+-
+-    /**
+-     * @return Original input of the operation.
+-     */
+-    public AmazonWebServiceRequest getOriginalRequest() {
+-        return originalRequest;
+-    }
+-
+-    /**
+-     * @return Number of retries attempted
+-     */
+-    public int getRetriesAttempted() {
+-        return retriesAttempted;
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/waiters/PollingStrategy.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/PollingStrategy.java
+--- ./src/main/java/com/amazonaws/waiters/PollingStrategy.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/PollingStrategy.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,93 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.waiters;
+-
+-public class PollingStrategy{
+-
+-    /**
+-     * Condition on whether polling should be retried.
+-     */
+-    private final RetryStrategy retryStrategy;
+-
+-    /**
+-     * Delay strategy to control the sleep time between retry attempts.
+-     */
+-    private final DelayStrategy delayStrategy;
+-
+-    /**
+-     * Constructs a new PollingStrategy with RetryStrategy
+-     * and DelayStrategy defined
+-     *
+-     * @param retryStrategy Retry condition on whether polling should be retried.
+-     *                      If null value is specified, the SDK' default retry
+-     *                      condition is used.
+-     */
+-    public PollingStrategy(RetryStrategy retryStrategy, DelayStrategy delayStrategy) {
+-        this.retryStrategy = retryStrategy;
+-        this.delayStrategy = delayStrategy;
+-    }
+-
+-    /**
+-     * Returns the retry condition included in this Polling Strategy.
+-     *
+-     * @return The retry condition included in this Polling Strategy.
+-     */
+-    RetryStrategy getRetryStrategy() {
+-        return this.retryStrategy;
+-    }
+-
+-    /**
+-     * Returns the delay strategy included in this Polling Strategy.
+-     *
+-     * @return The delay strategy included in this Polling Strategy.
+-     */
+-    DelayStrategy getDelayStrategy() {
+-        return this.delayStrategy;
+-    }
+-
+-    /**
+-     * The hook for providing custom condition on whether polling of a resource
+-     * should be retried.
+-     */
+-    public interface RetryStrategy {
+-        /**
+-         * Returns whether polling of a resource should be retried according to the
+-         * given polling context.
+-         *
+-         * @param pollingStrategyContext Provides the polling context required to make the retry decision
+-         * @return True if it should be retried.
+-         * @see PollingStrategyContext
+-         */
+-        boolean shouldRetry(PollingStrategyContext pollingStrategyContext);
+-    }
+-
+-    /**
+-     * The hook for providing custom delay strategy to control the sleep time
+-     * between retries.
+-     */
+-    public interface DelayStrategy {
+-
+-        /**
+-         * Defines the custom delay strategy to control the sleep time
+-         *
+-         * @param pollingStrategyContext Provides the polling context required to define custom delay
+-         * @throws InterruptedException
+-         * @see PollingStrategyContext
+-         */
+-        void delayBeforeNextRetry(PollingStrategyContext pollingStrategyContext) throws InterruptedException;
+-
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/waiters/SdkFunction.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/SdkFunction.java
+--- ./src/main/java/com/amazonaws/waiters/SdkFunction.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/SdkFunction.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,33 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.waiters;
+-
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-@SdkProtectedApi
+-public interface SdkFunction {
+-
+-    /**
+-     * Abstract method that makes a call to the operation
+-     * specified by the waiter by taking the corresponding
+-     * input and returns the corresponding output
+-     *
+-     * @param input Corresponding request for the operation
+-     * @return Corresponding result of the operation
+-     */
+-    Output apply(Input input);
+-}
+-
+diff -Nau8r ./src/main/java/com/amazonaws/waiters/WaiterAcceptor.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/WaiterAcceptor.java
+--- ./src/main/java/com/amazonaws/waiters/WaiterAcceptor.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/WaiterAcceptor.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,60 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.waiters;
+-
+-import com.amazonaws.AmazonServiceException;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-@SdkProtectedApi
+-public abstract class WaiterAcceptor {
+-
+-    /**
+-     * Default method definition that matches the response
+-     * state with the expected state defined by the acceptor.
+-     * Overriden by each acceptor definition of matches.
+-     *
+-     * @param output Response got by the execution of the operation
+-     * @return False by default.
+-     * When overriden, returns True if it matches, False
+-     * otherwise
+-     */
+-    public boolean matches(Output output) {
+-        return false;
+-    }
+-
+-    /**
+-     * Default method definition that matches the exception
+-     * with the expected state defined by the acceptor.
+-     * Overriden by each acceptor definition of matches.
+-     *
+-     * @param output Exception thrown by the execution of the operation
+-     * @return False by default.
+-     * When overriden, returns True if it matches, False
+-     * otherwise
+-     */
+-    public boolean matches(AmazonServiceException output) {
+-        return false;
+-    }
+-
+-    /**
+-     * Abstract method to fetch the corresponding state
+-     *
+-     * @return Corresponding state of the resource
+-     */
+-    public abstract WaiterState getState();
+-}
+-
+-
+diff -Nau8r ./src/main/java/com/amazonaws/waiters/WaiterBuilder.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/WaiterBuilder.java
+--- ./src/main/java/com/amazonaws/waiters/WaiterBuilder.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/WaiterBuilder.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,77 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.waiters;
+-
+-import com.amazonaws.AmazonWebServiceRequest;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.List;
+-import java.util.concurrent.ExecutorService;
+-
+-@SdkProtectedApi
+-public class WaiterBuilder {
+-
+-    private SdkFunction sdkFunction;
+-
+-    private List> acceptors = new ArrayList>();
+-
+-    private PollingStrategy defaultPollingStrategy;
+-
+-    private ExecutorService executorService;
+-
+-    public WaiterBuilder withSdkFunction(SdkFunction sdkFunction) {
+-        this.sdkFunction = sdkFunction;
+-        return this;
+-    }
+-
+-    public WaiterBuilder withAcceptors(WaiterAcceptor... acceptors) {
+-        Collections.addAll(this.acceptors, acceptors);
+-        return this;
+-    }
+-
+-    public WaiterBuilder withDefaultPollingStrategy(PollingStrategy pollingStrategy) {
+-        this.defaultPollingStrategy = pollingStrategy;
+-        return this;
+-    }
+-
+-    public WaiterBuilder withExecutorService(ExecutorService executorService) {
+-        this.executorService = executorService;
+-        return this;
+-    }
+-
+-    public List> getAcceptor() {
+-        return this.acceptors;
+-    }
+-
+-    public SdkFunction getSdkFunction() {
+-        return this.sdkFunction;
+-    }
+-
+-    PollingStrategy getDefaultPollingStrategy() {
+-        return this.defaultPollingStrategy;
+-    }
+-
+-    public ExecutorService getExecutorService() {
+-        return this.executorService;
+-    }
+-
+-    public Waiter build() {
+-        return new WaiterImpl(this);
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/waiters/WaiterExecutionBuilder.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/WaiterExecutionBuilder.java
+--- ./src/main/java/com/amazonaws/waiters/WaiterExecutionBuilder.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/WaiterExecutionBuilder.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,76 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.waiters;
+-
+-import com.amazonaws.AmazonWebServiceRequest;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-@SdkProtectedApi
+-public class WaiterExecutionBuilder {
+-
+-    private SdkFunction sdkFunction;
+-
+-    private Input request;
+-
+-    private PollingStrategy pollingStrategy;
+-
+-    private List> acceptors = new ArrayList>();
+-
+-    public WaiterExecutionBuilder withSdkFunction(SdkFunction sdkFunction) {
+-        this.sdkFunction = sdkFunction;
+-        return this;
+-    }
+-
+-    public WaiterExecutionBuilder withRequest(Input request) {
+-        this.request = request;
+-        return this;
+-    }
+-
+-
+-    public WaiterExecutionBuilder withPollingStrategy(PollingStrategy pollingStrategy) {
+-        this.pollingStrategy = pollingStrategy;
+-        return this;
+-    }
+-
+-    public WaiterExecutionBuilder withAcceptors(List> acceptors) {
+-        this.acceptors = acceptors;
+-        return this;
+-    }
+-
+-    public Input getRequest() {
+-        return this.request;
+-    }
+-
+-    public List> getAcceptorsList() {
+-        return this.acceptors;
+-    }
+-
+-    public SdkFunction getSdkFunction() {
+-        return this.sdkFunction;
+-    }
+-
+-    public PollingStrategy getPollingStrategy() {
+-        return this.pollingStrategy;
+-    }
+-
+-    public WaiterExecution build() {
+-        return new WaiterExecution(this);
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/waiters/WaiterExecution.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/WaiterExecution.java
+--- ./src/main/java/com/amazonaws/waiters/WaiterExecution.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/WaiterExecution.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,125 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.waiters;
+-
+-import com.amazonaws.*;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.util.ValidationUtils;
+-
+-@SdkProtectedApi
+-public class WaiterExecution {
+-
+-    /**
+-     * Resource specific function that makes a call to the
+-     * operation specified by the waiter
+-     */
+-    private final SdkFunction sdkFunction;
+-
+-    /**
+-     * Represents the input of the operation.
+-     */
+-    private final Input request;
+-
+-    /**
+-     * List of acceptors defined for each waiter
+-     */
+-    private final CompositeAcceptor acceptor;
+-
+-    /**
+-     * Custom polling strategy as given by the end users
+-     */
+-    private final PollingStrategy pollingStrategy;
+-
+-    /**
+-     * Constructs a new waiter with all the parameters defined
+-     * in the WaiterExecutionBuilder
+-     *
+-     * @param waiterExecutionBuilder Contains all the parameters required to construct a
+-     *                               new waiter
+-     */
+-    public WaiterExecution(WaiterExecutionBuilder waiterExecutionBuilder) {
+-        this.sdkFunction = ValidationUtils.assertNotNull(waiterExecutionBuilder.getSdkFunction(), "sdkFunction");
+-        this.request = ValidationUtils.assertNotNull(waiterExecutionBuilder.getRequest(), "request");
+-        this.acceptor = new CompositeAcceptor(ValidationUtils.assertNotNull(waiterExecutionBuilder.getAcceptorsList(), "acceptors"));
+-        this.pollingStrategy = ValidationUtils.assertNotNull(waiterExecutionBuilder.getPollingStrategy(), "pollingStrategy");
+-    }
+-
+-    /**
+-     * Polls until a specified resource transitions into either success or failure state or
+-     * until the specified number of retries has been made.
+-     *
+-     * @return True if the resource transitions into desired state.
+-     * @throws AmazonServiceException       If the service exception thrown doesn't match any of the expected
+-     *                                      exceptions, it's re-thrown.
+-     * @throws WaiterUnrecoverableException If the resource transitions into a failure/unexpected state.
+-     * @throws WaiterTimedOutException      If the resource doesn't transition into the desired state
+-     *                                      even after a certain number of retries.
+-     */
+-    public boolean pollResource() throws AmazonServiceException, WaiterTimedOutException, WaiterUnrecoverableException {
+-        int retriesAttempted = 0;
+-        while (true) {
+-            switch (getCurrentState()) {
+-                case SUCCESS:
+-                    return true;
+-                case FAILURE:
+-                    throw new WaiterUnrecoverableException("Resource never entered the desired state as it failed.");
+-                case RETRY:
+-                    PollingStrategyContext pollingStrategyContext = new PollingStrategyContext(request, retriesAttempted);
+-                    if (pollingStrategy.getRetryStrategy().shouldRetry(pollingStrategyContext)) {
+-                        safeCustomDelay(pollingStrategyContext);
+-                        retriesAttempted++;
+-                    } else {
+-
+-                        throw new WaiterTimedOutException("Reached maximum attempts without transitioning to the desired state");
+-                    }
+-                    break;
+-            }
+-
+-        }
+-    }
+-
+-    /**
+-     * Fetches the current state of the resource based on the acceptor it matches
+-     *
+-     * @return Current state of the resource
+-     * @throws Exception
+-     */
+-    private WaiterState getCurrentState() throws AmazonServiceException {
+-        try {
+-            return acceptor.accepts(sdkFunction.apply(request));
+-        } catch (AmazonServiceException amazonServiceException) {
+-            return acceptor.accepts(amazonServiceException);
+-        }
+-
+-    }
+-
+-    /**
+-     * Calls the custom delay strategy to control the sleep time
+-     *
+-     * @param pollingStrategyContext Provides the polling strategy context.
+-     *                               Includes request and number of retries
+-     *                               attempted so far.
+-     */
+-    private void safeCustomDelay(PollingStrategyContext pollingStrategyContext) {
+-        try {
+-            pollingStrategy.getDelayStrategy().delayBeforeNextRetry(pollingStrategyContext);
+-        } catch (InterruptedException e) {
+-            Thread.currentThread().interrupt();
+-            throw new RuntimeException(e);
+-        }
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/waiters/WaiterHandler.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/WaiterHandler.java
+--- ./src/main/java/com/amazonaws/waiters/WaiterHandler.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/WaiterHandler.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,30 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.waiters;
+-
+-import com.amazonaws.AmazonWebServiceRequest;
+-
+-/**
+- * Callbacks are executed synchronously. That is the same thread the waiter
+- * completes on and it's not submitted back to the executor.
+- */
+-public abstract class WaiterHandler {
+-
+-    public abstract void onWaitSuccess(Input request);
+-
+-    public abstract void onWaitFailure(Exception e);
+-}
+-
+diff -Nau8r ./src/main/java/com/amazonaws/waiters/WaiterImpl.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/WaiterImpl.java
+--- ./src/main/java/com/amazonaws/waiters/WaiterImpl.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/WaiterImpl.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,122 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.waiters;
+-
+-import com.amazonaws.AmazonServiceException;
+-import com.amazonaws.AmazonWebServiceRequest;
+-import com.amazonaws.annotation.SdkProtectedApi;
+-import com.amazonaws.util.ValidationUtils;
+-
+-import java.util.List;
+-import java.util.concurrent.ExecutorService;
+-import java.util.concurrent.Future;
+-
+-@SdkProtectedApi
+-public class WaiterImpl implements Waiter{
+-
+-    /**
+-     * Represents the operation function
+-     */
+-    private final SdkFunction sdkFunction;
+-
+-    /**
+-     * List of acceptors
+-     */
+-    private final List> acceptors;
+-
+-    /**
+-     * Represents the default polling strategy
+-     */
+-    private final PollingStrategy defaultPollingStrategy;
+-
+-    private final ExecutorService executorService;
+-
+-    /**
+-     * Constructs a new waiter with the given internal parameters
+-     *
+-     * @param waiterBuilder Takes in default parameters and builds a
+-     *                      basic waiter. Excludes request and custom
+-     *                      polling strategy parameters.
+-     */
+-    @SdkProtectedApi
+-    public WaiterImpl(WaiterBuilder waiterBuilder) {
+-        this.sdkFunction = ValidationUtils.assertNotNull(waiterBuilder.getSdkFunction(), "sdkFunction");
+-        this.acceptors = ValidationUtils.assertNotNull(waiterBuilder.getAcceptor(), "acceptors");
+-        this.defaultPollingStrategy = ValidationUtils.assertNotNull(waiterBuilder.getDefaultPollingStrategy(), "defaultPollingStrategy");
+-        this.executorService = ValidationUtils.assertNotNull(waiterBuilder.getExecutorService(), "executorService");
+-    }
+-
+-    /**
+-     * Polls synchronously until it is determined that the resource
+-     * transitioned into the desired state or not.
+-     *
+-     * @param waiterParameters Custom provided parameters. Includes request and
+-     *                         optional custom polling strategy
+-     * @throws AmazonServiceException       If the service exception thrown doesn't match any of the expected
+-     *                                      exceptions, it's re-thrown.
+-     * @throws WaiterUnrecoverableException If the resource transitions into a failure/unexpected state.
+-     * @throws WaiterTimedOutException      If the resource doesn't transition into the desired state
+-     *                                      even after a certain number of retries.
+-     */
+-    public void run(WaiterParameters waiterParameters)
+-            throws AmazonServiceException, WaiterTimedOutException, WaiterUnrecoverableException {
+-
+-        ValidationUtils.assertNotNull(waiterParameters, "waiterParameters");
+-        @SuppressWarnings("unchecked")
+-        Input request = (Input) ValidationUtils.assertNotNull(waiterParameters.getRequest(), "request").clone();
+-        request.getRequestClientOptions().appendUserAgent("waiter-request");
+-        WaiterExecution waiterExecution = new WaiterExecutionBuilder()
+-                .withRequest(request)
+-                .withPollingStrategy(waiterParameters.getPollingStrategy() != null ? waiterParameters.getPollingStrategy() : defaultPollingStrategy)
+-                .withAcceptors(acceptors)
+-                .withSdkFunction(sdkFunction)
+-                .build();
+-
+-        waiterExecution.pollResource();
+-
+-    }
+-
+-    /**
+-     * Polls asynchronously until it is determined that the resource
+-     * transitioned into the desired state or not. Includes additional
+-     * callback.
+-     *
+-     * @param waiterParameters Custom provided parameters. Includes request and
+-     *                         optional custom polling strategy
+-     * @param callback         Custom callback
+-     * @return Future object that holds the result of an asynchronous
+-     * computation of waiter
+-     */
+-    public Future runAsync(final WaiterParameters waiterParameters, final WaiterHandler callback)
+-            throws AmazonServiceException, WaiterTimedOutException, WaiterUnrecoverableException {
+-
+-        return executorService.submit(new java.util.concurrent.Callable() {
+-            @Override
+-            public Void call() throws Exception {
+-                try {
+-                    run(waiterParameters);
+-                    callback.onWaitSuccess(waiterParameters.getRequest());
+-                } catch (Exception ex) {
+-                    callback.onWaitFailure(ex);
+-
+-                    throw ex;
+-                }
+-                return null;
+-            }
+-        });
+-
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/waiters/Waiter.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/Waiter.java
+--- ./src/main/java/com/amazonaws/waiters/Waiter.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/Waiter.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,53 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.waiters;
+-
+-import com.amazonaws.AmazonServiceException;
+-import com.amazonaws.AmazonWebServiceRequest;
+-
+-import java.util.concurrent.Future;
+-
+-public interface Waiter {
+-
+-    /**
+-     * Polls synchronously until it is determined that the resource
+-     * transitioned into the desired state or not.
+-     *
+-     * @param waiterParameters Custom provided parameters. Includes request and
+-     *                         optional custom polling strategy
+-     * @throws AmazonServiceException       If the service exception thrown doesn't match any of the expected
+-     *                                      exceptions, it's re-thrown.
+-     * @throws WaiterUnrecoverableException If the resource transitions into a failure/unexpected state.
+-     * @throws WaiterTimedOutException      If the resource doesn't transition into the desired state
+-     *                                      even after a certain number of retries.
+-     */
+-    void run(WaiterParameters waiterParameters)
+-            throws AmazonServiceException, WaiterTimedOutException, WaiterUnrecoverableException;
+-
+-    /**
+-     * Polls asynchronously until it is determined that the resource
+-     * transitioned into the desired state or not. Includes additional
+-     * callback.
+-     *
+-     * @param waiterParameters Custom provided parameters. Includes request and
+-     *                         optional custom polling strategy
+-     * @param callback         Custom callback
+-     * @return Future object that holds the result of an asynchronous
+-     * computation of waiter
+-     */
+-    Future runAsync(final WaiterParameters waiterParameters, final WaiterHandler callback)
+-            throws AmazonServiceException, WaiterTimedOutException, WaiterUnrecoverableException;
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/waiters/WaiterParameters.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/WaiterParameters.java
+--- ./src/main/java/com/amazonaws/waiters/WaiterParameters.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/WaiterParameters.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,89 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.waiters;
+-
+-import com.amazonaws.AmazonWebServiceRequest;
+-
+-public final class WaiterParameters {
+-
+-    /**
+-     * Represents the input of the operation.
+-     */
+-    private final Input request;
+-
+-    /**
+-     * Represents the custom polling strategy. Will be null
+-     * if not defined
+-     */
+-    private final PollingStrategy pollingStrategy;
+-
+-    public WaiterParameters() {
+-        this.request = null;
+-        this.pollingStrategy = null;
+-    }
+-
+-    public WaiterParameters(Input request) {
+-        this.request = request;
+-        this.pollingStrategy = null;
+-    }
+-
+-    /**
+-     * Constructs a new WaiterParameters with the given request
+-     * and polling strategy
+-     *
+-     * @param request         Input of the operation
+-     * @param pollingStrategy Custom polling strategy
+-     * @return WaiterParameters object with custom polling strategy defined
+-     */
+-    private WaiterParameters(Input request, PollingStrategy pollingStrategy) {
+-        this.request = request;
+-        this.pollingStrategy = pollingStrategy;
+-    }
+-
+-    /**
+-     * Constructs a new WaiterParameters with the given request
+-     *
+-     * @param request Input of the operation
+-     * @return WaiterParameters Object
+-     */
+-    public WaiterParameters withRequest(Input request) {
+-        return new WaiterParameters(request, this.pollingStrategy);
+-    }
+-
+-    /**
+-     * Constructs a new WaiterParameters with the given polling strategy
+-     *
+-     * @param pollingStrategy Custom polling strategy
+-     * @return WaiterParameters Object
+-     */
+-    public WaiterParameters withPollingStrategy(PollingStrategy pollingStrategy) {
+-        return new WaiterParameters(this.request, pollingStrategy);
+-    }
+-
+-    /**
+-     * @return Input of the operation
+-     */
+-    public Input getRequest() {
+-        return this.request;
+-    }
+-
+-    /**
+-     * @return Custom Polling Strategy
+-     */
+-    public PollingStrategy getPollingStrategy() {
+-        return this.pollingStrategy;
+-    }
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/waiters/WaiterState.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/WaiterState.java
+--- ./src/main/java/com/amazonaws/waiters/WaiterState.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/WaiterState.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,27 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.waiters;
+-
+-import com.amazonaws.annotation.SdkProtectedApi;
+-
+-@SdkProtectedApi
+-public enum WaiterState {
+-    /**
+-     * Three different states a resource can be based
+-     * on the waiter definition
+-     */
+-    SUCCESS, RETRY, FAILURE
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/waiters/WaiterTimedOutException.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/WaiterTimedOutException.java
+--- ./src/main/java/com/amazonaws/waiters/WaiterTimedOutException.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/WaiterTimedOutException.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,32 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.waiters;
+-
+-import com.amazonaws.SdkClientException;
+-
+-public class WaiterTimedOutException extends SdkClientException {
+-
+-    /**
+-     * Constructs a new WaiterTimedOutException with the specified error
+-     * message.
+-     *
+-     * @param message Describes the error encountered.
+-     */
+-    public WaiterTimedOutException(String message) {
+-        super(message);
+-    }
+-
+-}
+diff -Nau8r ./src/main/java/com/amazonaws/waiters/WaiterUnrecoverableException.java /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/WaiterUnrecoverableException.java
+--- ./src/main/java/com/amazonaws/waiters/WaiterUnrecoverableException.java	2018-03-16 22:25:16.000000000 -0700
++++ /home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/waiters/WaiterUnrecoverableException.java	1969-12-31 16:00:00.000000000 -0800
+@@ -1,32 +0,0 @@
+-/*
+- * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- *  http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-package com.amazonaws.waiters;
+-
+-import com.amazonaws.SdkClientException;
+-
+-public class WaiterUnrecoverableException extends SdkClientException {
+-
+-    /**
+-     * Constructs a new WaiterUnrecoverableException with the specified error
+-     * message.
+-     *
+-     * @param message Describes the error encountered.
+-     */
+-    public WaiterUnrecoverableException(String message) {
+-        super(message);
+-    }
+-
+-}
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue107.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue107.diff
new file mode 100644
index 00000000..72d4e0d6
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue107.diff
@@ -0,0 +1,13 @@
+--- a/Main.java
++++ b/Main.java
+@@ -2,2 +2,3 @@ public class Main {
+     public static void main(String[] args) {
++        System.out.println("Hello, world!");
+     }
+\ No newline at end of file
+--- a/Main2.java
++++ b/Main2.java
+@@ -2,2 +2,3 @@ public class Main {
+     public static void main(String[] args) {
++        System.out.println("Hello, world!");
+     }
\ No newline at end of file

From e59e9e83791d5cc08349383f17d36b6c7c87bf25 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 19 Dec 2020 00:12:55 +0100
Subject: [PATCH 154/266] fixes #107 process "\ No newline at end of file"

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 660f9d67..e0f364f1 100644
--- a/README.md
+++ b/README.md
@@ -88,7 +88,7 @@ Just add the code below to your maven dependencies:
 
     io.github.java-diff-utils
     java-diff-utils
-    4.5
+    4.9
 
 ```
 

From 642dc659f1fee533fffff687a9f24547dacb1d23 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 19 Dec 2020 00:17:54 +0100
Subject: [PATCH 155/266] fixes #107 process "\ No newline at end of file"

---
 .../com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
index bdc8db9c..c184b84d 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -256,7 +256,7 @@ public void testParseIssue104() throws IOException {
     @Test
     public void testParseIssue107BazelDiff() throws IOException {
         UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
-                UnifiedDiffReaderTest.class.getResourceAsStream("01-bazel-strip-unused.patch.diff"));
+                UnifiedDiffReaderTest.class.getResourceAsStream("01-bazel-strip-unused.patch_issue107.diff"));
 
         assertThat(diff.getFiles().size()).isEqualTo(450);
 

From fb0837fd738c8dd1237e9b9aa5bc66587a7d41c4 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 19 Dec 2020 00:21:09 +0100
Subject: [PATCH 156/266] fixes #107 process "\ No newline at end of file"

---
 .../com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
index c184b84d..337c840d 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -250,7 +250,7 @@ public void testParseIssue104() throws IOException {
                 
         assertThat(file.getPatch().toString()).isEqualTo("Patch{deltas=[[ChangeDelta, position: 0, lines: [] to [@SAMBA_DATA_TOOL@]]]}");
 
-        assertThat(diff.getTail()).isEqualTo("2.14.4");
+        assertThat(diff.getTail()).isEqualTo("2.14.4"); 
     }
     
     @Test

From 7da297322b3d290455c6f625224c8969ef6bed8e Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Thu, 24 Dec 2020 00:49:10 +0100
Subject: [PATCH 157/266] fixes #110 support for similarity index, rename from,
 rename to

---
 .../difflib/unifieddiff/UnifiedDiffFile.java  |  32 ++-
 .../unifieddiff/UnifiedDiffReader.java        |  27 +-
 .../difflib/unifieddiff/package-info.java     |   9 +-
 .../unifieddiff/UnifiedDiffReaderTest.java    |  34 ++-
 ...ython-Use-the-agnostic-DBM-interface.patch | 231 ++++++++++++++++++
 .../src/test/resources/logging.properties     |   2 +-
 6 files changed, 319 insertions(+), 16 deletions(-)
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/0001-avahi-python-Use-the-agnostic-DBM-interface.patch

diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java
index 13ff9363..099f4142 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java
@@ -18,7 +18,8 @@
 import com.github.difflib.patch.Patch;
 
 /**
- *
+ * Data structure for one patched file from a unified diff file. 
+ * 
  * @author Tobias Warneke (t.warneke@gmx.net)
  */
 public final class UnifiedDiffFile {
@@ -27,12 +28,15 @@ public final class UnifiedDiffFile {
     private String fromFile;
     private String fromTimestamp;
     private String toFile;
+    private String renameFrom;
+    private String renameTo;
     private String toTimestamp;
     private String index;
     private String newFileMode;
     private String deletedFileMode;
     private Patch patch = new Patch<>();
     private boolean noNewLineAtTheEndOfTheFile = false;
+    private Integer similarityIndex;
 
     public String getDiffCommand() {
         return diffCommand;
@@ -85,8 +89,30 @@ public String getToTimestamp() {
     public void setToTimestamp(String toTimestamp) {
         this.toTimestamp = toTimestamp;
     }
-    
-    
+
+    public Integer getSimilarityIndex() {
+        return similarityIndex;
+    }
+
+    public void setSimilarityIndex(Integer similarityIndex) {
+        this.similarityIndex = similarityIndex;
+    }
+
+    public String getRenameFrom() {
+        return renameFrom;
+    }
+
+    public void setRenameFrom(String renameFrom) {
+        this.renameFrom = renameFrom;
+    }
+
+    public String getRenameTo() {
+        return renameTo;
+    }
+
+    public void setRenameTo(String renameTo) {
+        this.renameTo = renameTo;
+    }
 
     public static UnifiedDiffFile from(String fromFile, String toFile, Patch patch) {
         UnifiedDiffFile file = new UnifiedDiffFile();
diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
index bac87590..1a69cccc 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
@@ -45,9 +45,12 @@ public final class UnifiedDiffReader {
     private final UnifiedDiff data = new UnifiedDiff();
 
     private final UnifiedDiffLine DIFF_COMMAND = new UnifiedDiffLine(true, "^diff\\s", this::processDiff);
+    private final UnifiedDiffLine SIMILARITY_INDEX = new UnifiedDiffLine(true, "^similarity index (\\d+)%$", this::processSimilarityIndex);
     private final UnifiedDiffLine INDEX = new UnifiedDiffLine(true, "^index\\s[\\da-zA-Z]+\\.\\.[\\da-zA-Z]+(\\s(\\d+))?$", this::processIndex);
     private final UnifiedDiffLine FROM_FILE = new UnifiedDiffLine(true, "^---\\s", this::processFromFile);
     private final UnifiedDiffLine TO_FILE = new UnifiedDiffLine(true, "^\\+\\+\\+\\s", this::processToFile);
+    private final UnifiedDiffLine RENAME_FROM = new UnifiedDiffLine(true, "^rename\\sfrom\\s(.+)$", this::processRenameFrom);
+    private final UnifiedDiffLine RENAME_TO = new UnifiedDiffLine(true, "^rename\\sto\\s(.+)$", this::processRenameTo);
 
     private final UnifiedDiffLine NEW_FILE_MODE = new UnifiedDiffLine(true, "^new\\sfile\\smode\\s(\\d+)", this::processNewFileMode);
     
@@ -91,7 +94,10 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
             if (!CHUNK.validLine(line)) {
                 initFileIfNecessary();
                 while (line != null && !CHUNK.validLine(line)) {
-                    if (!processLine(line, DIFF_COMMAND, INDEX, FROM_FILE, TO_FILE, NEW_FILE_MODE, DELETED_FILE_MODE)) {
+                    if (!processLine(line, DIFF_COMMAND, SIMILARITY_INDEX, INDEX, 
+                            FROM_FILE, TO_FILE, 
+                            RENAME_FROM, RENAME_TO, 
+                            NEW_FILE_MODE, DELETED_FILE_MODE)) {
                         throw new UnifiedDiffParserException("expected file start line not found");
                     }
                     line = READER.readLine();
@@ -146,6 +152,13 @@ static String[] parseFileNames(String line) {
 
     private static final Logger LOG = Logger.getLogger(UnifiedDiffReader.class.getName());
 
+    /**
+     * To parse a diff file use this method. 
+     * @param stream This is the diff file data.
+     * @return In a UnifiedDiff structure this diff file data is returned.
+     * @throws IOException
+     * @throws UnifiedDiffParserException 
+     */
     public static UnifiedDiff parseUnifiedDiff(InputStream stream) throws IOException, UnifiedDiffParserException {
         UnifiedDiffReader parser = new UnifiedDiffReader(new BufferedReader(new InputStreamReader(stream)));
         return parser.parse();
@@ -185,6 +198,10 @@ private void processDiff(MatchResult match, String line) {
         actualFile.setToFile(fromTo[1]);
         actualFile.setDiffCommand(line);
     }
+    
+    private void processSimilarityIndex(MatchResult match, String line) {
+        actualFile.setSimilarityIndex(Integer.valueOf(match.group(1)));
+    }
 
     private List originalTxt = new ArrayList<>();
     private List revisedTxt = new ArrayList<>();
@@ -256,6 +273,14 @@ private void processToFile(MatchResult match, String line) {
         actualFile.setToFile(extractFileName(line));
         actualFile.setToTimestamp(extractTimestamp(line));
     }
+    
+    private void processRenameFrom(MatchResult match, String line) {
+        actualFile.setRenameFrom(match.group(1));
+    }
+
+    private void processRenameTo(MatchResult match, String line) {
+        actualFile.setRenameTo(match.group(1));
+    }
 
     private void processNewFileMode(MatchResult match, String line) {
         //initFileIfNecessary();
diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/package-info.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/package-info.java
index 49edc687..7384d414 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/package-info.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/package-info.java
@@ -14,7 +14,12 @@
  * limitations under the License.
  */
 /**
- * This is the first test version of a multifile diff parser. The Api is still subject
- * of change.
+ * This is the new implementation of UnifiedDiff Tools. This version is multi file aware.
+ * 

+ * To read a unified diff file you should use {@link UnifiedDiffReader#parseUnifiedDiff}.
+ * You will get a {@link UnifiedDiff} that holds all informations about the
+ * diffs and the files.
+ * 

+ * To process the UnifiedDiff use {@link UnifiedDiffWriter#write}.
  */
 package com.github.difflib.unifieddiff;
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
index 337c840d..38cf3133 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -155,7 +155,7 @@ public void testParseIssue51() throws IOException {
         UnifiedDiffFile file1 = diff.getFiles().get(0);
         assertThat(file1.getFromFile()).isEqualTo("f1");
         assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
-        
+
         UnifiedDiffFile file2 = diff.getFiles().get(1);
         assertThat(file2.getFromFile()).isEqualTo("f2");
         assertThat(file2.getPatch().getDeltas().size()).isEqualTo(1);
@@ -220,7 +220,7 @@ public void testParseIssue85() throws IOException {
     public void testTimeStampRegexp() {
         assertThat("2019-04-18 13:49:39.516149751 +0200").matches(UnifiedDiffReader.TIMESTAMP_REGEXP);
     }
-    
+
     @Test
     public void testParseIssue98() throws IOException {
         UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
@@ -236,7 +236,7 @@ public void testParseIssue98() throws IOException {
         assertEquals("src/test/java/se/bjurr/violations/lib/model/ViolationTest.java", file1.getFromFile());
         assertThat(diff.getTail()).isEqualTo("2.25.1");
     }
-    
+
     @Test
     public void testParseIssue104() throws IOException {
         UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
@@ -247,12 +247,12 @@ public void testParseIssue104() throws IOException {
         final UnifiedDiffFile file = diff.getFiles().get(2);
         assertThat(file.getFromFile()).isEqualTo("/dev/null");
         assertThat(file.getToFile()).isEqualTo("doc/samba_data_tool_path.xml.in");
-                
+
         assertThat(file.getPatch().toString()).isEqualTo("Patch{deltas=[[ChangeDelta, position: 0, lines: [] to [@SAMBA_DATA_TOOL@]]]}");
 
-        assertThat(diff.getTail()).isEqualTo("2.14.4"); 
+        assertThat(diff.getTail()).isEqualTo("2.14.4");
     }
-    
+
     @Test
     public void testParseIssue107BazelDiff() throws IOException {
         UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
@@ -263,13 +263,13 @@ public void testParseIssue107BazelDiff() throws IOException {
         final UnifiedDiffFile file = diff.getFiles().get(0);
         assertThat(file.getFromFile()).isEqualTo("./src/main/java/com/amazonaws/AbortedException.java");
         assertThat(file.getToFile()).isEqualTo("/home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/AbortedException.java");
-                
+
         assertThat(diff.getFiles().stream()
                 .filter(f -> f.isNoNewLineAtTheEndOfTheFile())
                 .count())
-                    .isEqualTo(48);
+                .isEqualTo(48);
     }
-    
+
     @Test
     public void testParseIssue107_2() throws IOException {
         UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
@@ -281,6 +281,22 @@ public void testParseIssue107_2() throws IOException {
         UnifiedDiffFile file1 = diff.getFiles().get(0);
         assertThat(file1.getFromFile()).isEqualTo("Main.java");
         assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
+
+    }
+
+    @Test
+    public void testParseIssue110() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("0001-avahi-python-Use-the-agnostic-DBM-interface.patch"));
+
+        assertThat(diff.getFiles().size()).isEqualTo(5);
+
+        final UnifiedDiffFile file = diff.getFiles().get(4);
+        assertThat(file.getSimilarityIndex()).isEqualTo(87);
+        assertThat(file.getRenameFrom()).isEqualTo("service-type-database/build-db.in");
+        assertThat(file.getRenameTo()).isEqualTo("service-type-database/build-db");
         
+        assertThat(file.getFromFile()).isEqualTo("service-type-database/build-db.in");
+        assertThat(file.getToFile()).isEqualTo("service-type-database/build-db");   
     }
 }
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/0001-avahi-python-Use-the-agnostic-DBM-interface.patch b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/0001-avahi-python-Use-the-agnostic-DBM-interface.patch
new file mode 100644
index 00000000..7ed31e1d
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/0001-avahi-python-Use-the-agnostic-DBM-interface.patch
@@ -0,0 +1,231 @@
+From be7992f35ab4ed7ed9907319b429dc079c2b7285 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" 
+Date: Tue, 11 Jul 2017 21:52:37 +0200
+Subject: [PATCH] avahi-python: Use the agnostic DBM interface
+
+Also fixes configure failing if Python 3 is the build python and GDBM is
+enabled, since Py3 only has anydbm under the name of 'dbm'.
+
+Not enough to make ServiceTypeDatabase.py compatible with Py3, but it's
+a start.
+
+(cherry picked from commit 63750f1be96ad08c407193b08bf3b9ee74310e2d)
+
+Related: #1561019
+---
+ avahi-python/avahi/Makefile.am                  | 15 +----------
+ avahi-python/avahi/ServiceTypeDatabase.py.in    | 33 ++++++++++++++++++-------
+ configure.ac                                    |  9 +++----
+ service-type-database/Makefile.am               | 18 +++-----------
+ service-type-database/{build-db.in => build-db} | 13 +++++++---
+ 5 files changed, 42 insertions(+), 46 deletions(-)
+ rename service-type-database/{build-db.in => build-db} (87%)
+
+diff --git a/avahi-python/avahi/Makefile.am b/avahi-python/avahi/Makefile.am
+index 3eb67d0..c906b9b 100644
+--- a/avahi-python/avahi/Makefile.am
++++ b/avahi-python/avahi/Makefile.am
+@@ -25,29 +25,16 @@ avahidir = $(pythondir)/avahi
+ 
+ if HAVE_GDBM
+ nodist_avahi_SCRIPTS = ServiceTypeDatabase.py
+-
+-ServiceTypeDatabase.py: ServiceTypeDatabase.py.in
+-	$(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \
+-		-e 's,@DBM\@,gdbm,g' \
+-		-e 's,@FIRST_KEY\@,key = self.db.firstkey(),g' \
+-		-e 's,@CHECK_KEY\@,while key is not None:,g' \
+-		-e 's,@NEXT_KEY\@,key = self.db.nextkey(key),g' \
+-		-e 's,@pkglibdatadir\@,$(pkglibdatadir),g' $< > $@ && \
+-	chmod +x $@
+ endif
+ 
+ if HAVE_DBM
+ nodist_avahi_SCRIPTS = ServiceTypeDatabase.py
++endif
+ 
+ ServiceTypeDatabase.py: ServiceTypeDatabase.py.in
+ 	$(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \
+-		-e 's,@DBM\@,dbm,g' \
+-		-e 's,@FIRST_KEY\@,keys = self.db.keys(),g' \
+-		-e 's,@CHECK_KEY\@,for key in keys:,g' \
+-		-e 's,@NEXT_KEY\@,,g' \
+ 		-e 's,@pkglibdatadir\@,$(pkglibdatadir),g' $< > $@ && \
+ 	chmod +x $@
+-endif
+ 
+ avahi_PYTHON = $(avahi_SCRIPTS)
+ 
+diff --git a/avahi-python/avahi/ServiceTypeDatabase.py.in b/avahi-python/avahi/ServiceTypeDatabase.py.in
+index 4ddd654..d7f9969 100644
+--- a/avahi-python/avahi/ServiceTypeDatabase.py.in
++++ b/avahi-python/avahi/ServiceTypeDatabase.py.in
+@@ -17,7 +17,11 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ # USA.
+ 
+-import @DBM@
++try:
++    import anydbm as dbm
++except ImportError:
++    import dbm
++
+ import locale
+ import re
+ 
+@@ -28,7 +32,7 @@ class ServiceTypeDatabase:
+ 
+     def __init__(self, filename = "@pkglibdatadir@/service-types.db"):
+ 
+-        self.db = @DBM@.open(filename, "r")
++        self.db = dbm.open(filename, "r")
+ 
+         l = locale.getlocale(locale.LC_MESSAGES)
+ 
+@@ -90,13 +94,24 @@ class ServiceTypeDatabase:
+ 
+     def __iter__(self):
+ 
+-        @FIRST_KEY@
+-        @CHECK_KEY@
+-
+-            if re.search('_[a-zA-Z0-9-]+\._[a-zA-Z0-9-]+', key) and not re.search('_[a-zA-Z0-9-]+\._[a-zA-Z0-9-]+\[.*\]', key):
+-                yield key
+-
+-            @NEXT_KEY@
++        def want_key(key):
++            if not re.search('_[a-zA-Z0-9-]+\._[a-zA-Z0-9-]+', key):
++                return False
++            if re.search('_[a-zA-Z0-9-]+\._[a-zA-Z0-9-]+\[.*\]', key):
++                return False
++            return True
++
++        try:
++            key = self.db.firstkey()
++        except AttributeError:
++            for key in self.db.keys():
++                if want_key(key):
++                    yield key
++        else:
++            while key is not None:
++                if want_key(key):
++                    yield key
++                key = self.db.nextkey(key)
+ 
+     def __len__(self):
+ 
+diff --git a/configure.ac b/configure.ac
+index 6678971..fbbf7cf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -824,11 +824,10 @@ if test "x$HAVE_PYTHON" = "xyes" ; then
+         fi
+ 
+         AM_CHECK_PYMOD(socket,,,[AC_MSG_ERROR(Could not find Python module socket)])
+-        if test "x$HAVE_GDBM" = "xyes"; then
+-            AM_CHECK_PYMOD(gdbm,,,[AC_MSG_ERROR(Could not find Python module gdbm)])
+-        fi
+-        if test "x$HAVE_DBM" = "xyes"; then
+-            AM_CHECK_PYMOD(dbm,,,[AC_MSG_ERROR(Could not find Python module dbm)])
++        if test "x$HAVE_GDBM" = "xyes" || test "x$HAVE_DBM" = "xyes"; then
++            AM_CHECK_PYMOD(anydbm,,,[
++                AM_CHECK_PYMOD(dbm,,,[AC_MSG_ERROR(Could not find Python module dbm)])
++            ])
+         fi
+     fi
+ fi
+diff --git a/service-type-database/Makefile.am b/service-type-database/Makefile.am
+index d184fde..f9fa082 100644
+--- a/service-type-database/Makefile.am
++++ b/service-type-database/Makefile.am
+@@ -15,7 +15,7 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ # USA.
+ 
+-EXTRA_DIST=build-db.in service-types
++EXTRA_DIST=service-types
+ 
+ pkglibdatadir=$(libdir)/avahi
+ 
+@@ -27,16 +27,11 @@ if HAVE_GDBM
+ noinst_SCRIPTS=build-db
+ pkglibdata_DATA+=service-types.db
+ 
+-build-db: build-db.in
+-	$(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \
+-	    -e 's,@DBM\@,gdbm,g' $< > $@ && \
+-	chmod +x $@
+-
+-service-types.db: service-types build-db
++service-types.db: service-types
+ 	$(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \
+ 	mv $@.coming $@
+ 
+-CLEANFILES = service-types.db build-db
++CLEANFILES = service-types.db
+ 
+ endif
+ if HAVE_DBM
+@@ -44,11 +39,6 @@ if HAVE_DBM
+ noinst_SCRIPTS=build-db
+ pkglibdata_DATA+=service-types.db.pag service-types.db.dir
+ 
+-build-db: build-db.in
+-	$(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \
+-	    -e 's,@DBM\@,dbm,g' $< > $@ && \
+-	chmod +x $@
+-
+ service-types.db.pag: service-types.db
+ 	$(AM_V_GEN)mv service-types.db.coming.pag service-types.db.pag
+ service-types.db.dir: service-types.db
+@@ -57,7 +47,7 @@ service-types.db: service-types build-db
+ 	$(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \
+ 	if test -f "$@.coming"; then mv $@.coming $@; fi
+ 
+-CLEANFILES = service-types.db* build-db
++CLEANFILES = service-types.db*
+ 
+ endif
+ endif
+diff --git a/service-type-database/build-db.in b/service-type-database/build-db
+similarity index 87%
+rename from service-type-database/build-db.in
+rename to service-type-database/build-db
+index 4cda425..78ee892 100755
+--- a/service-type-database/build-db.in
++++ b/service-type-database/build-db
+@@ -1,4 +1,4 @@
+-#!@PYTHON@
++#!/usr/bin/env python
+ # -*-python-*-
+ # This file is part of avahi.
+ #
+@@ -17,7 +17,12 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ # USA.
+ 
+-import @DBM@, sys
++try:
++    import anydbm as dbm
++except ImportError:
++    import dbm
++
++import sys
+ 
+ if len(sys.argv) > 1:
+     infn = sys.argv[1]
+@@ -29,9 +34,9 @@ if len(sys.argv) > 2:
+ else:
+     outfn = infn + ".db"
+ 
+-db = @DBM@.open(outfn, "n")
++db = dbm.open(outfn, "n")
+ 
+-for ln in file(infn, "r"):
++for ln in open(infn, "r"):
+     ln = ln.strip(" \r\n\t")
+     
+     if ln == "" or ln.startswith("#"):
+-- 
+2.14.3
+
diff --git a/java-diff-utils/src/test/resources/logging.properties b/java-diff-utils/src/test/resources/logging.properties
index 4c1655b6..631461f0 100644
--- a/java-diff-utils/src/test/resources/logging.properties
+++ b/java-diff-utils/src/test/resources/logging.properties
@@ -3,6 +3,6 @@ handlers=java.util.logging.ConsoleHandler
 .level=INFO
 com.github.difflib.unifieddiff.level=FINE
 
-java.util.logging.ConsoleHandler.level=INFO
+java.util.logging.ConsoleHandler.level=FINE
 #java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
 

From 4061ab6c579691cb3885a86fc3bfb86402f8a5d4 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Thu, 24 Dec 2020 00:51:29 +0100
Subject: [PATCH 158/266] fixes #110 support for similarity index, rename from,
 rename to

---
 java-diff-utils/src/test/resources/logging.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-diff-utils/src/test/resources/logging.properties b/java-diff-utils/src/test/resources/logging.properties
index 631461f0..4c1655b6 100644
--- a/java-diff-utils/src/test/resources/logging.properties
+++ b/java-diff-utils/src/test/resources/logging.properties
@@ -3,6 +3,6 @@ handlers=java.util.logging.ConsoleHandler
 .level=INFO
 com.github.difflib.unifieddiff.level=FINE
 
-java.util.logging.ConsoleHandler.level=FINE
+java.util.logging.ConsoleHandler.level=INFO
 #java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
 

From a9b5e5fa8855cf04fa46dab77f950edb9c2c06a9 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Wed, 30 Dec 2020 22:30:50 +0100
Subject: [PATCH 159/266] fixes #111 - replaced some GNU license including
 files

---
 .../src/test/resources/mocks/original.txt     | 320 ++++++------
 .../src/test/resources/mocks/revised.txt      | 458 +++++++-----------
 2 files changed, 325 insertions(+), 453 deletions(-)

diff --git a/java-diff-utils/src/test/resources/mocks/original.txt b/java-diff-utils/src/test/resources/mocks/original.txt
index 479dca0d..b78e4d9d 100644
--- a/java-diff-utils/src/test/resources/mocks/original.txt
+++ b/java-diff-utils/src/test/resources/mocks/original.txt
@@ -1,174 +1,164 @@
 /*
-    Copyright 2009 Dmitry Naumenko (dm.naumenko@gmail.com)
+ * Copyright 2009-2017 java-diff-utils.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.difflib;
+
+import com.github.difflib.algorithm.DiffAlgorithmI;
+import com.github.difflib.algorithm.DiffAlgorithmListener;
+import com.github.difflib.algorithm.myers.MyersDiff;
+import com.github.difflib.patch.AbstractDelta;
+import com.github.difflib.patch.Patch;
+import com.github.difflib.patch.PatchFailedException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.BiPredicate;
+
+/**
+ * Implements the difference and patching engine
+ */
+public final class DiffUtils {
+
+    /**
+     * Computes the difference between the original and revised list of elements with default diff
+     * algorithm
+     *
+     * @param  types to be diffed
+     * @param original The original text. Must not be {@code null}.
+     * @param revised The revised text. Must not be {@code null}.
+     * @param progress progress listener
+     * @return The patch describing the difference between the original and revised sequences. Never
+     * {@code null}.
+     */
+    public static  Patch diff(List original, List revised, DiffAlgorithmListener progress) {
+        return DiffUtils.diff(original, revised, new MyersDiff<>(), progress);
+    }
+
+    public static  Patch diff(List original, List revised) {
+        return DiffUtils.diff(original, revised, new MyersDiff<>(), null);
+    }
     
-    This file is part of Java Diff Utills Library.
+    public static  Patch diff(List original, List revised, boolean includeEqualParts) {
+        return DiffUtils.diff(original, revised, new MyersDiff<>(), null, includeEqualParts);
+    }
 
-    Java Diff Utills Library is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+    /**
+     * Computes the difference between the original and revised text.
+     */
+    public static Patch diff(String sourceText, String targetText,
+            DiffAlgorithmListener progress) {
+        return DiffUtils.diff(
+                Arrays.asList(sourceText.split("\n")),
+                Arrays.asList(targetText.split("\n")), progress);
+    }
 
-    Java Diff Utills Library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+    /**
+     * Computes the difference between the original and revised list of elements with default diff
+     * algorithm
+     *
+     * @param source The original text. Must not be {@code null}.
+     * @param target The revised text. Must not be {@code null}.
+     *
+     * @param equalizer the equalizer object to replace the default compare algorithm
+     * (Object.equals). If {@code null} the default equalizer of the default algorithm is used..
+     * @return The patch describing the difference between the original and revised sequences. Never
+     * {@code null}.
+     */
+    public static  Patch diff(List source, List target,
+            BiPredicate equalizer) {
+        if (equalizer != null) {
+            return DiffUtils.diff(source, target,
+                    new MyersDiff<>(equalizer));
+        }
+        return DiffUtils.diff(source, target, new MyersDiff<>());
+    }
 
-    You should have received a copy of the GNU General Public License
-    along with Java Diff Utills Library.  If not, see .
-*/
-package difflib;
+    public static  Patch diff(List original, List revised,
+            DiffAlgorithmI algorithm, DiffAlgorithmListener progress) {
+        return diff(original, revised, algorithm, progress, false);
+    }
+    
+    /**
+     * Computes the difference between the original and revised list of elements with default diff
+     * algorithm
+     *
+     * @param original The original text. Must not be {@code null}.
+     * @param revised The revised text. Must not be {@code null}.
+     * @param algorithm The diff algorithm. Must not be {@code null}.
+     * @param progress The diff algorithm listener.
+     * @param includeEqualParts Include equal data parts into the patch.
+     * @return The patch describing the difference between the original and revised sequences. Never
+     * {@code null}.
+     */
+    public static  Patch diff(List original, List revised,
+            DiffAlgorithmI algorithm, DiffAlgorithmListener progress, 
+            boolean includeEqualParts) {
+        Objects.requireNonNull(original, "original must not be null");
+        Objects.requireNonNull(revised, "revised must not be null");
+        Objects.requireNonNull(algorithm, "algorithm must not be null");
 
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+        return Patch.generate(original, revised, algorithm.computeDiff(original, revised, progress), includeEqualParts);
+    }
 
-import difflib.myers.*;
+    /**
+     * Computes the difference between the original and revised list of elements with default diff
+     * algorithm
+     *
+     * @param original The original text. Must not be {@code null}.
+     * @param revised The revised text. Must not be {@code null}.
+     * @param algorithm The diff algorithm. Must not be {@code null}.
+     * @return The patch describing the difference between the original and revised sequences. Never
+     * {@code null}.
+     */
+    public static  Patch diff(List original, List revised, DiffAlgorithmI algorithm) {
+        return diff(original, revised, algorithm, null);
+    }    
 
-/**
- * Implements the difference and patching engine
- * 
- * @author Dmitry Naumenko
- * @version 0.4.1
- */
-public class DiffUtils {
-	private static DiffAlgorithm defaultDiffAlgorithm = new MyersDiff();
-	private static Pattern unifiedDiffChunkRe = 
-		Pattern.compile("@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@");
-	
-	/**
-	 * Compute the difference between the original and revised texts with default diff algorithm 
-	 * 
-	 * @param original the original text
-	 * @param revised the revised text
-	 * @return the patch describing the difference between the original and revised texts 
-	 */
-	public static Patch diff(List original, List revised) {
-		return DiffUtils.diff(original, revised, defaultDiffAlgorithm);
-	}
-	
-	/**
-	 * Compute the difference between the original and revised texts with given diff algorithm 
-	 * 
-	 * @param original the original text
-	 * @param revised the revised text
-	 * @param algorithm the given algorithm
-	 * @return the patch describing the difference between the original and revised texts
-	 */
-	public static Patch diff(List original, List revised, DiffAlgorithm algorithm) {
-		return algorithm.diff(original, revised);
-	}
-	
-	/**
-	 * Patch the original text with given patch
-	 * 
-	 * @param original the original text
-	 * @param patch the given patch
-	 * @return the revised text
-	 * @throws PatchFailedException if can't apply patch
-	 */
-	public static List patch(List original, Patch patch) throws PatchFailedException {
-		return patch.applyTo(original);
-	}
-	
-	/**
-	 * Unpatch the revised text for a given patch
-	 * 
-	 * @param revised the revised text
-	 * @param patch the given patch
-	 * @return the original text
-	 */
-	public static List unpatch(List revised, Patch patch) {
-		return patch.restore(revised);
-	}
-	
-	/**
-	 * Parse the given text in unified format and creates the list of deltas for it.
-	 * 
-	 * @param diff the text in unified format 
-	 * @return the patch with deltas.
-	 */
-	public static Patch parseUnifiedDiff(List diff) {
-		boolean inPrelude = true;
-		List rawChunk = new ArrayList();
-		Patch patch = new Patch();
-		
-		int old_ln = 0, old_n = 0, new_ln = 0, new_n = 0;
-		String tag = "", rest = "";
-		for (String line: diff) {
-			// Skip leading lines until after we've seen one starting with '+++'
-			if (inPrelude) {
-				if (line.startsWith("+++")) {
-					inPrelude = false;
-				}
-				continue;
-			}
-			Matcher m = unifiedDiffChunkRe.matcher(line);
-			if (m.find()) {
-				// Process the lines in the previous chunk
-				if (rawChunk.size() != 0) {
-					List oldChunkLines = new ArrayList();
-					List newChunkLines = new ArrayList();
-					
-					for (Object[] raw_line: rawChunk) {
-						tag = (String)raw_line[0];
-						rest = (String)raw_line[1];
-						if (tag.equals(" ") || tag.equals("-")) {
-							oldChunkLines.add(rest);
-						}
-						if (tag.equals(" ") || tag.equals("+")) {
-							newChunkLines.add(rest);
-						}
-					}
-					patch.addDelta(new ChangeDelta(new Chunk(old_ln - 1, old_n, oldChunkLines),  
-							new Chunk(new_ln - 1, new_n, newChunkLines)));
-					rawChunk.clear();
-				}
-				// Parse the @@ header
-				old_ln = m.group(1) == null ? 1 : Integer.parseInt(m.group(1));
-				old_n  = m.group(2) == null ? 1 : Integer.parseInt(m.group(2));
-				new_ln = m.group(3) == null ? 1 : Integer.parseInt(m.group(3));
-				new_n  = m.group(4) == null ? 1 : Integer.parseInt(m.group(4));
-				old_ln = Integer.parseInt(m.group(1));
-				
-				if (old_ln == 0) {
-					old_ln += 1; 
-				}
-				if (new_ln == 0) {
-					new_ln += 1;
-				}
-			} else {
-				if (line.length() > 0) {
-					tag  = line.substring(0, 1);
-					rest = line.substring(1);
-					if (tag.equals(" ") || tag.equals("+") || tag.equals("-")) {
-						rawChunk.add(new Object[] {tag, rest});
-					}
-				}
-			}
-		}
-		
-		// Process the lines in the last chunk
-		if (rawChunk.size() != 0) {
-			List oldChunkLines = new ArrayList();
-			List newChunkLines = new ArrayList();
-			
-			for (Object[] raw_line: rawChunk) {
-				tag = (String)raw_line[0];
-				rest = (String)raw_line[1];
-				if (tag.equals(" ") || tag.equals("-")) {
-					oldChunkLines.add(rest);
-				} 
-				if (tag.equals(" ") || tag.equals("+")) {
-					newChunkLines.add(rest);
-				}
-			}
-			
-			patch.addDelta(new ChangeDelta(new Chunk(old_ln - 1, old_n, oldChunkLines),  
-					new Chunk(new_ln - 1, new_n, newChunkLines)));
-			rawChunk.clear();
-		}
-		
-		return patch;
-	}
-	
+    private static List compressLines(List lines, String delimiter) {
+        if (lines.isEmpty()) {
+            return Collections.emptyList();
+        }
+        return Collections.singletonList(String.join(delimiter, lines));
+    }
+
+    /**
+     * Patch the original text with given patch
+     *
+     * @param original the original text
+     * @param patch the given patch
+     * @return the revised text
+     * @throws PatchFailedException if can't apply patch
+     */
+    public static  List patch(List original, Patch patch)
+            throws PatchFailedException {
+        return patch.applyTo(original);
+    }
+
+    /**
+     * Unpatch the revised text for a given patch
+     *
+     * @param revised the revised text
+     * @param patch the given patch
+     * @return the original text
+     */
+    public static  List unpatch(List revised, Patch patch) {
+        return patch.restore(revised);
+    }
+
+    private DiffUtils() {
+    }
 }
diff --git a/java-diff-utils/src/test/resources/mocks/revised.txt b/java-diff-utils/src/test/resources/mocks/revised.txt
index 3c19df3e..2e950a91 100644
--- a/java-diff-utils/src/test/resources/mocks/revised.txt
+++ b/java-diff-utils/src/test/resources/mocks/revised.txt
@@ -1,308 +1,190 @@
 /*
-    Copyright 2009 Dmitry Naumenko (dm.naumenko@gmail.com)
-    
-    This file is part of Java Diff Utils Library.
-
-    Java Diff Utils Library is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Java Diff Utils Library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Java Diff Utils Library.  If not, see .
-*/
-package difflib;
-
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+ * Copyright 2009-2017 java-diff-utills.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.difflib;
 
-import difflib.myers.*;
+import com.github.difflib.algorithm.DiffAlgorithmI;
+import com.github.difflib.algorithm.DiffAlgorithmListener;
+import com.github.difflib.algorithm.myers.MyersDiff;
+import com.github.difflib.patch.AbstractDelta;
+import com.github.difflib.patch.Patch;
+import com.github.difflib.patch.PatchFailedException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.BiPredicate;
 
 /**
  * Implements the difference and patching engine
- * 
- * @author Dmitry Naumenko
- * @version 0.4.1
  */
-public class DiffUtils {
-	private static DiffAlgorithm defaultDiffAlgorithm = new MyersDiff();
-	private static Pattern unifiedDiffChunkRe = 
-		Pattern.compile("@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@");
-	
-	/**
-	 * Compute the difference between the original and revised texts with default diff algorithm 
-	 * 
-	 * @param original the original text
-	 * @param revised the revised text
-	 * @return the patch describing the difference between the original and revised texts 
-	 */
-	public static Patch diff(List original, List revised) {
-		return DiffUtils.diff(original, revised, defaultDiffAlgorithm);
-	}
-	
-	/**
-	 * Compute the difference between the original and revised texts with given diff algorithm 
-	 * 
-	 * @param original the original text
-	 * @param revised the revised text
-	 * @param algorithm the given algorithm
-	 * @return the patch describing the difference between the original and revised texts
-	 */
-	public static Patch diff(List original, List revised, DiffAlgorithm algorithm) {
-		return algorithm.diff(original, revised);
-	}
-	
-	/**
-	 * Patch the original text with given patch
-	 * 
-	 * @param original the original text
-	 * @param patch the given patch
-	 * @return the revised text
-	 * @throws PatchFailedException if can't apply patch
-	 */
-	public static List patch(List original, Patch patch) throws PatchFailedException {
-		return patch.applyTo(original);
-	}
-	
-	/**
-	 * Unpatch the revised text for a given patch
-	 * 
-	 * @param revised the revised text
-	 * @param patch the given patch
-	 * @return the original text
-	 */
-	public static List unpatch(List revised, Patch patch) {
-		return patch.restore(revised); // bla-bla-bla
-	}
-	
-	/**
-	 * Parse the given text in unified format and creates the list of deltas for it.
-	 * 
-	 * @param diff the text in unified format 
-	 * @return the patch with deltas.
-	 */
-	public static Patch parseUnifiedDiff(List diff) {
-		boolean inPrelude = true;
-		List rawChunk = new ArrayList();
-		Patch patch = new Patch();
-		
-		int old_ln = 0, old_n = 0, new_ln = 0, new_n = 0;
-		String tag = "", rest = "";
-		for (String line: diff) {
-			// Skip leading lines until after we've seen one starting with '+++'
-			if (inPrelude) {
-				if (line.startsWith("+++")) {
-					inPrelude = false;
-				}
-				continue;
-			}
-			Matcher m = unifiedDiffChunkRe.matcher(line);
-			if (m.find()) {
-				// Process the lines in the previous chunk
-				if (rawChunk.size() != 0) {
-					List oldChunkLines = new ArrayList();
-					List newChunkLines = new ArrayList();
-					
-					for (Object[] raw_line: rawChunk) {
-						tag = (String)raw_line[0];
-						rest = (String)raw_line[1];
-						if (tag.equals(" ") || tag.equals("-")) {
-							oldChunkLines.add(rest);
-						}
-						if (tag.equals(" ") || tag.equals("+")) {
-							newChunkLines.add(rest);
-						}
-					}
-					patch.addDelta(new ChangeDelta(new Chunk(old_ln - 1, old_n, oldChunkLines),  
-							new Chunk(new_ln - 1, new_n, newChunkLines)));
-					rawChunk.clear();
-				}
-				// Parse the @@ header
-				old_ln = m.group(1) == null ? 1 : Integer.parseInt(m.group(1));
-				old_n  = m.group(2) == null ? 1 : Integer.parseInt(m.group(2));
-				new_ln = m.group(3) == null ? 1 : Integer.parseInt(m.group(3));
-				new_n  = m.group(4) == null ? 1 : Integer.parseInt(m.group(4));
-				old_ln = Integer.parseInt(m.group(1));
-				
-				if (old_ln == 0) {
-					old_ln += 1; 
-				}
-				if (new_ln == 0) {
-					new_ln += 1;
-				}
-			} else {
-				if (line.length() > 0) {
-					tag  = line.substring(0, 1);
-					rest = line.substring(1);
-					if (tag.equals(" ") || tag.equals("+") || tag.equals("-")) {
-						rawChunk.add(new Object[] {tag, rest});
-					}
-				}
-			}
-		}
-		
-		// Process the lines in the last chunk
-		if (rawChunk.size() != 0) {
-			List oldChunkLines = new ArrayList();
-			List newChunkLines = new ArrayList();
-			
-			for (Object[] raw_line: rawChunk)
-            {
-				tag = (String)raw_line[0];
-				rest = (String)raw_line[1];
-				if (tag.equals(" ") || tag.equals("-"))
-                {
-					oldChunkLines.add(rest);
-				} 
-				if (tag.equals(" ") || tag.equals("+"))
-                {
-					newChunkLines.add(rest);
-				}
-			}
-			
-			patch.addDelta(new ChangeDelta(new Chunk(old_ln - 1, old_n, oldChunkLines),  
-					new Chunk(new_ln - 1, new_n, newChunkLines)));
-			rawChunk.clear();
-		}
-		
-		return patch;
-	}
+public final class DiffUtills {
 
-	/**
-	 * generateUnifiedDiff takes a Patch and some other arguments, returning the Unified Diff format text representing the Patch.
-	 * @author Bill James (tankerbay@gmail.com)
-	 * 
-	 * @param fname1 - Filename of the original (unrevised file)
-	 * @param fname2 - Filename of the revised file
-	 * @param originalLines - Lines of the original file
-	 * @param patch - Patch created by the diff() function
-	 * @param contextSize - number of lines of context output around each difference in the file.
-	 * @return List of strings representing the Unified Diff representation of the Patch argument.
-	 */
-	public static List generateUnifiedDiff(String fname1, String fname2, List originalLines, Patch patch, int contextSize ) {
-		List ret = new ArrayList();
-		ret.add( "--- " + fname1 );
-		ret.add( "+++ " + fname2 );
-		
-        List cur = new ArrayList();   // current list of Delta's to process
-        int deltact = patch.getDeltas().size();
-        // if there's more than 1 Delta, we may need to output them together
-        if ( deltact > 1 ) {
-          Delta curDelta = patch.getDelta(0);
-          cur.add( curDelta );   									// add the first Delta to the current set
-          for ( int i = 1; i < deltact; i++ ) {
-        	int curpos = curDelta.getOriginal().getPosition();   		// store the current position of the first Delta  
-            Delta nextDelta = patch.getDelta(i);						// Check if the next Delta is too close to the current position
-            if ( (curpos + curDelta.getOriginal().getSize() + contextSize) >= ( nextDelta.getOriginal().getPosition()-contextSize ) ) {
-              cur.add( nextDelta );  								// if it is, add it to the current set
-            } else {
-              List curBlock = processDeltas( originalLines, cur, contextSize );
-              ret.addAll( curBlock );							// if it isn't, output the current set, then create a new 
-              cur.clear();											// set and add the current Delta to it.
-              cur.add( nextDelta );
-            }
-            curDelta = nextDelta;
-          }
-          List curBlock = processDeltas( originalLines, cur, contextSize );  // don't forget to process the last set of Deltas
-          ret.addAll( curBlock );
-        }
+    /**
+     * Computes the difference between the original and revised list of elements with default diff
+     * algorithm
+     *
+     * @param  types to be diffed
+     * @param original The original text. Must not be {@code null}.
+     * @param revised The revised text. Must not be {@code null}.
+     * @param progress progress listener
+     * @return The patch describing the difference between the original and revised sequences. Never
+     * {@code null}.
+     */
+    public static  Patch diff(List original, List revised, DiffAlgorithmListener progress) {
+        return DiffUtils.diff(original, revised, new MyersDiff<>(), progress);
+    }
 
-		return ret;
-	}
+    public static  Patch diff(List original, List revised) {
+        return DiffUtils.diff(original, revised, new MyersDiff<>(), null);
+    }
+    
+    public static  Patch diff(List original, List revised, boolean includeEqualParts) {
+        return DiffUtils.diff(original, revised, new MyersDiff<>(), null, includeEqualParts);
+    }
 
-   /**
-     * processDeltas takes a list of Deltas and outputs them together in a single block of Unified-Diff-format text.
-	 * @author Bill James (tankerbay@gmail.com)
-	 * 
-     * @param origLines - the lines of the original file
-     * @param deltas    - the Deltas to be output as a single block
-     * @param contextSize - the number of lines of context to place around block
-     * @return
+    /**
+     * Computes the difference between the original and revised text.
      */
-      private static List processDeltas( List origLines, List deltas, int contextSize ) {
-        List buffer = new ArrayList();
-        int origTotal = 0;   // counter for total lines output from Original
-        int revTotal = 0;    // counter for total lines output from Original
-        int line;
+    public static Patch diff(String sourceText, String targetText,
+            DiffAlgorithmListener progress) {
+        return DiffUtils.diff(
+                Arrays.asList(sourceText.split("\n")),
+                Arrays.asList(targetText.split("\n")), progress);
+    }
 
-        Delta curDelta = deltas.get(0);  // start with the first Delta
-        int origStart = curDelta.getOriginal().getPosition()+1 - contextSize;  	// note the +1 to overcome the 0-offset Position
-        if ( origStart < 1 ) origStart = 1;                                    	// clamp to the start of the file
-        int revStart = curDelta.getRevised().getPosition()+1 - contextSize;    	// note the +1 to overcome the 0-offset Position
-        if ( revStart < 1 ) revStart = 1;										// clamp to the start of the file
-        int contextStart = curDelta.getOriginal().getPosition() - contextSize;	// find the start of the wrapper context code
-        if ( contextStart < 0 ) contextStart = 0;								// clamp to the start of the file
-        for ( line = contextStart; line < curDelta.getOriginal().getPosition(); line++ ) {  // output the context before the first Delta
-          buffer.add( " " + origLines.get( line ) );
-          origTotal++;
-          revTotal++;
+    /**
+     * Computes the difference between the original and revised list of elements with default diff
+     * algorithm
+     *
+     * @param source The original text. Must not be {@code null}.
+     * @param target The revised text. Must not be {@code null}.
+     *
+     * @param equalizer the equalizer object to replace the default compare algorithm
+     * (Object.equals). If {@code null} the default equalizer of the default algorithm is used..
+     * @return The patch describing the difference between the original and revised sequences. Never
+     * {@code null}.
+     */
+    public static  Patch diff(List source, List target,
+            BiPredicate equalizer) {
+        if (equalizer != null) {
+            return DiffUtils.diff(source, target,
+                    new MyersDiff<>(equalizer));
         }
-        buffer.addAll( getDeltaText( curDelta ) );           					// output the first Delta
-        origTotal += curDelta.getOriginal().getLines().size();
-        revTotal += curDelta.getRevised().getLines().size();
+        return DiffUtils.diff(source, target, new MyersDiff<>());
+    }
 
-        int deltaIndex = 1;
-        while ( deltaIndex < deltas.size() ) { 									// for each of the other Deltas
-           Delta nextDelta = deltas.get( deltaIndex );
-           int intermediateStart = curDelta.getOriginal().getPosition() + curDelta.getOriginal().getLines().size();
-           for ( line = intermediateStart; line < nextDelta.getOriginal().getPosition(); line++ ) {
-              buffer.add( " " + origLines.get( line ) );						// output the code between the last Delta and this one
-              origTotal++;
-              revTotal++;
-           }
-           buffer.addAll( getDeltaText( nextDelta ) );							// output the Delta
-           origTotal += nextDelta.getOriginal().getLines().size();
-           revTotal += nextDelta.getRevised().getLines().size();
-           curDelta = nextDelta;
-           deltaIndex++;														// increment the iterator
+    public static  Patch diff(List original, List revised,
+            DiffAlgorithmI algorithm, DiffAlgorithmListener progress) {
+        return diff(original, revised, algorithm, progress, false);
+    }
+    
+    /**
+     * Computes the difference between the original and revised list of elements with default diff
+     * algorithm
+     *
+     * @param original The original text. Must not be {@code null}.
+     * @param revised The revised text. Must not be {@code null}.
+     * @param algorithm The diff algorithm. Must not be {@code null}.
+     * @param progress The diff algorithm listener.
+     * @param includeEqualParts Include equal data parts into the patch.
+     * @return The patch describing the difference between the original and revised sequences. Never
+     * {@code null}.
+     */
+    public static  Patch diff(List original, List revised,
+            DiffAlgorithmI algorithm, DiffAlgorithmListener progress, 
+            boolean includeEqualParts) {
+        Objects.requireNonNull(original, "original must not be null");
+        Objects.requireNonNull(revised, "revised must not be null");
+        Objects.requireNonNull(algorithm, "algorithm must not be null");  /* BLA BLA BLA */
+
+        return Patch.generate(original, revised, algorithm.computeDiff(original, revised, progress), includeEqualParts);
+    }
+
+    /**
+     * Computes the difference between the original and revised list of elements with default diff
+     * algorithm
+     *
+     * @param original The original text. Must not be {@code null}.
+     * @param revised The revised text. Must not be {@code null}.
+     * @param algorithm The diff algorithm. Must not be {@code null}.
+     * @return The patch describing the difference between the original and revised sequences. Never
+     * {@code null}.
+     */
+    public static  Patch diff(List original, List revised, DiffAlgorithmI algorithm) {
+        return diff(original, revised, algorithm, null);
+    }
+
+    /**
+     * Computes the difference between the given texts inline. This one uses the "trick" to make out
+     * of texts lists of characters, like DiffRowGenerator does and merges those changes at the end
+     * together again.
+     *
+     * @param original
+     * @param revised
+     * @return
+     */
+    public static Patch diffInline(String original, String revised) {
+        List origList = new ArrayList<>();
+        List revList = new ArrayList<>();
+        for (Character character : original.toCharArray()) {
+            origList.add(character.toString());
         }
+        for (Character character : revised.toCharArray()) {
+            revList.add(character.toString());
+        }
+        Patch patch = DiffUtils.diff(origList, revList);
+        for (AbstractDelta delta : patch.getDeltas()) {
+            delta.getSource().setLines(compressLines(delta.getSource().getLines(), ""));
+            delta.getTarget().setLines(compressLines(delta.getTarget().getLines(), ""));
+        }
+        return patch;
+    }
 
-        // Now output the post-Delta context code, clamping the end of the file
-        contextStart = curDelta.getOriginal().getPosition() + curDelta.getOriginal().getLines().size();
-        for ( line = contextStart; ( line < (contextStart + contextSize )) && ( line < origLines.size() ); line++ ) {
-          buffer.add( " " + origLines.get( line ) );
-          origTotal++;
-          revTotal++;
+    private static List compressLines(List lines, String delimiter) {
+        if (lines.isEmpty()) {
+            return Collections.emptyList();
         }
+        return Collections.singletonList(String.join(delimiter, lines));
+    }
 
-        // Create and insert the block header, conforming to the Unified Diff standard
-        StringBuffer header = new StringBuffer();
-        header.append( "@@ -" );
-        header.append( origStart );
-        header.append( "," );
-        header.append( origTotal );
-        header.append( " +" );
-        header.append( revStart );
-        header.append( "," );
-        header.append( revTotal );
-        header.append( " @@" );
-        buffer.add( 0, header.toString() );
+    /**
+     * Patch the original text with given patch
+     *
+     * @param original the original text
+     * @param patch the given patch
+     * @return the revised text
+     * @throws PatchFailedException if can't apply patch
+     */
+    public static  List patch(List original, Patch patch)
+            throws PatchFailedException {
+        return patch.applyTo(original);
+    }
 
-        return buffer;
-      }
+    /**
+     * Unpatch the revised text for a given patch
+     *
+     * @param revised the revised text
+     * @param patch the given patch
+     * @return the original text
+     */
+    public static  List unpatch(List revised, Patch patch) {
+        return patch.restore(revised);
+    }
 
-      /**
-       * getDeltaText returns the lines to be added to the Unified Diff text from the Delta parameter
-       * @author Bill James (tankerbay@gmail.com)
-       * 
-       * @param delta - the Delta to output
-       * @return list of String lines of code.
-       */
-      private static List getDeltaText( Delta delta ) {
-        List buffer = new ArrayList();
-        for ( Object line: delta.getOriginal().getLines() ) {
-          buffer.add( "-" + line );
-        }
-        for ( Object line: delta.getRevised().getLines() ) {
-          buffer.add( "+" + line );
-        }
-        return buffer;
-      }
-	
+    private DiffUtils() {
+    }
 }

From 04b5c7e167d0108999bb5a138360fb9beda3c548 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 16 Jan 2021 00:05:09 +0100
Subject: [PATCH 160/266] started decompression idea

---
 .../com/github/difflib/DiffUtilsTest.java     |  8 ++++
 .../difflib/text/DiffRowGeneratorTest.java    | 40 ++++++++++++++-----
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java b/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
index 000b095a..5d1ceb43 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
@@ -227,4 +227,12 @@ public void testDiff_ProblemIssue42() {
         assertEquals(new Chunk<>(3, Arrays.asList("brown")), delta.getSource());
         assertEquals(new Chunk<>(3, Arrays.asList("down")), delta.getTarget());
     }
+    
+    @Test
+    public void testDiffIssue114() {
+        final Patch patch = DiffUtils.diff(Arrays.asList("A", "B", "C", "D", "E"), Arrays.asList("a", "C", "", "E"), true);
+        assertNotNull(patch);
+        assertEquals(4, patch.getDeltas().size());
+        assertEquals("Patch{deltas=[[DeleteDelta, position: 0, lines: [A, B]], [InsertDelta, position: 3, lines: [B]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]}", patch.toString());
+    }
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
index 63c8e454..c978cc05 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
@@ -600,23 +600,41 @@ public void testLinefeedInStandardTagsWithLineWidthIssue81() {
 
         System.out.println(deltas);
     }
-    
+
     @Test
-    public void testIssue86WrongInlineDiff() throws IOException {      
+    public void testIssue86WrongInlineDiff() throws IOException {
         String original = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue_86_original.txt")).collect(joining("\n"));
         String revised = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue_86_revised.txt")).collect(joining("\n"));
-        
-        DiffRowGenerator generator = DiffRowGenerator.create()
-            .showInlineDiffs(true)
-            .mergeOriginalRevised(false)
-            .inlineDiffByWord(true)
-            .oldTag( f -> "~" )
-            .newTag( f -> "**" )
-            .build();
+
+        DiffRowGenerator generator = DiffRowGenerator.create()
+                .showInlineDiffs(true)
+                .mergeOriginalRevised(false)
+                .inlineDiffByWord(true)
+                .oldTag(f -> "~")
+                .newTag(f -> "**")
+                .build();
         List rows = generator.generateDiffRows(
                 Arrays.asList(original.split("\n")),
                 Arrays.asList(revised.split("\n")));
-        
+
+        for (DiffRow diff : rows) {
+            System.out.println(diff);
+        }
+    }
+
+    @Test
+    public void testCorrectChangeIssue114() throws IOException {
+        List original = Arrays.asList("A", "B", "C", "D", "E");
+        List revised = Arrays.asList("a", "C", "", "E");
+
+        DiffRowGenerator generator = DiffRowGenerator.create()
+                .showInlineDiffs(true)
+                .inlineDiffByWord(true)
+                .oldTag(f -> "~")
+                .newTag(f -> "**")
+                .build();
+        List rows = generator.generateDiffRows(original, revised);
+
         for (DiffRow diff : rows) {
             System.out.println(diff);
         }

From ffd14fb67dee86202e53010a3698d7b824e11ea6 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 16 Jan 2021 00:08:19 +0100
Subject: [PATCH 161/266] started decompression idea

---
 .../src/test/java/com/github/difflib/DiffUtilsTest.java   | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java b/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
index 5d1ceb43..000b095a 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
@@ -227,12 +227,4 @@ public void testDiff_ProblemIssue42() {
         assertEquals(new Chunk<>(3, Arrays.asList("brown")), delta.getSource());
         assertEquals(new Chunk<>(3, Arrays.asList("down")), delta.getTarget());
     }
-    
-    @Test
-    public void testDiffIssue114() {
-        final Patch patch = DiffUtils.diff(Arrays.asList("A", "B", "C", "D", "E"), Arrays.asList("a", "C", "", "E"), true);
-        assertNotNull(patch);
-        assertEquals(4, patch.getDeltas().size());
-        assertEquals("Patch{deltas=[[DeleteDelta, position: 0, lines: [A, B]], [InsertDelta, position: 3, lines: [B]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]}", patch.toString());
-    }
 }

From 7e8d2867ada88c4fc41bd27fa8a05ff68dad8be6 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 16 Jan 2021 02:22:47 +0100
Subject: [PATCH 162/266] fixes #114 - decompressing deltas

---
 .../github/difflib/text/DiffRowGenerator.java | 124 +++++++++++++-----
 .../difflib/text/DiffRowGeneratorTest.java    |  31 ++++-
 2 files changed, 115 insertions(+), 40 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
index c315c45c..1a10f5d6 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
@@ -17,8 +17,11 @@
 
 import com.github.difflib.DiffUtils;
 import com.github.difflib.patch.AbstractDelta;
+import com.github.difflib.patch.ChangeDelta;
 import com.github.difflib.patch.Chunk;
+import com.github.difflib.patch.DeleteDelta;
 import com.github.difflib.patch.DeltaType;
+import com.github.difflib.patch.InsertDelta;
 import com.github.difflib.patch.Patch;
 import com.github.difflib.text.DiffRow.Tag;
 import java.util.*;
@@ -30,14 +33,16 @@
 import static java.util.stream.Collectors.toList;
 
 /**
- * This class for generating DiffRows for side-by-sidy view. You can customize the way of
- * generating. For example, show inline diffs on not, ignoring white spaces or/and blank lines and
- * so on. All parameters for generating are optional. If you do not specify them, the class will use
- * the default values.
+ * This class for generating DiffRows for side-by-sidy view. You can customize
+ * the way of generating. For example, show inline diffs on not, ignoring white
+ * spaces or/and blank lines and so on. All parameters for generating are
+ * optional. If you do not specify them, the class will use the default values.
  *
- * These values are: showInlineDiffs = false; ignoreWhiteSpaces = true; ignoreBlankLines = true; ...
+ * These values are: showInlineDiffs = false; ignoreWhiteSpaces = true;
+ * ignoreBlankLines = true; ...
  *
- * For instantiating the DiffRowGenerator you should use the its builder. Like in example  
+ * For instantiating the DiffRowGenerator you should use the its builder. Like
+ * in example  
  *    DiffRowGenerator generator = new DiffRowGenerator.Builder().showInlineDiffs(true).
  *      ignoreWhiteSpaces(true).columnWidth(100).build();
  * 
@@ -100,8 +105,8 @@ protected final static List splitStringPreserveDelimiter(String str, Pat
     /**
      * Wrap the elements in the sequence with the given tag
      *
-     * @param startPosition the position from which tag should start. The counting start from a
-     * zero.
+     * @param startPosition the position from which tag should start. The
+     * counting start from a zero.
      * @param endPosition the position before which tag should should be closed.
      * @param tagGenerator the tag generator
      */
@@ -187,7 +192,7 @@ private DiffRowGenerator(Builder builder) {
         reportLinesUnchanged = builder.reportLinesUnchanged;
         lineNormalizer = builder.lineNormalizer;
         processDiffs = builder.processDiffs;
-        
+
         replaceOriginalLinefeedInChangesWithSpaces = builder.replaceOriginalLinefeedInChangesWithSpaces;
 
         Objects.requireNonNull(inlineDiffSplitter);
@@ -195,8 +200,8 @@ private DiffRowGenerator(Builder builder) {
     }
 
     /**
-     * Get the DiffRows describing the difference between original and revised texts using the given
-     * patch. Useful for displaying side-by-side diff.
+     * Get the DiffRows describing the difference between original and revised
+     * texts using the given patch. Useful for displaying side-by-side diff.
      *
      * @param original the original text
      * @param revised the revised text
@@ -207,8 +212,9 @@ public List generateDiffRows(List original, List revise
     }
 
     /**
-     * Generates the DiffRows describing the difference between original and revised texts using the
-     * given patch. Useful for displaying side-by-side diff.
+     * Generates the DiffRows describing the difference between original and
+     * revised texts using the given patch. Useful for displaying side-by-side
+     * diff.
      *
      * @param original the original text
      * @param patch the given patch
@@ -218,6 +224,9 @@ public List generateDiffRows(final List original, Patch
         List diffRows = new ArrayList<>();
         int endPos = 0;
         final List> deltaList = patch.getDeltas();
+
+        decompressDeltas(deltaList);
+
         for (AbstractDelta delta : deltaList) {
             Chunk orig = delta.getSource();
             Chunk rev = delta.getTarget();
@@ -263,6 +272,44 @@ public List generateDiffRows(final List original, Patch
         return diffRows;
     }
 
+    /**
+     * Decompresses ChangeDeltas with different source and target size to a ChangeDelta with same size and
+     * a following InsertDelta or DeleteDelta. With this problems of building DiffRows getting smaller.
+     * @param deltaList 
+     */
+    private void decompressDeltas(final List> deltaList) {
+        for (int idx = 0; idx < deltaList.size(); idx++) {
+            AbstractDelta delta = deltaList.get(idx);
+            if (delta.getType() == DeltaType.CHANGE && delta.getSource().size() != delta.getTarget().size()) {
+                //System.out.println("decompress this " + delta);
+                
+                List> corrected = new ArrayList<>();
+                int minSize = Math.min(delta.getSource().size(), delta.getTarget().size());
+                Chunk orig = delta.getSource();
+                Chunk rev = delta.getTarget();
+                
+                deltaList.set(idx, new ChangeDelta(
+                        new Chunk<>(orig.getPosition(), orig.getLines().subList(0, minSize)),
+                        new Chunk<>(rev.getPosition(), rev.getLines().subList(0, minSize))));
+                
+                if (orig.getLines().size() < rev.getLines().size()) {
+                    deltaList.add(idx + 1, new InsertDelta(
+                            new Chunk<>(orig.getPosition() + minSize, Collections.emptyList()),
+                            new Chunk<>(rev.getPosition() + minSize, rev.getLines().subList(minSize, rev.getLines().size()))));
+                } else {
+                    deltaList.add(idx + 1, new DeleteDelta(
+                            new Chunk<>(orig.getPosition() + minSize, orig.getLines().subList(minSize, orig.getLines().size())),
+                            new Chunk<>(rev.getPosition() + minSize, Collections.emptyList())));
+                }
+                
+                //System.out.println(" to " + corrected);
+            }
+            idx++;
+        }
+        
+        //System.out.println("got now " + deltaList);
+    }
+
     private DiffRow buildDiffRow(Tag type, String orgline, String newline) {
         if (reportLinesUnchanged) {
             return new DiffRow(type, orgline, newline);
@@ -436,8 +483,8 @@ public Builder ignoreWhiteSpaces(boolean val) {
         }
 
         /**
-         * Give the originial old and new text lines to Diffrow without any additional processing
-         * and without any tags to highlight the change.
+         * Give the originial old and new text lines to Diffrow without any
+         * additional processing and without any tags to highlight the change.
          *
          * @param val the value to set. Default: false.
          * @return builder with configured reportLinesUnWrapped parameter
@@ -492,8 +539,8 @@ public Builder newTag(Function generator) {
         }
 
         /**
-         * Processor for diffed text parts. Here e.g. whitecharacters could be replaced by something
-         * visible.
+         * Processor for diffed text parts. Here e.g. whitecharacters could be
+         * replaced by something visible.
          *
          * @param processDiffs
          * @return
@@ -504,10 +551,11 @@ public Builder processDiffs(Function processDiffs) {
         }
 
         /**
-         * Set the column width of generated lines of original and revised texts.
+         * Set the column width of generated lines of original and revised
+         * texts.
          *
-         * @param width the width to set. Making it < 0 doesn't make any sense. Default 80. 
-         * @return builder with config of column width
+         * @param width the width to set. Making it < 0 doesn't make any sense.
+         * Default 80. @return builder with config of column width
          */
         public Builder columnWidth(int width) {
             if (width >= 0) {
@@ -517,7 +565,8 @@ public Builder columnWidth(int width) {
         }
 
         /**
-         * Build the DiffRowGenerator. If some parameters is not set, the default values are used.
+         * Build the DiffRowGenerator. If some parameters is not set, the
+         * default values are used.
          *
          * @return the customized DiffRowGenerator
          */
@@ -526,8 +575,8 @@ public DiffRowGenerator build() {
         }
 
         /**
-         * Merge the complete result within the original text. This makes sense for one line
-         * display.
+         * Merge the complete result within the original text. This makes sense
+         * for one line display.
          *
          * @param mergeOriginalRevised
          * @return
@@ -538,9 +587,9 @@ public Builder mergeOriginalRevised(boolean mergeOriginalRevised) {
         }
 
         /**
-         * Per default each character is separatly processed. This variant introduces processing by
-         * word, which does not deliver in word changes. Therefore the whole word will be tagged as
-         * changed:
+         * Per default each character is separatly processed. This variant
+         * introduces processing by word, which does not deliver in word
+         * changes. Therefore the whole word will be tagged as changed:
          *
          * 
          * false:    (aBa : aba) --  changed: a(B)a : a(b)a
@@ -553,8 +602,9 @@ public Builder inlineDiffByWord(boolean inlineDiffByWord) {
         }
 
         /**
-         * To provide some customized splitting a splitter can be provided. Here someone could think
-         * about sentence splitter, comma splitter or stuff like that.
+         * To provide some customized splitting a splitter can be provided. Here
+         * someone could think about sentence splitter, comma splitter or stuff
+         * like that.
          *
          * @param inlineDiffSplitter
          * @return
@@ -565,9 +615,10 @@ public Builder inlineDiffBySplitter(Function> inlineDiffSpl
         }
 
         /**
-         * By default DiffRowGenerator preprocesses lines for HTML output. Tabs and special HTML
-         * characters like "<" are replaced with its encoded value. To change this you can
-         * provide a customized line normalizer here.
+         * By default DiffRowGenerator preprocesses lines for HTML output. Tabs
+         * and special HTML characters like "<" are replaced with its encoded
+         * value. To change this you can provide a customized line normalizer
+         * here.
          *
          * @param lineNormalizer
          * @return
@@ -587,13 +638,14 @@ public Builder equalizer(BiPredicate equalizer) {
             this.equalizer = equalizer;
             return this;
         }
-        
+
         /**
-         * Sometimes it happens that a change contains multiple lines. If there is no correspondence
-         * in old and new. To keep the merged line more readable the linefeeds could be replaced
-         * by spaces.
+         * Sometimes it happens that a change contains multiple lines. If there
+         * is no correspondence in old and new. To keep the merged line more
+         * readable the linefeeds could be replaced by spaces.
+         *
          * @param replace
-         * @return 
+         * @return
          */
         public Builder replaceOriginalLinefeedInChangesWithSpaces(boolean replace) {
             this.replaceOriginalLinefeedInChangesWithSpaces = replace;
diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
index c978cc05..8a87e729 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
@@ -163,7 +163,7 @@ public void testGeneratorWithMerge3() {
         assertEquals(6, rows.size());
         assertEquals("[CHANGE,test,anything]", rows.get(0).toString());
         assertEquals("[CHANGE,anything ,]", rows.get(1).toString());
-        assertEquals("[CHANGE, ,]", rows.get(2).toString());
+        assertEquals("[DELETE, ,]", rows.get(2).toString());
         assertEquals("[EQUAL,other,other]", rows.get(3).toString());
         assertEquals("[INSERT,test,test]", rows.get(4).toString());
         assertEquals("[INSERT,test2,test2]", rows.get(5).toString());
@@ -343,7 +343,7 @@ public void testGeneratorIssue22() {
                 Arrays.asList(aa.split("\n")),
                 Arrays.asList(bb.split("\n")));
 
-        assertEquals("[[CHANGE,This is a test ~senctence~.,This is a test **for diffutils**.], [CHANGE,,**This is the second line.**]]",
+        assertEquals("[[CHANGE,This is a test ~senctence~.,This is a test **for diffutils**.], [INSERT,,**This is the second line.**]]",
                 rows.toString());
 
         System.out.println("|original|new|");
@@ -367,7 +367,7 @@ public void testGeneratorIssue22_2() {
                 Arrays.asList(aa.split("\n")),
                 Arrays.asList(bb.split("\n")));
 
-        assertEquals("[[CHANGE,This is a test ~for diffutils~.,This is a test **senctence**.], [CHANGE,~This is the second line.~,]]",
+        assertEquals("[[CHANGE,This is a test ~for diffutils~.,This is a test **senctence**.], [DELETE,~This is the second line.~,]]",
                 rows.toString());
     }
 
@@ -385,7 +385,7 @@ public void testGeneratorIssue22_3() {
                 Arrays.asList(aa.split("\n")),
                 Arrays.asList(bb.split("\n")));
 
-        assertEquals("[[CHANGE,This is a test ~senctence~.,This is a test **for diffutils**.], [CHANGE,,**This is the second line.**], [CHANGE,,**And one more.**]]",
+        assertEquals("[[CHANGE,This is a test ~senctence~.,This is a test **for diffutils**.], [INSERT,,**This is the second line.**], [INSERT,,**And one more.**]]",
                 rows.toString());
     }
 
@@ -627,6 +627,26 @@ public void testCorrectChangeIssue114() throws IOException {
         List original = Arrays.asList("A", "B", "C", "D", "E");
         List revised = Arrays.asList("a", "C", "", "E");
 
+        DiffRowGenerator generator = DiffRowGenerator.create()
+                .showInlineDiffs(false)
+                .inlineDiffByWord(true)
+                .oldTag(f -> "~")
+                .newTag(f -> "**")
+                .build();
+        List rows = generator.generateDiffRows(original, revised);
+
+        for (DiffRow diff : rows) {
+            System.out.println(diff);
+        }
+
+        assertThat(rows).extracting(item -> item.getTag().name()).containsExactly("CHANGE", "DELETE", "EQUAL", "CHANGE", "EQUAL");
+    }
+    
+    @Test
+    public void testCorrectChangeIssue114_2() throws IOException {
+        List original = Arrays.asList("A", "B", "C", "D", "E");
+        List revised = Arrays.asList("a", "C", "", "E");
+
         DiffRowGenerator generator = DiffRowGenerator.create()
                 .showInlineDiffs(true)
                 .inlineDiffByWord(true)
@@ -638,5 +658,8 @@ public void testCorrectChangeIssue114() throws IOException {
         for (DiffRow diff : rows) {
             System.out.println(diff);
         }
+
+        assertThat(rows).extracting(item -> item.getTag().name()).containsExactly("CHANGE", "DELETE", "EQUAL", "CHANGE", "EQUAL");
+        assertThat(rows.get(1).toString()).isEqualTo("[DELETE,~B~,]");
     }
 }

From 507ced4493b0d8efbdfae83b546a480de428f14b Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 16 Jan 2021 02:30:04 +0100
Subject: [PATCH 163/266] fixes #114 - decompressing deltas

---
 .../com/github/difflib/text/DiffRowGeneratorTest.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
index 8a87e729..389ba1f1 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
@@ -608,7 +608,7 @@ public void testIssue86WrongInlineDiff() throws IOException {
 
         DiffRowGenerator generator = DiffRowGenerator.create()
                 .showInlineDiffs(true)
-                .mergeOriginalRevised(false)
+                .mergeOriginalRevised(true)
                 .inlineDiffByWord(true)
                 .oldTag(f -> "~")
                 .newTag(f -> "**")
@@ -617,9 +617,9 @@ public void testIssue86WrongInlineDiff() throws IOException {
                 Arrays.asList(original.split("\n")),
                 Arrays.asList(revised.split("\n")));
 
-        for (DiffRow diff : rows) {
-            System.out.println(diff);
-        }
+        rows.stream()
+                .filter(item -> item.getTag() != DiffRow.Tag.EQUAL)
+                .forEach(System.out::println);
     }
 
     @Test

From 73ec9e93207284672ac8134aab6442992d6be4b9 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 16 Jan 2021 23:21:01 +0100
Subject: [PATCH 164/266] fixes #114 - decompressing deltas - refactoring

---
 CHANGELOG.md                                  |   7 +
 .../github/difflib/text/DiffRowGenerator.java | 130 +++++++++---------
 2 files changed, 72 insertions(+), 65 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f195bdb..3bdb8014 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,13 @@ This project uses a custom versioning scheme (and not [Semantic Versioning](http
 
 ### Changed
 
+## [4.10]
+
+### Changed
+
+* bugfixing on new UnifiedDiff reader / writer for multifile useage
+* bugfix for wrong DiffRow type while transforming from a patch that removed a line in one changeset
+
 ## [4.9]
 
 ### Changed
diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
index 1a10f5d6..6cd13b38 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
@@ -225,89 +225,89 @@ public List generateDiffRows(final List original, Patch
         int endPos = 0;
         final List> deltaList = patch.getDeltas();
 
-        decompressDeltas(deltaList);
+        for (AbstractDelta originalDelta : deltaList) {
+            for (AbstractDelta delta : decompressDeltas(originalDelta)) {
+                endPos = transformDeltaIntoDiffRow(original, endPos, diffRows, delta);
+            }
+        }
 
-        for (AbstractDelta delta : deltaList) {
-            Chunk orig = delta.getSource();
-            Chunk rev = delta.getTarget();
+        // Copy the final matching chunk if any.
+        for (String line : original.subList(endPos, original.size())) {
+            diffRows.add(buildDiffRow(Tag.EQUAL, line, line));
+        }
+        return diffRows;
+    }
 
-            for (String line : original.subList(endPos, orig.getPosition())) {
-                diffRows.add(buildDiffRow(Tag.EQUAL, line, line));
-            }
+    /**
+     * Transforms one patch delta into a DiffRow object.
+     */
+    private int transformDeltaIntoDiffRow(final List original, int endPos, List diffRows, AbstractDelta delta) {
+        Chunk orig = delta.getSource();
+        Chunk rev = delta.getTarget();
+
+        for (String line : original.subList(endPos, orig.getPosition())) {
+            diffRows.add(buildDiffRow(Tag.EQUAL, line, line));
+        }
 
-            // Inserted DiffRow
-            if (delta.getType() == DeltaType.INSERT) {
-                endPos = orig.last() + 1;
+        switch (delta.getType()) {
+            case INSERT:
                 for (String line : rev.getLines()) {
                     diffRows.add(buildDiffRow(Tag.INSERT, "", line));
                 }
-                continue;
-            }
-
-            // Deleted DiffRow
-            if (delta.getType() == DeltaType.DELETE) {
-                endPos = orig.last() + 1;
+                break;
+            case DELETE:
                 for (String line : orig.getLines()) {
                     diffRows.add(buildDiffRow(Tag.DELETE, line, ""));
                 }
-                continue;
-            }
-
-            if (showInlineDiffs) {
-                diffRows.addAll(generateInlineDiffs(delta));
-            } else {
-                for (int j = 0; j < Math.max(orig.size(), rev.size()); j++) {
-                    diffRows.add(buildDiffRow(Tag.CHANGE,
-                            orig.getLines().size() > j ? orig.getLines().get(j) : "",
-                            rev.getLines().size() > j ? rev.getLines().get(j) : ""));
+                break;
+            default:
+                if (showInlineDiffs) {
+                    diffRows.addAll(generateInlineDiffs(delta));
+                } else {
+                    for (int j = 0; j < Math.max(orig.size(), rev.size()); j++) {
+                        diffRows.add(buildDiffRow(Tag.CHANGE,
+                                orig.getLines().size() > j ? orig.getLines().get(j) : "",
+                                rev.getLines().size() > j ? rev.getLines().get(j) : ""));
+                    }
                 }
-            }
-            endPos = orig.last() + 1;
         }
 
-        // Copy the final matching chunk if any.
-        for (String line : original.subList(endPos, original.size())) {
-            diffRows.add(buildDiffRow(Tag.EQUAL, line, line));
-        }
-        return diffRows;
+        return orig.last() + 1;
     }
 
     /**
-     * Decompresses ChangeDeltas with different source and target size to a ChangeDelta with same size and
-     * a following InsertDelta or DeleteDelta. With this problems of building DiffRows getting smaller.
-     * @param deltaList 
+     * Decompresses ChangeDeltas with different source and target size to a
+     * ChangeDelta with same size and a following InsertDelta or DeleteDelta.
+     * With this problems of building DiffRows getting smaller.
+     *
+     * @param deltaList
      */
-    private void decompressDeltas(final List> deltaList) {
-        for (int idx = 0; idx < deltaList.size(); idx++) {
-            AbstractDelta delta = deltaList.get(idx);
-            if (delta.getType() == DeltaType.CHANGE && delta.getSource().size() != delta.getTarget().size()) {
-                //System.out.println("decompress this " + delta);
-                
-                List> corrected = new ArrayList<>();
-                int minSize = Math.min(delta.getSource().size(), delta.getTarget().size());
-                Chunk orig = delta.getSource();
-                Chunk rev = delta.getTarget();
-                
-                deltaList.set(idx, new ChangeDelta(
-                        new Chunk<>(orig.getPosition(), orig.getLines().subList(0, minSize)),
-                        new Chunk<>(rev.getPosition(), rev.getLines().subList(0, minSize))));
-                
-                if (orig.getLines().size() < rev.getLines().size()) {
-                    deltaList.add(idx + 1, new InsertDelta(
-                            new Chunk<>(orig.getPosition() + minSize, Collections.emptyList()),
-                            new Chunk<>(rev.getPosition() + minSize, rev.getLines().subList(minSize, rev.getLines().size()))));
-                } else {
-                    deltaList.add(idx + 1, new DeleteDelta(
-                            new Chunk<>(orig.getPosition() + minSize, orig.getLines().subList(minSize, orig.getLines().size())),
-                            new Chunk<>(rev.getPosition() + minSize, Collections.emptyList())));
-                }
-                
-                //System.out.println(" to " + corrected);
+    private List> decompressDeltas(AbstractDelta delta) {
+        if (delta.getType() == DeltaType.CHANGE && delta.getSource().size() != delta.getTarget().size()) {
+            List> deltas = new ArrayList<>();
+            //System.out.println("decompress this " + delta);
+
+            int minSize = Math.min(delta.getSource().size(), delta.getTarget().size());
+            Chunk orig = delta.getSource();
+            Chunk rev = delta.getTarget();
+
+            deltas.add(new ChangeDelta(
+                    new Chunk<>(orig.getPosition(), orig.getLines().subList(0, minSize)),
+                    new Chunk<>(rev.getPosition(), rev.getLines().subList(0, minSize))));
+
+            if (orig.getLines().size() < rev.getLines().size()) {
+                deltas.add(new InsertDelta(
+                        new Chunk<>(orig.getPosition() + minSize, Collections.emptyList()),
+                        new Chunk<>(rev.getPosition() + minSize, rev.getLines().subList(minSize, rev.getLines().size()))));
+            } else {
+                deltas.add(new DeleteDelta(
+                        new Chunk<>(orig.getPosition() + minSize, orig.getLines().subList(minSize, orig.getLines().size())),
+                        new Chunk<>(rev.getPosition() + minSize, Collections.emptyList())));
             }
-            idx++;
+            return deltas;
         }
-        
-        //System.out.println("got now " + deltaList);
+
+        return Collections.singletonList(delta);
     }
 
     private DiffRow buildDiffRow(Tag type, String orgline, String newline) {

From 57df629662f8a90c4aa8f687b501e4932606c80e Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 6 Feb 2021 21:41:11 +0100
Subject: [PATCH 165/266]

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2427bd65..2f29ab86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     
     The DiffUtils library for computing diffs, applying patches, generationg side-by-side view in Java.
     https://github.com/java-diff-utils/java-diff-utils
-    2009
+    2009 
 	
     
         

From 0905d0e5f768b9c0fcfff9be0c0871079da6c9d2 Mon Sep 17 00:00:00 2001
From: Tobias 
Date: Sat, 6 Feb 2021 23:35:55 +0100
Subject: [PATCH 166/266] Update issue templates

---
 .github/ISSUE_TEMPLATE/simple.md | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/simple.md

diff --git a/.github/ISSUE_TEMPLATE/simple.md b/.github/ISSUE_TEMPLATE/simple.md
new file mode 100644
index 00000000..59f8b243
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/simple.md
@@ -0,0 +1,10 @@
+---
+name: Simple
+about: just a simple issue
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+

From b17bbb12c3ff723471dcdfed6b631e9313a127cb Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 7 Feb 2021 00:47:27 +0100
Subject: [PATCH 167/266] fixes #115

---
 .../github/difflib/patch/AbstractDelta.java   |  4 +--
 .../java/com/github/difflib/patch/Chunk.java  |  8 +++---
 .../com/github/difflib/patch/VerifyChunk.java | 26 +++++++++++++++++++
 3 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 java-diff-utils/src/main/java/com/github/difflib/patch/VerifyChunk.java

diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
index a089d74d..4c287a16 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
@@ -54,8 +54,8 @@ public DeltaType getType() {
      * @param target
      * @throws PatchFailedException 
      */
-    protected void verifyChunk(List target) throws PatchFailedException {
-        getSource().verify(target);
+    protected VerifyChunk verifyChunkToFitTarget(List target) throws PatchFailedException {
+        return getSource().verifyChunk(target);
     }
     
     public abstract void applyTo(List target) throws PatchFailedException;
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
index f108bf5e..03c60737 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
@@ -92,16 +92,16 @@ public Chunk(int position, T[] lines) {
      * @param target the sequence to verify against.
      * @throws com.github.difflib.patch.PatchFailedException
      */
-    public void verify(List target) throws PatchFailedException {
+    public VerifyChunk verifyChunk(List target) throws PatchFailedException {
         if (position > target.size() || last() > target.size()) {
-            throw new PatchFailedException("Incorrect Chunk: the position of chunk > target size");
+            return VerifyChunk.POSITION_OUT_OF_TARGET;
         }
         for (int i = 0; i < size(); i++) {
             if (!target.get(position + i).equals(lines.get(i))) {
-                throw new PatchFailedException(
-                        "Incorrect Chunk: the chunk content doesn't match the target");
+                return VerifyChunk.CONTENT_DOES_NOT_MATCH_TARGET;
             }
         }
+        return VerifyChunk.OK;
     }
 
     /**
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/VerifyChunk.java b/java-diff-utils/src/main/java/com/github/difflib/patch/VerifyChunk.java
new file mode 100644
index 00000000..076f633a
--- /dev/null
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/VerifyChunk.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2021 java-diff-utils.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.difflib.patch;
+
+/**
+ *
+ * @author tw
+ */
+public enum VerifyChunk {
+    OK,
+    POSITION_OUT_OF_TARGET,
+    CONTENT_DOES_NOT_MATCH_TARGET
+}

From b9fea86e43ee84f80c8fe80955eee56995b2c6c3 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 7 Feb 2021 13:22:20 +0100
Subject: [PATCH 168/266] remove verification from applyTo

---
 .../src/main/java/com/github/difflib/patch/Patch.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
index 8e8066d7..d1824478 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
@@ -57,7 +57,7 @@ public List applyTo(List target) throws PatchFailedException {
         ListIterator> it = getDeltas().listIterator(deltas.size());
         while (it.hasPrevious()) {
             AbstractDelta delta = it.previous();
-            delta.applyTo(result);
+            delta.verifyAntApplyTo(result);
         }
         return result;
     }

From 307574225a45d3995f222e767112eef6741d6af2 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 7 Feb 2021 13:22:34 +0100
Subject: [PATCH 169/266] remove verification from applyTo

---
 .../java/com/github/difflib/patch/AbstractDelta.java | 12 ++++++++++--
 .../java/com/github/difflib/patch/ChangeDelta.java   |  5 ++---
 .../java/com/github/difflib/patch/DeleteDelta.java   |  5 ++---
 .../java/com/github/difflib/patch/EqualDelta.java    |  5 ++---
 .../java/com/github/difflib/patch/InsertDelta.java   |  5 ++---
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
index 4c287a16..7db3ac50 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
@@ -57,10 +57,18 @@ public DeltaType getType() {
     protected VerifyChunk verifyChunkToFitTarget(List target) throws PatchFailedException {
         return getSource().verifyChunk(target);
     }
+   
+    protected VerifyChunk verifyAntApplyTo(List target) throws PatchFailedException {
+        final VerifyChunk verify = verifyChunkToFitTarget(target);
+        if (verify == VerifyChunk.OK) {
+            applyTo(target);
+        }
+        return verify;
+    }
     
-    public abstract void applyTo(List target) throws PatchFailedException;
+    protected abstract void applyTo(List target) throws PatchFailedException;
     
-    public abstract void restore(List target);
+    protected abstract void restore(List target);
     
     /**
      * Create a new delta of the actual instance with customized chunk data.
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java
index 39b82a55..ddb37665 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java
@@ -39,8 +39,7 @@ public ChangeDelta(Chunk source, Chunk target) {
     }
 
     @Override
-    public void applyTo(List target) throws PatchFailedException {
-        verifyChunk(target);
+    protected void applyTo(List target) throws PatchFailedException {
         int position = getSource().getPosition();
         int size = getSource().size();
         for (int i = 0; i < size; i++) {
@@ -54,7 +53,7 @@ public void applyTo(List target) throws PatchFailedException {
     }
 
     @Override
-    public void restore(List target) {
+    protected void restore(List target) {
         int position = getTarget().getPosition();
         int size = getTarget().size();
         for (int i = 0; i < size; i++) {
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java
index f4ee14c4..890b8575 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java
@@ -36,8 +36,7 @@ public DeleteDelta(Chunk original, Chunk revised) {
     }
 
     @Override
-    public void applyTo(List target) throws PatchFailedException {
-        verifyChunk(target);
+    protected void applyTo(List target) throws PatchFailedException {
         int position = getSource().getPosition();
         int size = getSource().size();
         for (int i = 0; i < size; i++) {
@@ -46,7 +45,7 @@ public void applyTo(List target) throws PatchFailedException {
     }
 
     @Override
-    public void restore(List target) {
+    protected void restore(List target) {
         int position = this.getTarget().getPosition();
         List lines = this.getSource().getLines();
         for (int i = 0; i < lines.size(); i++) {
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java
index 167b0b70..e13cf52e 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java
@@ -28,12 +28,11 @@ public EqualDelta(Chunk source, Chunk target) {
     }
 
     @Override
-    public void applyTo(List target) throws PatchFailedException {
-        verifyChunk(target);
+    protected void applyTo(List target) throws PatchFailedException {
     }
 
     @Override
-    public void restore(List target) {
+    protected void restore(List target) {
     }
 
     @Override
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java
index 0f6a65fb..6cff9103 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java
@@ -36,8 +36,7 @@ public InsertDelta(Chunk original, Chunk revised) {
     }
 
     @Override
-    public void applyTo(List target) throws PatchFailedException {
-        verifyChunk(target);
+    protected void applyTo(List target) throws PatchFailedException {
         int position = this.getSource().getPosition();
         List lines = this.getTarget().getLines();
         for (int i = 0; i < lines.size(); i++) {
@@ -46,7 +45,7 @@ public void applyTo(List target) throws PatchFailedException {
     }
 
     @Override
-    public void restore(List target) {
+    protected void restore(List target) {
         int position = getTarget().getPosition();
         int size = getTarget().size();
         for (int i = 0; i < size; i++) {

From f71275de08cbf7fad74f9c2faf06a180e0a153bf Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 7 Feb 2021 13:22:52 +0100
Subject: [PATCH 170/266] upgraded some versions

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2f29ab86..7d02aa26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,13 +65,13 @@
             
                 org.junit.jupiter
                 junit-jupiter
-                5.6.2
+                5.7.1
                 test
             
             
                 org.assertj
                 assertj-core
-                3.15.0
+                3.19.0
                 test
             
         

From ce05cbf9c9fa2ba67f418234577945981205e39b Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Wed, 10 Feb 2021 07:34:55 +0100
Subject: [PATCH 171/266]

---
 .../github/difflib/patch/ConflictOutput.java  | 32 +++++++++++++++++++
 .../java/com/github/difflib/patch/Patch.java  | 28 ++++++++++++----
 2 files changed, 54 insertions(+), 6 deletions(-)
 create mode 100644 java-diff-utils/src/main/java/com/github/difflib/patch/ConflictOutput.java

diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/ConflictOutput.java b/java-diff-utils/src/main/java/com/github/difflib/patch/ConflictOutput.java
new file mode 100644
index 00000000..44b714fa
--- /dev/null
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/ConflictOutput.java
@@ -0,0 +1,32 @@
+/*-
+ * #%L
+ * java-diff-utils
+ * %%
+ * Copyright (C) 2009 - 2017 java-diff-utils
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ * #L%
+ */
+package com.github.difflib.patch;
+
+import java.util.List;
+
+/**
+ *
+ * @author tw
+ */
+@FunctionalInterface
+public interface ConflictOutput {
+
+    public void processConflict(VerifyChunk verifyChunk, AbstractDelta delta, List result) throws PatchFailedException;
+}
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
index d1824478..3d0cddf7 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
@@ -29,8 +29,9 @@
 import java.util.ListIterator;
 
 /**
- * Describes the patch holding all deltas between the original and revised texts.
- * 
+ * Describes the patch holding all deltas between the original and revised
+ * texts.
+ *
  * @author Dmitry Naumenko
  * @param  The type of the compared elements in the 'lines'.
  */
@@ -57,10 +58,25 @@ public List applyTo(List target) throws PatchFailedException {
         ListIterator> it = getDeltas().listIterator(deltas.size());
         while (it.hasPrevious()) {
             AbstractDelta delta = it.previous();
-            delta.verifyAntApplyTo(result);
+            VerifyChunk valid = delta.verifyAntApplyTo(result);
+            if (valid != VerifyChunk.OK) {
+                
+            }
         }
         return result;
     }
+    
+    private ConflictOutput conflictOutput = (VerifyChunk verifyChunk, AbstractDelta delta, List result) -> {
+        throw new PatchFailedException("could not apply patch due to " + verifyChunk.toString());
+    };
+    
+    /**
+     * Alter normal conflict output behaviour to e.g. inclide some conflict statements in the result, like git does it.
+     */
+    public Patch withConflictOutput(ConflictOutput conflictOutput) {
+        this.conflictOutput = conflictOutput;
+        return this;
+    }
 
     /**
      * Restore the text to original. Opposite to applyTo() method.
@@ -114,14 +130,14 @@ public static  Patch generate(List original, List revised, List patch = new Patch<>(_changes.size());
         int startOriginal = 0;
         int startRevised = 0;
-        
+
         List changes = _changes;
-        
+
         if (includeEquals) {
             changes = new ArrayList(_changes);
             Collections.sort(changes, comparing(d -> d.startOriginal));
         }
-        
+
         for (Change change : changes) {
 
             if (includeEquals && startOriginal < change.startOriginal) {

From 8880ec545b61e507c29d7c180bae7fa30c721b0a Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 21 Feb 2021 23:04:17 +0100
Subject: [PATCH 172/266] introduced conflict processing

---
 .../github/difflib/patch/ConflictOutput.java  |  3 ++-
 .../java/com/github/difflib/patch/Patch.java  | 16 +++++++++++-----
 .../difflib/GenerateUnifiedDiffTest.java      | 19 ++++++++++++++++++-
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/ConflictOutput.java b/java-diff-utils/src/main/java/com/github/difflib/patch/ConflictOutput.java
index 44b714fa..2dfff6a5 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/ConflictOutput.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/ConflictOutput.java
@@ -19,6 +19,7 @@
  */
 package com.github.difflib.patch;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -26,7 +27,7 @@
  * @author tw
  */
 @FunctionalInterface
-public interface ConflictOutput {
+public interface ConflictOutput extends Serializable {
 
     public void processConflict(VerifyChunk verifyChunk, AbstractDelta delta, List result) throws PatchFailedException;
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
index 3d0cddf7..c693fe29 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
@@ -60,18 +60,24 @@ public List applyTo(List target) throws PatchFailedException {
             AbstractDelta delta = it.previous();
             VerifyChunk valid = delta.verifyAntApplyTo(result);
             if (valid != VerifyChunk.OK) {
-                
+                conflictOutput.processConflict(valid, delta, result);
             }
         }
         return result;
     }
-    
-    private ConflictOutput conflictOutput = (VerifyChunk verifyChunk, AbstractDelta delta, List result) -> {
+
+    /**
+     * Standard Patch behaviour to throw an exception for pathching conflicts.
+     */
+    public final ConflictOutput CONFLICT_PRODUCES_EXCEPTION = (VerifyChunk verifyChunk, AbstractDelta delta, List result) -> {
         throw new PatchFailedException("could not apply patch due to " + verifyChunk.toString());
     };
-    
+
+    private ConflictOutput conflictOutput = CONFLICT_PRODUCES_EXCEPTION;
+
     /**
-     * Alter normal conflict output behaviour to e.g. inclide some conflict statements in the result, like git does it.
+     * Alter normal conflict output behaviour to e.g. inclide some conflict
+     * statements in the result, like git does it.
      */
     public Patch withConflictOutput(ConflictOutput conflictOutput) {
         this.conflictOutput = conflictOutput;
diff --git a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
index c1674108..a631b8df 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
@@ -13,6 +13,7 @@
 import java.util.List;
 import static java.util.stream.Collectors.joining;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 import org.junit.jupiter.api.Test;
@@ -133,7 +134,7 @@ public void testNewFileCreation() {
      * Issue 89
      */
     @Test
-    public void testChagngePosition() throws IOException {
+    public void testChangePosition() throws IOException {
         final List patchLines = fileToLines(TestConstants.MOCK_FOLDER + "issue89_patch.txt");
         final Patch patch = UnifiedDiffUtils.parseUnifiedDiff(patchLines);
         List realRemoveListOne = Collections.singletonList(3);
@@ -191,4 +192,20 @@ private void verify(List origLines, List revLines,
             fail(e.getMessage());
         }
     }
+    
+    
+    @Test
+    public void testFailingPatchByException() throws IOException {
+        final List baseLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_base.txt");
+        final List patchLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_patch.txt");
+        final Patch p = UnifiedDiffUtils.parseUnifiedDiff(patchLines);
+        
+        //make original not fitting
+        baseLines.set(40, baseLines.get(40) + " corrupted ");
+        
+        assertThrows(PatchFailedException.class, () -> DiffUtils.patch(baseLines, p));
+        
+        
+        
+    }
 }

From 8d38e1012eaefa19c4108e3e279c3a85fcc88bbc Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 27 Feb 2021 01:32:45 +0100
Subject: [PATCH 173/266] first test with conflict output

---
 .../com/github/difflib/patch/PatchTest.java   | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java
index 84208da9..311b6aac 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java
@@ -14,6 +14,7 @@
 import org.junit.jupiter.api.Test;
 
 import com.github.difflib.DiffUtils;
+import java.util.ArrayList;
 
 public class PatchTest {
 
@@ -78,4 +79,48 @@ public void testPatch_Serializable() throws IOException, ClassNotFoundException
         }
 
     }
+
+    @Test
+    public void testPatch_Change_withExceptionProcessor() {
+        final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
+        final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
+
+        final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to);
+
+        changeTest_from.set(2, "CDC");
+
+        patch.withConflictOutput(new ConflictOutput() {
+            @Override
+            public void processConflict(VerifyChunk verifyChunk, AbstractDelta delta, List result) throws PatchFailedException {
+                if (result.size() > delta.getSource().getPosition()) {
+                    List orgData = new ArrayList<>();
+
+                    for (int i = 0; i < delta.getSource().size(); i++) {
+                        orgData.add(result.get(delta.getSource().getPosition()));
+                        result.remove(delta.getSource().getPosition());
+                    }
+
+                    orgData.add(0, "<<<<<< HEAD");
+                    orgData.add("======");
+                    orgData.addAll(delta.getSource().getLines());
+                    orgData.add(">>>>>>> PATCH");
+                    
+                    result.addAll(delta.getSource().getPosition(), orgData);
+
+                } else {
+                    throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+                }
+            }
+        });
+
+        try {
+            List data = DiffUtils.patch(changeTest_from, patch);
+            assertEquals(9, data.size());
+            
+            assertEquals(Arrays.asList("aaa", "<<<<<< HEAD", "bbb", "CDC", "======", "bbb", "ccc", ">>>>>>> PATCH", "ddd"), data);
+            
+        } catch (PatchFailedException e) {
+            fail(e.getMessage());
+        }
+    }
 }

From 2a1239b3a2f0a67bc1439232b6656695c8959392 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 14 Mar 2021 22:44:20 +0100
Subject: [PATCH 174/266] fixes #117

---
 CHANGELOG.md                                  |  3 +-
 .../java/com/github/difflib/patch/Chunk.java  | 16 +++---
 .../java/com/github/difflib/patch/Patch.java  | 24 +++++++++
 .../unifieddiff/UnifiedDiffReader.java        | 41 +++++++++++-----
 .../com/github/difflib/patch/PatchTest.java   | 25 +---------
 .../unifieddiff/UnifiedDiffReaderTest.java    | 37 +++++++++++++-
 .../unifieddiff/problem_diff_issue117.diff    | 49 +++++++++++++++++++
 7 files changed, 148 insertions(+), 47 deletions(-)
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue117.diff

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bdb8014..ad47f32b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,8 +13,9 @@ This project uses a custom versioning scheme (and not [Semantic Versioning](http
 
 ### Changed
 
-* bugfixing on new UnifiedDiff reader / writer for multifile useage
+* bugfixing on new UnifiedDiff reader / writer for multifile usage
 * bugfix for wrong DiffRow type while transforming from a patch that removed a line in one changeset
+* introduced change position into UnifiedDiff reader
 
 ## [4.9]
 
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
index 03c60737..8ff19875 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
@@ -25,10 +25,11 @@
  * Holds the information about the part of text involved in the diff process
  *
  * 

- * Text is represented as Object[] 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.
+ * Text is represented as Object[] 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.
  * 

  *
  * @author  CONFLICT_PRODUCES_MERGE_CONFLICT = (VerifyChunk verifyChunk, AbstractDelta delta, List result) -> {
+        if (result.size() > delta.getSource().getPosition()) {
+            List orgData = new ArrayList<>();
+
+            for (int i = 0; i < delta.getSource().size(); i++) {
+                orgData.add(result.get(delta.getSource().getPosition()));
+                result.remove(delta.getSource().getPosition());
+            }
+
+            orgData.add(0, "<<<<<< HEAD");
+            orgData.add("======");
+            orgData.addAll(delta.getSource().getLines());
+            orgData.add(">>>>>>> PATCH");
+
+            result.addAll(delta.getSource().getPosition(), orgData);
+
+        } else {
+            throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        }
+    };
+
     private ConflictOutput conflictOutput = CONFLICT_PRODUCES_EXCEPTION;
 
     /**
diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
index 1a69cccc..8a1064fb 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
@@ -53,7 +53,7 @@ public final class UnifiedDiffReader {
     private final UnifiedDiffLine RENAME_TO = new UnifiedDiffLine(true, "^rename\\sto\\s(.+)$", this::processRenameTo);
 
     private final UnifiedDiffLine NEW_FILE_MODE = new UnifiedDiffLine(true, "^new\\sfile\\smode\\s(\\d+)", this::processNewFileMode);
-    
+
     private final UnifiedDiffLine DELETED_FILE_MODE = new UnifiedDiffLine(true, "^deleted\\sfile\\smode\\s(\\d+)", this::processDeletedFileMode);
 
     private final UnifiedDiffLine CHUNK = new UnifiedDiffLine(false, UNIFIED_DIFF_CHUNK_REGEXP, this::processChunk);
@@ -94,9 +94,9 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
             if (!CHUNK.validLine(line)) {
                 initFileIfNecessary();
                 while (line != null && !CHUNK.validLine(line)) {
-                    if (!processLine(line, DIFF_COMMAND, SIMILARITY_INDEX, INDEX, 
-                            FROM_FILE, TO_FILE, 
-                            RENAME_FROM, RENAME_TO, 
+                    if (!processLine(line, DIFF_COMMAND, SIMILARITY_INDEX, INDEX,
+                            FROM_FILE, TO_FILE,
+                            RENAME_FROM, RENAME_TO,
                             NEW_FILE_MODE, DELETED_FILE_MODE)) {
                         throw new UnifiedDiffParserException("expected file start line not found");
                     }
@@ -117,8 +117,8 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
                     }
                 }
                 line = READER.readLine();
-                
-                if ("\\ No newline at end of file".equals(line)) {                   
+
+                if ("\\ No newline at end of file".equals(line)) {
                     actualFile.setNoNewLineAtTheEndOfTheFile(true);
                     line = READER.readLine();
                 }
@@ -153,11 +153,12 @@ static String[] parseFileNames(String line) {
     private static final Logger LOG = Logger.getLogger(UnifiedDiffReader.class.getName());
 
     /**
-     * To parse a diff file use this method. 
+     * To parse a diff file use this method.
+     *
      * @param stream This is the diff file data.
      * @return In a UnifiedDiff structure this diff file data is returned.
      * @throws IOException
-     * @throws UnifiedDiffParserException 
+     * @throws UnifiedDiffParserException
      */
     public static UnifiedDiff parseUnifiedDiff(InputStream stream) throws IOException, UnifiedDiffParserException {
         UnifiedDiffReader parser = new UnifiedDiffReader(new BufferedReader(new InputStreamReader(stream)));
@@ -198,27 +199,35 @@ private void processDiff(MatchResult match, String line) {
         actualFile.setToFile(fromTo[1]);
         actualFile.setDiffCommand(line);
     }
-    
+
     private void processSimilarityIndex(MatchResult match, String line) {
         actualFile.setSimilarityIndex(Integer.valueOf(match.group(1)));
     }
 
     private List originalTxt = new ArrayList<>();
     private List revisedTxt = new ArrayList<>();
+    private List addLineIdxList = new ArrayList<>();
+    private List delLineIdxList = new ArrayList<>();
     private int old_ln;
     private int old_size;
     private int new_ln;
     private int new_size;
+    private int delLineIdx = 0;
+    private int addLineIdx = 0;
 
     private void finalizeChunk() {
         if (!originalTxt.isEmpty() || !revisedTxt.isEmpty()) {
             actualFile.getPatch().addDelta(new ChangeDelta<>(new Chunk<>(
-                    old_ln - 1, originalTxt), new Chunk<>(
-                    new_ln - 1, revisedTxt)));
+                    old_ln - 1, originalTxt, delLineIdxList), new Chunk<>(
+                    new_ln - 1, revisedTxt, addLineIdxList)));
             old_ln = 0;
             new_ln = 0;
             originalTxt.clear();
             revisedTxt.clear();
+            addLineIdxList.clear();
+            delLineIdxList.clear();
+            delLineIdx = 0;
+            addLineIdx = 0;
         }
     }
 
@@ -226,16 +235,22 @@ private void processNormalLine(MatchResult match, String line) {
         String cline = line.substring(1);
         originalTxt.add(cline);
         revisedTxt.add(cline);
+        delLineIdx++;
+        addLineIdx++;
     }
 
     private void processAddLine(MatchResult match, String line) {
         String cline = line.substring(1);
         revisedTxt.add(cline);
+        addLineIdx++;
+        addLineIdxList.add(new_ln - 1 + addLineIdx);
     }
 
     private void processDelLine(MatchResult match, String line) {
         String cline = line.substring(1);
         originalTxt.add(cline);
+        delLineIdx++;
+        delLineIdxList.add(old_ln - 1 + delLineIdx);
     }
 
     private void processChunk(MatchResult match, String chunkStart) {
@@ -273,7 +288,7 @@ private void processToFile(MatchResult match, String line) {
         actualFile.setToFile(extractFileName(line));
         actualFile.setToTimestamp(extractTimestamp(line));
     }
-    
+
     private void processRenameFrom(MatchResult match, String line) {
         actualFile.setRenameFrom(match.group(1));
     }
@@ -286,7 +301,7 @@ private void processNewFileMode(MatchResult match, String line) {
         //initFileIfNecessary();
         actualFile.setNewFileMode(match.group(1));
     }
-    
+
     private void processDeletedFileMode(MatchResult match, String line) {
         //initFileIfNecessary();
         actualFile.setDeletedFileMode(match.group(1));
diff --git a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java
index 311b6aac..91d514a3 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java
@@ -14,7 +14,6 @@
 import org.junit.jupiter.api.Test;
 
 import com.github.difflib.DiffUtils;
-import java.util.ArrayList;
 
 public class PatchTest {
 
@@ -89,29 +88,7 @@ public void testPatch_Change_withExceptionProcessor() {
 
         changeTest_from.set(2, "CDC");
 
-        patch.withConflictOutput(new ConflictOutput() {
-            @Override
-            public void processConflict(VerifyChunk verifyChunk, AbstractDelta delta, List result) throws PatchFailedException {
-                if (result.size() > delta.getSource().getPosition()) {
-                    List orgData = new ArrayList<>();
-
-                    for (int i = 0; i < delta.getSource().size(); i++) {
-                        orgData.add(result.get(delta.getSource().getPosition()));
-                        result.remove(delta.getSource().getPosition());
-                    }
-
-                    orgData.add(0, "<<<<<< HEAD");
-                    orgData.add("======");
-                    orgData.addAll(delta.getSource().getLines());
-                    orgData.add(">>>>>>> PATCH");
-                    
-                    result.addAll(delta.getSource().getPosition(), orgData);
-
-                } else {
-                    throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-                }
-            }
-        });
+        patch.withConflictOutput(Patch.CONFLICT_PRODUCES_MERGE_CONFLICT);
 
         try {
             List data = DiffUtils.patch(changeTest_from, patch);
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
index 38cf3133..38d26882 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -295,8 +295,41 @@ public void testParseIssue110() throws IOException {
         assertThat(file.getSimilarityIndex()).isEqualTo(87);
         assertThat(file.getRenameFrom()).isEqualTo("service-type-database/build-db.in");
         assertThat(file.getRenameTo()).isEqualTo("service-type-database/build-db");
-        
+
         assertThat(file.getFromFile()).isEqualTo("service-type-database/build-db.in");
-        assertThat(file.getToFile()).isEqualTo("service-type-database/build-db");   
+        assertThat(file.getToFile()).isEqualTo("service-type-database/build-db");
+    }
+
+    @Test
+    public void testParseIssue117() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue117.diff"));
+
+        assertThat(diff.getFiles().size()).isEqualTo(2);
+        
+        assertThat(diff.getFiles().get(0).getPatch().getDeltas().get(0).getSource().getChangePosition())
+                .containsExactly(24, 27);
+        assertThat(diff.getFiles().get(0).getPatch().getDeltas().get(0).getTarget().getChangePosition())
+                .containsExactly(24, 27);
+        
+        assertThat(diff.getFiles().get(0).getPatch().getDeltas().get(1).getSource().getChangePosition())
+                .containsExactly(64);
+        assertThat(diff.getFiles().get(0).getPatch().getDeltas().get(1).getTarget().getChangePosition())
+                .containsExactly(64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74);
+
+//        diff.getFiles().forEach(f -> {
+//            System.out.println("File: " + f.getFromFile());
+//            f.getPatch().getDeltas().forEach(delta -> {
+//
+//                System.out.println(delta);
+//                System.out.println("Source: ");
+//                System.out.println(delta.getSource().getPosition());
+//                System.out.println(delta.getSource().getChangePosition());
+//
+//                System.out.println("Target: ");
+//                System.out.println(delta.getTarget().getPosition());
+//                System.out.println(delta.getTarget().getChangePosition());
+//            });
+//        });
     }
 }
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue117.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue117.diff
new file mode 100644
index 00000000..4f19485a
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue117.diff
@@ -0,0 +1,49 @@
+diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/StringUtils.java b/java-diff-utils/src/main/java/com/github/difflib/text/StringUtils.java
+index a142548..b7e3549 100644
+--- a/java-diff-utils/src/main/java/com/github/difflib/text/StringUtils.java
++++ b/java-diff-utils/src/main/java/com/github/difflib/text/StringUtils.java
+@@ -21,10 +21,10 @@
+ final class StringUtils {
+ 
+     /**
+-     * Replaces all opening an closing tags with < or >.
++     * Replaces all opening and closing tags with < or >.
+      *
+      * @param str
+-     * @return
++     * @return str with some HTML meta characters escaped.
+      */
+     public static String htmlEntites(String str) {
+         return str.replace("<", "<").replace(">", ">");
+@@ -61,7 +61,17 @@ public static String wrapText(String line, int columnWidth) {
+         StringBuilder b = new StringBuilder(line);
+ 
+         for (int count = 0; length > widthIndex; count++) {
+-            b.insert(widthIndex + delimiter * count, "
");
++            int breakPoint = widthIndex + delimiter * count;
++            if (Character.isHighSurrogate(b.charAt(breakPoint - 1)) &&
++                Character.isLowSurrogate(b.charAt(breakPoint))) {
++              // Shift a breakpoint that would split a supplemental code-point.
++              breakPoint += 1;
++              if (breakPoint == b.length()) {
++                // Break before instead of after if this is the last code-point.
++                breakPoint -= 2;
++              }
++            }
++            b.insert(breakPoint, "
");
+             widthIndex += columnWidth;
+         }
+ 
+diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/StringUtilsTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/StringUtilsTest.java
+index c4b2acc..6867072 100644
+--- a/java-diff-utils/src/test/java/com/github/difflib/text/StringUtilsTest.java
++++ b/java-diff-utils/src/test/java/com/github/difflib/text/StringUtilsTest.java
+@@ -49,6 +49,8 @@ public void testWrapText_String_int() {
+         assertEquals("te
st", StringUtils.wrapText("test", 2));
+         assertEquals("tes
t", StringUtils.wrapText("test", 3));
+         assertEquals("test", StringUtils.wrapText("test", 10));
++        assertEquals(".\uD800\uDC01
.", StringUtils.wrapText(".\uD800\uDC01.", 2));
++        assertEquals("..
\uD800\uDC01", StringUtils.wrapText("..\uD800\uDC01", 3));
+     }
+ 
+     @Test
\ No newline at end of file

From bf4ec94cc9c76fe9b8501e6deba3cb68629d7db4 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 14 Mar 2021 23:42:10 +0100
Subject: [PATCH 175/266] fixes #117

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad47f32b..fef10d30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,9 @@ This project uses a custom versioning scheme (and not [Semantic Versioning](http
 * bugfixing on new UnifiedDiff reader / writer for multifile usage
 * bugfix for wrong DiffRow type while transforming from a patch that removed a line in one changeset
 * introduced change position into UnifiedDiff reader
+* introduced first version of conflict output possibility (like GIT merge conflict)
+  * moved verification to `AbstractDelta`
+  * introduced `ConflictOutput` to `Patch` to add optional behaviour to patch conflicts
 
 ## [4.9]
 

From 91a42b2793472fccefa424d145e9aada08eedd7c Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Wed, 28 Apr 2021 21:14:32 +0200
Subject: [PATCH 176/266] fixes #120

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e0f364f1..93899e85 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ Javadocs of the actual release version: [JavaDocs java-diff-utils](https://java-
 
 ## Examples
 
-Look [here](https://github.com/wumpz/java-diff-utils/wiki) to find more helpful informations and examples.
+Look [here](https://github.com/java-diff-utils/java-diff-utils/wiki) to find more helpful informations and examples.
 
 These two outputs are generated using this java-diff-utils. The source code can also be found at the *Examples* page:
 

From 94674a0ad70563083714c1242c154cb0f89fad41 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Wed, 28 Apr 2021 22:00:20 +0200
Subject: [PATCH 177/266] fixes #119

---
 .../difflib/GenerateUnifiedDiffTest.java      | 14 ++++++++++++-
 .../difflib/text/DiffRowGeneratorTest.java    | 21 +++++++++++++++++++
 .../difflib/text/issue_119_original.txt       |  4 ++++
 .../github/difflib/text/issue_119_revised.txt |  4 ++++
 4 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/text/issue_119_original.txt
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/text/issue_119_revised.txt

diff --git a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
index a631b8df..e13d41aa 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
@@ -12,6 +12,7 @@
 import java.util.Collections;
 import java.util.List;
 import static java.util.stream.Collectors.joining;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -204,8 +205,19 @@ public void testFailingPatchByException() throws IOException {
         baseLines.set(40, baseLines.get(40) + " corrupted ");
         
         assertThrows(PatchFailedException.class, () -> DiffUtils.patch(baseLines, p));
+    }
+    
+    @Test
+    public void testWrongContextLength() throws IOException {
+        List original = fileToLines(TestConstants.BASE_FOLDER_RESOURCES + "com/github/difflib/text/issue_119_original.txt");
+        List revised = fileToLines(TestConstants.BASE_FOLDER_RESOURCES + "com/github/difflib/text/issue_119_revised.txt");
+
+        Patch patch = DiffUtils.diff(original, revised);
+        List udiff = UnifiedDiffUtils.generateUnifiedDiff("a/$filename", "b/$filename",
+                original, patch, 3);
         
+        //System.out.println(udiff.stream().collect(joining("\n")));
         
-        
+        assertThat(udiff).contains("@@ -1,4 +1,4 @@");
     }
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
index 389ba1f1..d9a3c4ff 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
@@ -662,4 +662,25 @@ public void testCorrectChangeIssue114_2() throws IOException {
         assertThat(rows).extracting(item -> item.getTag().name()).containsExactly("CHANGE", "DELETE", "EQUAL", "CHANGE", "EQUAL");
         assertThat(rows.get(1).toString()).isEqualTo("[DELETE,~B~,]");
     }
+    
+    @Test
+    public void testIssue119WrongContextLength() throws IOException {
+        String original = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue_119_original.txt")).collect(joining("\n"));
+        String revised = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue_119_revised.txt")).collect(joining("\n"));
+
+        DiffRowGenerator generator = DiffRowGenerator.create()
+                .showInlineDiffs(true)
+                .mergeOriginalRevised(true)
+                .inlineDiffByWord(true)
+                .oldTag(f -> "~")
+                .newTag(f -> "**")
+                .build();
+        List rows = generator.generateDiffRows(
+                Arrays.asList(original.split("\n")),
+                Arrays.asList(revised.split("\n")));
+
+        rows.stream()
+                .filter(item -> item.getTag() != DiffRow.Tag.EQUAL)
+                .forEach(System.out::println);
+    }
 }
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/text/issue_119_original.txt b/java-diff-utils/src/test/resources/com/github/difflib/text/issue_119_original.txt
new file mode 100644
index 00000000..2eea1b48
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/text/issue_119_original.txt
@@ -0,0 +1,4 @@
+const world: string = 'world',
+      p: number | undefined = 42;
+
+console.log(`Hello, ${world}!`);
\ No newline at end of file
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/text/issue_119_revised.txt b/java-diff-utils/src/test/resources/com/github/difflib/text/issue_119_revised.txt
new file mode 100644
index 00000000..522c44e8
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/text/issue_119_revised.txt
@@ -0,0 +1,4 @@
+const world: string = 'world';
+const p: number | undefined = 42;
+
+console.log(`Hello, ${world}!`);
\ No newline at end of file

From 5a11752126883c963091e2f029e446c26d2e3d7e Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Wed, 28 Apr 2021 23:21:51 +0200
Subject: [PATCH 178/266] [maven-release-plugin] prepare release
 java-diff-utils-parent-4.10

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index f3b2c1ad..e62e3c02 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.10-SNAPSHOT
+        4.10
     
     java-diff-utils-jgit
     java-diff-utils-jgit
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index 8f8fd0b5..6ae7e5f1 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -7,7 +7,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.10-SNAPSHOT
+        4.10
     
     
         UTF-8
diff --git a/pom.xml b/pom.xml
index 7d02aa26..8b0ccd32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.10-SNAPSHOT
+    4.10
     java-diff-utils-parent
     pom
     
@@ -29,7 +29,7 @@
         scm:git:https://github.com/java-diff-utils/java-diff-utils.git
         scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
         https://github.com/java-diff-utils/java-diff-utils.git
-        HEAD
+        java-diff-utils-parent-4.10
     
     
         GitHub Issues

From f03df6cf3894f9c8741c8c12372d441bf59e3b32 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Wed, 28 Apr 2021 23:21:52 +0200
Subject: [PATCH 179/266] [maven-release-plugin] prepare for next development
 iteration

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index e62e3c02..ae872975 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.10
+        4.11-SNAPSHOT
     
     java-diff-utils-jgit
     java-diff-utils-jgit
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index 6ae7e5f1..734f3d5f 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -7,7 +7,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.10
+        4.11-SNAPSHOT
     
     
         UTF-8
diff --git a/pom.xml b/pom.xml
index 8b0ccd32..50dd9510 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.10
+    4.11-SNAPSHOT
     java-diff-utils-parent
     pom
     
@@ -29,7 +29,7 @@
         scm:git:https://github.com/java-diff-utils/java-diff-utils.git
         scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
         https://github.com/java-diff-utils/java-diff-utils.git
-        java-diff-utils-parent-4.10
+        HEAD
     
     
         GitHub Issues

From d384ab6178998d9d2dab6d77834693ed367b8b44 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Wed, 28 Apr 2021 23:33:53 +0200
Subject: [PATCH 180/266]

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fef10d30..7662f7e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,10 @@ This project uses a custom versioning scheme (and not [Semantic Versioning](http
 
 ### Changed
 
+## [4.11]
+
+### Changed
+
 ## [4.10]
 
 ### Changed

From 3d5343c2830cdc115c9062a391899d2817153283 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Wed, 5 May 2021 22:14:56 +0200
Subject: [PATCH 181/266] fixes #107 refinement

---
 .../unifieddiff/UnifiedDiffReader.java        |   15 +-
 .../unifieddiff/UnifiedDiffReaderTest.java    |   34 +-
 .../unifieddiff/problem_diff_issue107_3.diff  |   24 +
 .../unifieddiff/problem_diff_issue107_4.diff  | 2963 +++++++++++++++++
 .../unifieddiff/problem_diff_issue107_5.diff  |  835 +++++
 5 files changed, 3866 insertions(+), 5 deletions(-)
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue107_3.diff
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue107_4.diff
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue107_5.diff

diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
index 8a1064fb..da75e6ff 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
@@ -106,6 +106,8 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
             if (line != null) {
                 processLine(line, CHUNK);
                 while ((line = READER.readLine()) != null) {
+                    line = checkForNoNewLineAtTheEndOfTheFile(line);
+                    
                     if (!processLine(line, LINE_NORMAL, LINE_ADD, LINE_DEL)) {
                         throw new UnifiedDiffParserException("expected data line not found");
                     }
@@ -118,10 +120,7 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
                 }
                 line = READER.readLine();
 
-                if ("\\ No newline at end of file".equals(line)) {
-                    actualFile.setNoNewLineAtTheEndOfTheFile(true);
-                    line = READER.readLine();
-                }
+                line = checkForNoNewLineAtTheEndOfTheFile(line);
             }
             if (line == null || (line.startsWith("--") && !line.startsWith("---"))) {
                 break;
@@ -142,6 +141,14 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
         return data;
     }
 
+    private String checkForNoNewLineAtTheEndOfTheFile(String line) throws IOException {
+        if ("\\ No newline at end of file".equals(line)) {
+            actualFile.setNoNewLineAtTheEndOfTheFile(true);
+            return READER.readLine();
+        }
+        return line;
+    }
+
     static String[] parseFileNames(String line) {
         String[] split = line.split(" ");
         return new String[]{
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
index 38d26882..fdc80fd8 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -277,12 +277,44 @@ public void testParseIssue107_2() throws IOException {
 
         assertThat(diff.getFiles().size()).isEqualTo(2);
 
-        final UnifiedDiffFile file = diff.getFiles().get(0);
         UnifiedDiffFile file1 = diff.getFiles().get(0);
         assertThat(file1.getFromFile()).isEqualTo("Main.java");
         assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
 
     }
+    
+    @Test
+    public void testParseIssue107_3() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue107_3.diff"));
+
+        assertThat(diff.getFiles().size()).isEqualTo(1);
+
+        UnifiedDiffFile file1 = diff.getFiles().get(0);
+        assertThat(file1.getFromFile()).isEqualTo("Billion laughs attack.md");
+        assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
+
+    }
+    
+    @Test
+    public void testParseIssue107_4() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue107_4.diff"));
+
+        assertThat(diff.getFiles().size()).isEqualTo(27);
+
+        assertThat(diff.getFiles()).extracting(f -> f.getFromFile()).contains("README.md");
+    }
+    
+    @Test
+    public void testParseIssue107_5() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue107_5.diff"));
+
+        assertThat(diff.getFiles().size()).isEqualTo(22);
+
+        assertThat(diff.getFiles()).extracting(f -> f.getFromFile()).contains("rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorFactoryTest.java");
+    }
 
     @Test
     public void testParseIssue110() throws IOException {
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue107_3.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue107_3.diff
new file mode 100644
index 00000000..181b800d
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue107_3.diff
@@ -0,0 +1,24 @@
+diff -r 4d1de0a006b7 -r ace1482360cb Billion laughs attack.md
+--- a/Billion laughs attack.md	Mon Feb 24 13:37:17 2020 +0000
++++ b/Billion laughs attack.md	Mon Feb 24 14:22:50 2020 +0000
+@@ -11,14 +11,12 @@
+ 
+ *The problem is*: when you stay with the mouth open and eyes closed then they may throw trash and you get sick.
+ 
+-
+-SnakeYAML Engine [has a way to restrict the amount of aliases for collections](https://bitbucket.org/asomov/snakeyaml-engine/src/default/src/test/java/org/snakeyaml/engine/usecases/references/ReferencesTest.java) to fail early without allocation too much resources.
++SnakeYAML 1.26+ [has a way to restrict the amount of aliases for collections](https://bitbucket.org/asomov/snakeyaml/src/default/src/test/java/org/yaml/snakeyaml/issues/issue377/ReferencesTest.java) to fail early without allocation too much resources.
+ 
+ # Solution #
+ 
+-1. If the YAML is not coming from untrusted source (it is merely a configuration file) then it is a false positive. Just ignore it. The quality of NVD database is very low and contains tons of issues which appear to be false positives.
+-2. Migrate to [SnakeYAML Engine](https://bitbucket.org/asomov/snakeyaml-engine/src/default/). It has a configuration option to restrict aliases for collections (the aliases for scalars cannot grow and they are not restricted)
+-3. Check how it is done in SnakeYAML Engine and build your own SnakeYAML version with the same change.
+-4. Read the YAML and check its quality before giving the document to SnakeYAML (count `*` and `&` for instance)
++1. Update to SnakeYAML 1.26. It has a configuration option to restrict aliases for collections (the aliases for scalars cannot grow and they are not restricted)
++2. If the YAML is not coming from untrusted source (it is merely a configuration file) then it is a false positive. Just ignore it. The quality of NVD database is very low and contains tons of issues which appear to be false positives.
++3. Read the YAML and check its quality before giving the document to SnakeYAML (count `*` and `&` for instance)
+ 
+-Enjoy.
+\ No newline at end of file
++Enjoy.
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue107_4.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue107_4.diff
new file mode 100644
index 00000000..f2dfd8f0
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue107_4.diff
@@ -0,0 +1,2963 @@
+diff --git a/.travis/travis_configure_ssl.sh b/.travis/travis_configure_ssl.sh
+index c01affe09c..e07aa70da5 100755
+--- a/.travis/travis_configure_ssl.sh
++++ b/.travis/travis_configure_ssl.sh
+@@ -22,16 +22,7 @@ set_conf_property "ssl_cert_file" "server.crt"
+ set_conf_property "ssl_key_file" "server.key"
+ set_conf_property "ssl_ca_file" "root.crt"
+ 
+-enable_ssl_property "testsinglecertfactory"
+-enable_ssl_property "sslhostnossl9"
+-enable_ssl_property "sslhostgh9"
+-enable_ssl_property "sslhostbh9"
+-enable_ssl_property "sslhostsslgh9"
+-enable_ssl_property "sslhostsslbh9"
+-enable_ssl_property "sslhostsslcertgh9"
+-enable_ssl_property "sslhostsslcertbh9"
+-enable_ssl_property "sslcertgh9"
+-enable_ssl_property "sslcertbh9"
++enable_ssl_property "enable_ssl_tests"
+ 
+ PG_DATA_DIR="/etc/postgresql/${PG_VERSION}/main/"
+ sudo cp certdir/server/pg_hba.conf "/etc/postgresql/${PG_VERSION}/main/pg_hba.conf"
+diff --git a/README.md b/README.md
+index e018dcfffb..ce63ac21bc 100644
+--- a/README.md
++++ b/README.md
+@@ -111,7 +111,7 @@ In addition to the standard connection parameters the driver supports a number o
+ | password                      | String  | null    | The database user's password. |
+ | ssl                           | Boolean | false   | Control use of SSL (true value causes SSL to be required) |
+ | sslfactory                    | String  | null    | Provide a SSLSocketFactory class when using SSL. |
+-| sslfactoryarg                 | String  | null    | Argument forwarded to constructor of SSLSocketFactory class. |
++| sslfactoryarg (deprecated)    | String  | null    | Argument forwarded to constructor of SSLSocketFactory class. |
+ | sslmode                       | String  | null    | Parameter governing the use of SSL. |
+ | sslcert                       | String  | null    | The location of the client's SSL certificate |
+ | sslkey                        | String  | null    | The location of the client's PKCS#8 SSL key |
+@@ -144,7 +144,7 @@ In addition to the standard connection parameters the driver supports a number o
+ | hostRecheckSeconds            | Integer | 10      | Specifies period (seconds) after which the host status is checked again in case it has changed |
+ | loadBalanceHosts              | Boolean | false   | If disabled hosts are connected in the given order. If enabled hosts are chosen randomly from the set of suitable candidates |
+ | socketFactory                 | String  | null    | Specify a socket factory for socket creation |
+-| socketFactoryArg              | String  | null    | Argument forwarded to constructor of SocketFactory class. |
++| socketFactoryArg (deprecated) | String  | null    | Argument forwarded to constructor of SocketFactory class. |
+ | autosave                      | String  | never   | Specifies what the driver should do if a query fails, possible values: always, never, conservative |
+ | preferQueryMode               | String  | extended | Specifies which mode is used to execute queries to database, possible values: extended, extendedForPrepared, extendedCacheEverything, simple |
+ | reWriteBatchedInserts         | Boolean | false  | Enable optimization to rewrite and collapse compatible INSERT statements that are batched. |
+diff --git a/build.properties b/build.properties
+index 91e4cd10a7..548d2aaf94 100644
+--- a/build.properties
++++ b/build.properties
+@@ -19,3 +19,4 @@ preparethreshold=5
+ loggerLevel=OFF
+ loggerFile=target/pgjdbc-tests.log
+ protocolVersion=0
++sslpassword=sslpwd
+diff --git a/certdir/README b/certdir/README
+deleted file mode 100644
+index 8bbbf5b1c3..0000000000
+--- a/certdir/README
++++ /dev/null
+@@ -1,57 +0,0 @@
+-
+-To run the SSL tests, the following properties are used:
+-
+-certdir: directory where the certificates and keys are store
+-
+-ssl<8|9>: a connection string to the appropriate database
+-TYPE is the TYPE or METHOD field from pg_hba.conf that is: host, hostnossl,
+-hostssl and the special types hostsslcert, that corresponds
+-to a hostssl type with clientcert=1 and cert that corresponds
+-to a hostssl type with cert authentication. 'gh' means, the server certificate
+-matches the hostname (good hostname), 'bh' means it is not (bad
+-hostname). It can be simulated with a single database, if two names
+-can be used i.e. localhost and 127.0.0.1. ssloff points to a database,
+-where ssl is off. The last number is the server major version
+-
+-For each connection, the following files should be placed into certdir:
+-goodclient.crt, badclient.crt, goodclient.pk8, badclient.pk8, goodroot.crt, badroot.crt
+-optionally prefixed by the value of sslprefix property, if
+-different files are necessary for different connect strings.
+-
+-This directory contains example certificates generated by the following
+-commands:
+-
+-openssl req -x509 -newkey rsa:1024 -days 3650 -keyout goodclient.key -out goodclient.crt
+-#Common name is test, password is sslpwd
+-
+-openssl req -x509 -newkey rsa:1024 -days 3650 -keyout badclient.key -out badclient.crt
+-#Common name is test, password is sslpwd
+-
+-openssl req -x509 -newkey rsa:1024 -days 3650 -nodes -keyout badroot.key -out badroot.crt
+-#Common name is localhost
+-rm badroot.key
+-
+-openssl pkcs8 -topk8 -in goodclient.key -out goodclient.pk8 -outform DER -v1 PBE-MD5-DES
+-openssl pkcs8 -topk8 -in badclient.key -out badclient.pk8 -outform DER -v1 PBE-MD5-DES
+-cp goodclient.crt server/root.crt
+-cd server
+-openssl req -x509 -newkey rsa:1024 -nodes -days 3650 -keyout server.key -out server.crt
+-cp server.crt ../goodroot.crt
+-#Common name is localhost, no password
+-
+-The subdirectory server contains what should be copied to the PGDATA directory.
+-If you do not overwrite the pg_hba.conf then remember to comment out all lines
+-starting with "host all".
+-
+-For the tests the sslinfo module must be installed into every database.
+-The ssl=on must be set in postgresql.conf
+-
+-The following command creates the databases and installs the sslinfo module.
+-
+-for db in hostssldb hostnossldb certdb hostsslcertdb; do
+-  createdb $db
+-  psql $db -c "create extension sslinfo"
+-done
+-
+-The username for connecting to postgres as specified in build.local.properties tests has to be "test".
+-
+diff --git a/certdir/README.md b/certdir/README.md
+new file mode 100644
+index 0000000000..ff041e3c49
+--- /dev/null
++++ b/certdir/README.md
+@@ -0,0 +1,44 @@
++To run the SSL tests, the following properties are used:
++
++* certdir: directory where the certificates and keys are store
++* enable_ssl_tests: enables SSL tests
++
++In order to configure PostgreSQL for SSL tests, the following changes should be applied:
++
++* Copy server/server.crt, server/server.key, and server/root.crt to $PGDATA directory
++* In $PGDATA directory: chmod 0600 server.crt server.key root.crt
++* Set ssl=on in postgresql.conf
++* Set ssl_cert_file=server.crt in postgresql.conf
++* Set ssl_key_file=server.key in postgresql.conf
++* Set ssl_ca_file=root.crt in postgresql.conf
++* Add databases for SSL tests. Note: sslinfo extension is used in tests to tell if connection is using SSL or not
++
++      for db in hostssldb hostnossldb certdb hostsslcertdb; do
++        createdb $db
++        psql $db -c "create extension sslinfo"
++      done
++* Add test databases to pg_hba.conf. If you do not overwrite the pg_hba.conf then remember to comment out all lines
++  starting with "host all".
++* Uncomment enable_ssl_tests=true in ssltests.properties
++* The username for connecting to postgres as specified in build.local.properties tests has to be "test".
++
++This directory contains example certificates generated by the following
++commands:
++
++openssl req -x509 -newkey rsa:1024 -days 3650 -keyout goodclient.key -out goodclient.crt
++#Common name is test, password is sslpwd
++
++openssl req -x509 -newkey rsa:1024 -days 3650 -keyout badclient.key -out badclient.crt
++#Common name is test, password is sslpwd
++
++openssl req -x509 -newkey rsa:1024 -days 3650 -nodes -keyout badroot.key -out badroot.crt
++#Common name is localhost
++rm badroot.key
++
++openssl pkcs8 -topk8 -in goodclient.key -out goodclient.pk8 -outform DER -v1 PBE-MD5-DES
++openssl pkcs8 -topk8 -in badclient.key -out badclient.pk8 -outform DER -v1 PBE-MD5-DES
++cp goodclient.crt server/root.crt
++cd server
++openssl req -x509 -newkey rsa:1024 -nodes -days 3650 -keyout server.key -out server.crt
++cp server.crt ../goodroot.crt
++#Common name is localhost, no password
+diff --git a/docs/documentation/head/connect.md b/docs/documentation/head/connect.md
+index 9763b76d8d..9881060512 100644
+--- a/docs/documentation/head/connect.md
++++ b/docs/documentation/head/connect.md
+@@ -88,7 +88,7 @@ Connection conn = DriverManager.getConnection(url);
+ 	establishing a SSL connection. For more information see the section
+ 	called [“Custom SSLSocketFactory”](ssl-factory.html). 
+ 
+-* **sslfactoryarg** = String
++* **sslfactoryarg** (deprecated) = String
+ 
+ 	This value is an optional argument to the constructor of the sslfactory
+ 	class provided above. For more information see the section called [“Custom SSLSocketFactory”](ssl-factory.html). 
+@@ -408,7 +408,7 @@ Connection conn = DriverManager.getConnection(url);
+ 	This class must have a zero argument constructor or a single argument constructor taking a String argument. 
+ 	This argument may optionally be supplied by `socketFactoryArg`.
+ 
+-* **socketFactoryArg** = String
++* **socketFactoryArg** (deprecated) = String
+ 
+ 	This value is an optional argument to the constructor of the socket factory
+ 	class provided above. 
+diff --git a/pgjdbc/src/main/java/org/postgresql/PGProperty.java b/pgjdbc/src/main/java/org/postgresql/PGProperty.java
+index e56e05eb73..4afefe2356 100644
+--- a/pgjdbc/src/main/java/org/postgresql/PGProperty.java
++++ b/pgjdbc/src/main/java/org/postgresql/PGProperty.java
+@@ -173,17 +173,18 @@
+       "Enable optimization that disables column name sanitiser"),
+ 
+   /**
+-   * Control use of SSL (any non-null value causes SSL to be required).
++   * Control use of SSL: empty or {@code true} values imply {@code sslmode==verify-full}
+    */
+   SSL("ssl", null, "Control use of SSL (any non-null value causes SSL to be required)"),
+ 
+   /**
+-   * Parameter governing the use of SSL. The allowed values are {@code require}, {@code verify-ca},
+-   * {@code verify-full}, or {@code disable} ({@code allow} and {@code prefer} are not implemented)
+-   * If not set, the {@code ssl} property may be checked to enable SSL mode.
++   * Parameter governing the use of SSL. The allowed values are {@code disable}, {@code allow},
++   * {@code prefer}, {@code require}, {@code verify-ca}, {@code verify-full}.
++   * If {@code ssl} property is empty or set to {@code true} it implies {@code verify-full}.
++   * Default mode is "require"
+    */
+-  SSL_MODE("sslmode", null, "Parameter governing the use of SSL",false,
+-      "disable", "require", "verify-ca", "verify-full"),
++  SSL_MODE("sslmode", null, "Parameter governing the use of SSL", false,
++      "disable", "allow", "prefer", "require", "verify-ca", "verify-full"),
+ 
+   /**
+    * Classname of the SSL Factory to use (instance of {@code javax.net.ssl.SSLSocketFactory}).
+@@ -192,7 +193,9 @@
+ 
+   /**
+    * The String argument to give to the constructor of the SSL Factory.
++   * @deprecated use {@code ..Factory(Properties)} constructor.
+    */
++  @Deprecated
+   SSL_FACTORY_ARG("sslfactoryarg", null,
+       "Argument forwarded to constructor of SSLSocketFactory class."),
+ 
+@@ -279,7 +282,9 @@
+ 
+   /**
+    * The String argument to give to the constructor of the Socket Factory.
++   * @deprecated use {@code ..Factory(Properties)} constructor.
+    */
++  @Deprecated
+   SOCKET_FACTORY_ARG("socketFactoryArg", null,
+       "Argument forwarded to constructor of SocketFactory class."),
+ 
+diff --git a/pgjdbc/src/main/java/org/postgresql/core/PGStream.java b/pgjdbc/src/main/java/org/postgresql/core/PGStream.java
+index 63065730a0..6f0f3a2bea 100644
+--- a/pgjdbc/src/main/java/org/postgresql/core/PGStream.java
++++ b/pgjdbc/src/main/java/org/postgresql/core/PGStream.java
+@@ -21,6 +21,7 @@
+ import java.io.Writer;
+ import java.net.InetSocketAddress;
+ import java.net.Socket;
++import java.net.SocketTimeoutException;
+ import java.sql.SQLException;
+ import javax.net.SocketFactory;
+ 
+@@ -109,7 +110,19 @@ public SocketFactory getSocketFactory() {
+    * @throws IOException if something wrong happens
+    */
+   public boolean hasMessagePending() throws IOException {
+-    return pg_input.available() > 0 || connection.getInputStream().available() > 0;
++    if (pg_input.available() > 0) {
++      return true;
++    }
++    // In certain cases, available returns 0, yet there are bytes
++    int soTimeout = getNetworkTimeout();
++    setNetworkTimeout(1);
++    try {
++      return pg_input.peek() != -1;
++    } catch (SocketTimeoutException e) {
++      return false;
++    } finally {
++      setNetworkTimeout(soTimeout);
++    }
+   }
+ 
+   /**
+diff --git a/pgjdbc/src/main/java/org/postgresql/core/SocketFactoryFactory.java b/pgjdbc/src/main/java/org/postgresql/core/SocketFactoryFactory.java
+index e7cfd3262d..09efa75f07 100644
+--- a/pgjdbc/src/main/java/org/postgresql/core/SocketFactoryFactory.java
++++ b/pgjdbc/src/main/java/org/postgresql/core/SocketFactoryFactory.java
+@@ -6,6 +6,7 @@
+ package org.postgresql.core;
+ 
+ import org.postgresql.PGProperty;
++import org.postgresql.ssl.LibPQFactory;
+ import org.postgresql.util.GT;
+ import org.postgresql.util.ObjectFactory;
+ import org.postgresql.util.PSQLException;
+@@ -14,6 +15,7 @@
+ import java.util.Properties;
+ 
+ import javax.net.SocketFactory;
++import javax.net.ssl.SSLSocketFactory;
+ 
+ /**
+  * Instantiates {@link SocketFactory} based on the {@link PGProperty#SOCKET_FACTORY}.
+@@ -44,4 +46,28 @@ public static SocketFactory getSocketFactory(Properties info) throws PSQLExcepti
+     }
+   }
+ 
++  /**
++   * Instantiates {@link SSLSocketFactory} based on the {@link PGProperty#SSL_FACTORY}.
++   *
++   * @param info connection properties
++   * @return SSL socket factory
++   * @throws PSQLException if something goes wrong
++   */
++  public static SSLSocketFactory getSslSocketFactory(Properties info) throws PSQLException {
++    String classname = PGProperty.SSL_FACTORY.get(info);
++    if (classname == null
++        || "org.postgresql.ssl.jdbc4.LibPQFactory".equals(classname)
++        || "org.postgresql.ssl.LibPQFactory".equals(classname)) {
++      return new LibPQFactory(info);
++    }
++    try {
++      return (SSLSocketFactory) ObjectFactory.instantiate(classname, info, true,
++          PGProperty.SSL_FACTORY_ARG.get(info));
++    } catch (Exception e) {
++      throw new PSQLException(
++          GT.tr("The SSLSocketFactory class provided {0} could not be instantiated.", classname),
++          PSQLState.CONNECTION_FAILURE, e);
++    }
++  }
++
+ }
+diff --git a/pgjdbc/src/main/java/org/postgresql/core/v3/ConnectionFactoryImpl.java b/pgjdbc/src/main/java/org/postgresql/core/v3/ConnectionFactoryImpl.java
+index 749af95889..c83ce34c59 100644
+--- a/pgjdbc/src/main/java/org/postgresql/core/v3/ConnectionFactoryImpl.java
++++ b/pgjdbc/src/main/java/org/postgresql/core/v3/ConnectionFactoryImpl.java
+@@ -21,6 +21,7 @@
+ import org.postgresql.hostchooser.HostChooserFactory;
+ import org.postgresql.hostchooser.HostRequirement;
+ import org.postgresql.hostchooser.HostStatus;
++import org.postgresql.jdbc.SslMode;
+ import org.postgresql.sspi.ISSPIClient;
+ import org.postgresql.util.GT;
+ import org.postgresql.util.HostSpec;
+@@ -42,7 +43,6 @@
+ import java.util.logging.Level;
+ import java.util.logging.LogRecord;
+ import java.util.logging.Logger;
+-
+ import javax.net.SocketFactory;
+ 
+ /**
+@@ -82,32 +82,71 @@ private ISSPIClient createSSPI(PGStream pgStream,
+     }
+   }
+ 
+-  @Override
+-  public QueryExecutor openConnectionImpl(HostSpec[] hostSpecs, String user, String database,
+-      Properties info) throws SQLException {
+-    // Extract interesting values from the info properties:
+-    // - the SSL setting
+-    boolean requireSSL;
+-    boolean trySSL;
+-    String sslmode = PGProperty.SSL_MODE.get(info);
+-    if (sslmode == null) { // Fall back to the ssl property
+-      // assume "true" if the property is set but empty
+-      requireSSL = trySSL = PGProperty.SSL.getBoolean(info) || "".equals(PGProperty.SSL.get(info));
+-    } else {
+-      if ("disable".equals(sslmode)) {
+-        requireSSL = trySSL = false;
+-      } else if ("require".equals(sslmode) || "verify-ca".equals(sslmode)
+-          || "verify-full".equals(sslmode)) {
+-        requireSSL = trySSL = true;
++  private PGStream tryConnect(String user, String database,
++      Properties info, SocketFactory socketFactory, HostSpec hostSpec,
++      SslMode sslMode)
++      throws SQLException, IOException {
++    int connectTimeout = PGProperty.CONNECT_TIMEOUT.getInt(info) * 1000;
++
++    PGStream newStream = new PGStream(socketFactory, hostSpec, connectTimeout);
++
++    // Construct and send an ssl startup packet if requested.
++    newStream = enableSSL(newStream, sslMode, info, connectTimeout);
++
++    // Set the socket timeout if the "socketTimeout" property has been set.
++    int socketTimeout = PGProperty.SOCKET_TIMEOUT.getInt(info);
++    if (socketTimeout > 0) {
++      newStream.getSocket().setSoTimeout(socketTimeout * 1000);
++    }
++
++    // Enable TCP keep-alive probe if required.
++    boolean requireTCPKeepAlive = PGProperty.TCP_KEEP_ALIVE.getBoolean(info);
++    newStream.getSocket().setKeepAlive(requireTCPKeepAlive);
++
++    // Try to set SO_SNDBUF and SO_RECVBUF socket options, if requested.
++    // If receiveBufferSize and send_buffer_size are set to a value greater
++    // than 0, adjust. -1 means use the system default, 0 is ignored since not
++    // supported.
++
++    // Set SO_RECVBUF read buffer size
++    int receiveBufferSize = PGProperty.RECEIVE_BUFFER_SIZE.getInt(info);
++    if (receiveBufferSize > -1) {
++      // value of 0 not a valid buffer size value
++      if (receiveBufferSize > 0) {
++        newStream.getSocket().setReceiveBufferSize(receiveBufferSize);
+       } else {
+-        throw new PSQLException(GT.tr("Invalid sslmode value: {0}", sslmode),
+-            PSQLState.CONNECTION_UNABLE_TO_CONNECT);
++        LOGGER.log(Level.WARNING, "Ignore invalid value for receiveBufferSize: {0}", receiveBufferSize);
+       }
+     }
+ 
+-    boolean requireTCPKeepAlive = PGProperty.TCP_KEEP_ALIVE.getBoolean(info);
++    // Set SO_SNDBUF write buffer size
++    int sendBufferSize = PGProperty.SEND_BUFFER_SIZE.getInt(info);
++    if (sendBufferSize > -1) {
++      if (sendBufferSize > 0) {
++        newStream.getSocket().setSendBufferSize(sendBufferSize);
++      } else {
++        LOGGER.log(Level.WARNING, "Ignore invalid value for sendBufferSize: {0}", sendBufferSize);
++      }
++    }
+ 
+-    int connectTimeout = PGProperty.CONNECT_TIMEOUT.getInt(info) * 1000;
++    if (LOGGER.isLoggable(Level.FINE)) {
++      LOGGER.log(Level.FINE, "Receive Buffer Size is {0}", newStream.getSocket().getReceiveBufferSize());
++      LOGGER.log(Level.FINE, "Send Buffer Size is {0}", newStream.getSocket().getSendBufferSize());
++    }
++
++    List paramList = getParametersForStartup(user, database, info);
++    sendStartupPacket(newStream, paramList);
++
++    // Do authentication (until AuthenticationOk).
++    doAuthentication(newStream, hostSpec.getHost(), user, info);
++
++    return newStream;
++  }
++
++  @Override
++  public QueryExecutor openConnectionImpl(HostSpec[] hostSpecs, String user, String database,
++      Properties info) throws SQLException {
++    SslMode sslMode = SslMode.of(info);
+ 
+     HostRequirement targetServerType;
+     String targetServerTypeStr = PGProperty.TARGET_SERVER_TYPE.get(info);
+@@ -149,59 +188,62 @@ public QueryExecutor openConnectionImpl(HostSpec[] hostSpecs, String user, Strin
+ 
+       PGStream newStream = null;
+       try {
+-        newStream = new PGStream(socketFactory, hostSpec, connectTimeout);
+-
+-        // Construct and send an ssl startup packet if requested.
+-        if (trySSL) {
+-          newStream = enableSSL(newStream, requireSSL, info, connectTimeout);
+-        }
+-
+-        // Set the socket timeout if the "socketTimeout" property has been set.
+-        int socketTimeout = PGProperty.SOCKET_TIMEOUT.getInt(info);
+-        if (socketTimeout > 0) {
+-          newStream.getSocket().setSoTimeout(socketTimeout * 1000);
+-        }
+-
+-        // Enable TCP keep-alive probe if required.
+-        newStream.getSocket().setKeepAlive(requireTCPKeepAlive);
+-
+-        // Try to set SO_SNDBUF and SO_RECVBUF socket options, if requested.
+-        // If receiveBufferSize and send_buffer_size are set to a value greater
+-        // than 0, adjust. -1 means use the system default, 0 is ignored since not
+-        // supported.
+-
+-        // Set SO_RECVBUF read buffer size
+-        int receiveBufferSize = PGProperty.RECEIVE_BUFFER_SIZE.getInt(info);
+-        if (receiveBufferSize > -1) {
+-          // value of 0 not a valid buffer size value
+-          if (receiveBufferSize > 0) {
+-            newStream.getSocket().setReceiveBufferSize(receiveBufferSize);
+-          } else {
+-            LOGGER.log(Level.WARNING, "Ignore invalid value for receiveBufferSize: {0}", receiveBufferSize);
+-          }
+-        }
++        try {
++          newStream = tryConnect(user, database, info, socketFactory, hostSpec, sslMode);
++        } catch (SQLException e) {
++          if (sslMode == SslMode.PREFER
++              && PSQLState.INVALID_AUTHORIZATION_SPECIFICATION.getState().equals(e.getSQLState())) {
++            // Try non-SSL connection to cover case like "non-ssl only db"
++            // Note: PREFER allows loss of encryption, so no significant harm is made
++            Throwable ex = null;
++            try {
++              newStream =
++                  tryConnect(user, database, info, socketFactory, hostSpec, SslMode.DISABLE);
++              LOGGER.log(Level.FINE, "Downgraded to non-encrypted connection for host {0}",
++                  hostSpec);
++            } catch (SQLException ee) {
++              ex = ee;
++            } catch (IOException ee) {
++              ex = ee; // Can't use multi-catch in Java 6 :(
++            }
++            if (ex != null) {
++              log(Level.FINE, "sslMode==PREFER, however non-SSL connection failed as well", ex);
++              // non-SSL failed as well, so re-throw original exception
++              //#if mvn.project.property.postgresql.jdbc.spec >= "JDBC4.1"
++              // Add non-SSL exception as suppressed
++              e.addSuppressed(ex);
++              //#endif
++              throw e;
++            }
++          } else if (sslMode == SslMode.ALLOW
++              && PSQLState.INVALID_AUTHORIZATION_SPECIFICATION.getState().equals(e.getSQLState())) {
++            // Try using SSL
++            Throwable ex = null;
++            try {
++              newStream =
++                  tryConnect(user, database, info, socketFactory, hostSpec, SslMode.REQUIRE);
++              LOGGER.log(Level.FINE, "Upgraded to encrypted connection for host {0}",
++                  hostSpec);
++            } catch (SQLException ee) {
++              ex = ee;
++            } catch (IOException ee) {
++              ex = ee; // Can't use multi-catch in Java 6 :(
++            }
++            if (ex != null) {
++              log(Level.FINE, "sslMode==ALLOW, however SSL connection failed as well", ex);
++              // non-SSL failed as well, so re-throw original exception
++              //#if mvn.project.property.postgresql.jdbc.spec >= "JDBC4.1"
++              // Add SSL exception as suppressed
++              e.addSuppressed(ex);
++              //#endif
++              throw e;
++            }
+ 
+-        // Set SO_SNDBUF write buffer size
+-        int sendBufferSize = PGProperty.SEND_BUFFER_SIZE.getInt(info);
+-        if (sendBufferSize > -1) {
+-          if (sendBufferSize > 0) {
+-            newStream.getSocket().setSendBufferSize(sendBufferSize);
+           } else {
+-            LOGGER.log(Level.WARNING, "Ignore invalid value for sendBufferSize: {0}", sendBufferSize);
++            throw e;
+           }
+         }
+ 
+-        if (LOGGER.isLoggable(Level.FINE)) {
+-          LOGGER.log(Level.FINE, "Receive Buffer Size is {0}", newStream.getSocket().getReceiveBufferSize());
+-          LOGGER.log(Level.FINE, "Send Buffer Size is {0}", newStream.getSocket().getSendBufferSize());
+-        }
+-
+-        List paramList = getParametersForStartup(user, database, info);
+-        sendStartupPacket(newStream, paramList);
+-
+-        // Do authentication (until AuthenticationOk).
+-        doAuthentication(newStream, hostSpec.getHost(), user, info);
+-
+         int cancelSignalTimeout = PGProperty.CANCEL_SIGNAL_TIMEOUT.getInt(info) * 1000;
+ 
+         // Do final startup.
+@@ -230,8 +272,8 @@ public QueryExecutor openConnectionImpl(HostSpec[] hostSpecs, String user, Strin
+         // we trap this an return a more meaningful message for the end user
+         GlobalHostStatusTracker.reportHostStatus(hostSpec, HostStatus.ConnectFail);
+         knownStates.put(hostSpec, HostStatus.ConnectFail);
+-        log(Level.FINE, "ConnectException occurred while connecting to {0}", cex, hostSpec);
+         if (hostIter.hasNext()) {
++          log(Level.FINE, "ConnectException occurred while connecting to {0}", cex, hostSpec);
+           // still more addresses to try
+           continue;
+         }
+@@ -242,8 +284,8 @@ public QueryExecutor openConnectionImpl(HostSpec[] hostSpecs, String user, Strin
+         closeStream(newStream);
+         GlobalHostStatusTracker.reportHostStatus(hostSpec, HostStatus.ConnectFail);
+         knownStates.put(hostSpec, HostStatus.ConnectFail);
+-        log(Level.FINE, "IOException occurred while connecting to {0}", ioe, hostSpec);
+         if (hostIter.hasNext()) {
++          log(Level.FINE, "IOException occurred while connecting to {0}", ioe, hostSpec);
+           // still more addresses to try
+           continue;
+         }
+@@ -251,10 +293,10 @@ public QueryExecutor openConnectionImpl(HostSpec[] hostSpecs, String user, Strin
+             PSQLState.CONNECTION_UNABLE_TO_CONNECT, ioe);
+       } catch (SQLException se) {
+         closeStream(newStream);
+-        log(Level.FINE, "SQLException occurred while connecting to {0}", se, hostSpec);
+         GlobalHostStatusTracker.reportHostStatus(hostSpec, HostStatus.ConnectFail);
+         knownStates.put(hostSpec, HostStatus.ConnectFail);
+         if (hostIter.hasNext()) {
++          log(Level.FINE, "SQLException occurred while connecting to {0}", se, hostSpec);
+           // still more addresses to try
+           continue;
+         }
+@@ -340,8 +382,17 @@ private static String createPostgresTimeZone() {
+     return start + tz.substring(4);
+   }
+ 
+-  private PGStream enableSSL(PGStream pgStream, boolean requireSSL, Properties info, int connectTimeout)
+-      throws IOException, SQLException {
++  private PGStream enableSSL(PGStream pgStream, SslMode sslMode, Properties info,
++      int connectTimeout)
++      throws IOException, PSQLException {
++    if (sslMode == SslMode.DISABLE) {
++      return pgStream;
++    }
++    if (sslMode == SslMode.ALLOW) {
++      // Allow ==> start with plaintext, use encryption if required by server
++      return pgStream;
++    }
++
+     LOGGER.log(Level.FINEST, " FE=> SSLRequest");
+ 
+     // Send SSL request packet
+@@ -357,7 +408,7 @@ private PGStream enableSSL(PGStream pgStream, boolean requireSSL, Properties inf
+         LOGGER.log(Level.FINEST, " <=BE SSLError");
+ 
+         // Server doesn't even know about the SSL handshake protocol
+-        if (requireSSL) {
++        if (sslMode.requireEncryption()) {
+           throw new PSQLException(GT.tr("The server does not support SSL."),
+               PSQLState.CONNECTION_REJECTED);
+         }
+@@ -370,7 +421,7 @@ private PGStream enableSSL(PGStream pgStream, boolean requireSSL, Properties inf
+         LOGGER.log(Level.FINEST, " <=BE SSLRefused");
+ 
+         // Server does not support ssl
+-        if (requireSSL) {
++        if (sslMode.requireEncryption()) {
+           throw new PSQLException(GT.tr("The server does not support SSL."),
+               PSQLState.CONNECTION_REJECTED);
+         }
+@@ -608,14 +659,19 @@ private void doAuthentication(PGStream pgStream, String host, String user, Prope
+                 scramAuthenticator = new org.postgresql.jre8.sasl.ScramAuthenticator(user, password, pgStream);
+                 scramAuthenticator.processServerMechanismsAndInit();
+                 scramAuthenticator.sendScramClientFirstMessage();
+-                //#else
+-                if (true) {
++                // This works as follows:
++                // 1. When tests is run from IDE, it is assumed SCRAM library is on the classpath
++                // 2. In regular build for Java < 8 this `if` is deactivated and the code always throws
++                if (false) {
++                  //#else
+                   throw new PSQLException(GT.tr(
+                           "SCRAM authentication is not supported by this driver. You need JDK >= 8 and pgjdbc >= 42.2.0 (not \".jre\" versions)",
+                           areq), PSQLState.CONNECTION_REJECTED);
++                  //#endif
++                  //#if mvn.project.property.postgresql.jdbc.spec >= "JDBC4.2"
+                 }
+-                //#endif
+                 break;
++                //#endif
+ 
+               //#if mvn.project.property.postgresql.jdbc.spec >= "JDBC4.2"
+               case AUTH_REQ_SASL_CONTINUE:
+diff --git a/pgjdbc/src/main/java/org/postgresql/core/v3/QueryExecutorImpl.java b/pgjdbc/src/main/java/org/postgresql/core/v3/QueryExecutorImpl.java
+index 387a9ac1cd..4dc7f94000 100644
+--- a/pgjdbc/src/main/java/org/postgresql/core/v3/QueryExecutorImpl.java
++++ b/pgjdbc/src/main/java/org/postgresql/core/v3/QueryExecutorImpl.java
+@@ -692,7 +692,7 @@ public synchronized void processNotifies(int timeoutMillis) throws SQLException
+     }
+ 
+     try {
+-      while (pgStream.hasMessagePending() || timeoutMillis >= 0 ) {
++      while (timeoutMillis >= 0 || pgStream.hasMessagePending()) {
+         if (useTimeout && timeoutMillis >= 0) {
+           setSocketTimeout(timeoutMillis);
+         }
+diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/SslMode.java b/pgjdbc/src/main/java/org/postgresql/jdbc/SslMode.java
+new file mode 100644
+index 0000000000..bd2a3d0bcb
+--- /dev/null
++++ b/pgjdbc/src/main/java/org/postgresql/jdbc/SslMode.java
+@@ -0,0 +1,81 @@
++/*
++ * Copyright (c) 2018, PostgreSQL Global Development Group
++ * See the LICENSE file in the project root for more information.
++ */
++
++package org.postgresql.jdbc;
++
++import org.postgresql.PGProperty;
++import org.postgresql.util.GT;
++import org.postgresql.util.PSQLException;
++import org.postgresql.util.PSQLState;
++
++import java.util.Properties;
++
++public enum SslMode {
++  /**
++   * Do not use encrypted connections.
++   */
++  DISABLE("disable"),
++  /**
++   * Start with non-encrypted connection, then try encrypted one.
++   */
++  ALLOW("allow"),
++  /**
++   * Start with encrypted connection, fallback to non-encrypted (default).
++   */
++  PREFER("prefer"),
++  /**
++   * Ensure connection is encrypted.
++   */
++  REQUIRE("require"),
++  /**
++   * Ensure connection is encrypted, and client trusts server certificate.
++   */
++  VERIFY_CA("verify-ca"),
++  /**
++   * Ensure connection is encrypted, client trusts server certificate, and server hostname matches
++   * the one listed in the server certificate.
++   */
++  VERIFY_FULL("verify-full"),
++  ;
++
++  public static final SslMode[] VALUES = values();
++
++  public final String value;
++
++  SslMode(String value) {
++    this.value = value;
++  }
++
++  public boolean requireEncryption() {
++    return this.compareTo(REQUIRE) >= 0;
++  }
++
++  public boolean verifyCertificate() {
++    return this == VERIFY_CA || this == VERIFY_FULL;
++  }
++
++  public boolean verifyPeerName() {
++    return this == VERIFY_FULL;
++  }
++
++  public static SslMode of(Properties info) throws PSQLException {
++    String sslmode = PGProperty.SSL_MODE.get(info);
++    // If sslmode is not set, fallback to ssl parameter
++    if (sslmode == null) {
++      if (PGProperty.SSL.getBoolean(info) || "".equals(PGProperty.SSL.get(info))) {
++        return VERIFY_FULL;
++      }
++      return PREFER;
++    }
++
++    for (SslMode sslMode : VALUES) {
++      if (sslMode.value.equalsIgnoreCase(sslmode)) {
++        return sslMode;
++      }
++    }
++    throw new PSQLException(GT.tr("Invalid sslmode value: {0}", sslmode),
++        PSQLState.CONNECTION_UNABLE_TO_CONNECT);
++  }
++}
+diff --git a/pgjdbc/src/main/java/org/postgresql/ssl/DefaultJavaSSLFactory.java b/pgjdbc/src/main/java/org/postgresql/ssl/DefaultJavaSSLFactory.java
+new file mode 100644
+index 0000000000..9757827e0f
+--- /dev/null
++++ b/pgjdbc/src/main/java/org/postgresql/ssl/DefaultJavaSSLFactory.java
+@@ -0,0 +1,20 @@
++/*
++ * Copyright (c) 2017, PostgreSQL Global Development Group
++ * See the LICENSE file in the project root for more information.
++ */
++
++package org.postgresql.ssl;
++
++import java.util.Properties;
++import javax.net.ssl.SSLSocketFactory;
++
++/**
++ * Socket factory that uses Java's default truststore to validate server certificate.
++ * Note: it always validates server certificate, so it might result to downgrade to non-encrypted
++ * connection when default truststore lacks certificates to validate server.
++ */
++public class DefaultJavaSSLFactory extends WrappedFactory {
++  public DefaultJavaSSLFactory(Properties info) {
++    _factory = (SSLSocketFactory) SSLSocketFactory.getDefault();
++  }
++}
+diff --git a/pgjdbc/src/main/java/org/postgresql/ssl/jdbc4/LazyKeyManager.java b/pgjdbc/src/main/java/org/postgresql/ssl/LazyKeyManager.java
+similarity index 99%
+rename from pgjdbc/src/main/java/org/postgresql/ssl/jdbc4/LazyKeyManager.java
+rename to pgjdbc/src/main/java/org/postgresql/ssl/LazyKeyManager.java
+index 4585f1a968..be4db4153b 100644
+--- a/pgjdbc/src/main/java/org/postgresql/ssl/jdbc4/LazyKeyManager.java
++++ b/pgjdbc/src/main/java/org/postgresql/ssl/LazyKeyManager.java
+@@ -3,7 +3,7 @@
+  * See the LICENSE file in the project root for more information.
+  */
+ 
+-package org.postgresql.ssl.jdbc4;
++package org.postgresql.ssl;
+ 
+ import org.postgresql.util.GT;
+ import org.postgresql.util.PSQLException;
+@@ -222,6 +222,7 @@ public PrivateKey getPrivateKey(String alias) {
+           }
+           try {
+             PBEKeySpec pbeKeySpec = new PBEKeySpec(pwdcb.getPassword());
++            pwdcb.clearPassword();
+             // Now create the Key from the PBEKeySpec
+             SecretKeyFactory skFac = SecretKeyFactory.getInstance(ePKInfo.getAlgName());
+             Key pbeKey = skFac.generateSecret(pbeKeySpec);
+diff --git a/pgjdbc/src/main/java/org/postgresql/ssl/LibPQFactory.java b/pgjdbc/src/main/java/org/postgresql/ssl/LibPQFactory.java
+new file mode 100644
+index 0000000000..c0c34bd274
+--- /dev/null
++++ b/pgjdbc/src/main/java/org/postgresql/ssl/LibPQFactory.java
+@@ -0,0 +1,220 @@
++/*
++ * Copyright (c) 2004, PostgreSQL Global Development Group
++ * See the LICENSE file in the project root for more information.
++ */
++
++package org.postgresql.ssl;
++
++import org.postgresql.PGProperty;
++import org.postgresql.jdbc.SslMode;
++import org.postgresql.ssl.NonValidatingFactory.NonValidatingTM;
++import org.postgresql.util.GT;
++import org.postgresql.util.ObjectFactory;
++import org.postgresql.util.PSQLException;
++import org.postgresql.util.PSQLState;
++
++import java.io.Console;
++import java.io.FileInputStream;
++import java.io.FileNotFoundException;
++import java.io.IOException;
++import java.security.GeneralSecurityException;
++import java.security.KeyManagementException;
++import java.security.KeyStore;
++import java.security.KeyStoreException;
++import java.security.NoSuchAlgorithmException;
++import java.security.cert.Certificate;
++import java.security.cert.CertificateFactory;
++import java.util.Properties;
++import javax.net.ssl.KeyManager;
++import javax.net.ssl.SSLContext;
++import javax.net.ssl.TrustManager;
++import javax.net.ssl.TrustManagerFactory;
++import javax.security.auth.callback.Callback;
++import javax.security.auth.callback.CallbackHandler;
++import javax.security.auth.callback.PasswordCallback;
++import javax.security.auth.callback.UnsupportedCallbackException;
++
++/**
++ * Provide an SSLSocketFactory that is compatible with the libpq behaviour.
++ */
++public class LibPQFactory extends WrappedFactory {
++
++  LazyKeyManager km;
++
++  /**
++   * @param info the connection parameters The following parameters are used:
++   *        sslmode,sslcert,sslkey,sslrootcert,sslhostnameverifier,sslpasswordcallback,sslpassword
++   * @throws PSQLException if security error appears when initializing factory
++   */
++  public LibPQFactory(Properties info) throws PSQLException {
++    try {
++      SSLContext ctx = SSLContext.getInstance("TLS"); // or "SSL" ?
++
++      // Determining the default file location
++      String pathsep = System.getProperty("file.separator");
++      String defaultdir;
++      boolean defaultfile = false;
++      if (System.getProperty("os.name").toLowerCase().contains("windows")) { // It is Windows
++        defaultdir = System.getenv("APPDATA") + pathsep + "postgresql" + pathsep;
++      } else {
++        defaultdir = System.getProperty("user.home") + pathsep + ".postgresql" + pathsep;
++      }
++
++      // Load the client's certificate and key
++      String sslcertfile = PGProperty.SSL_CERT.get(info);
++      if (sslcertfile == null) { // Fall back to default
++        defaultfile = true;
++        sslcertfile = defaultdir + "postgresql.crt";
++      }
++      String sslkeyfile = PGProperty.SSL_KEY.get(info);
++      if (sslkeyfile == null) { // Fall back to default
++        defaultfile = true;
++        sslkeyfile = defaultdir + "postgresql.pk8";
++      }
++
++      // Determine the callback handler
++      CallbackHandler cbh;
++      String sslpasswordcallback = PGProperty.SSL_PASSWORD_CALLBACK.get(info);
++      if (sslpasswordcallback != null) {
++        try {
++          cbh = (CallbackHandler) ObjectFactory.instantiate(sslpasswordcallback, info, false, null);
++        } catch (Exception e) {
++          throw new PSQLException(
++              GT.tr("The password callback class provided {0} could not be instantiated.",
++                  sslpasswordcallback),
++              PSQLState.CONNECTION_FAILURE, e);
++        }
++      } else {
++        cbh = new ConsoleCallbackHandler(PGProperty.SSL_PASSWORD.get(info));
++      }
++
++      // If the properties are empty, give null to prevent client key selection
++      km = new LazyKeyManager(("".equals(sslcertfile) ? null : sslcertfile),
++          ("".equals(sslkeyfile) ? null : sslkeyfile), cbh, defaultfile);
++
++      TrustManager[] tm;
++      SslMode sslMode = SslMode.of(info);
++      if (!sslMode.verifyCertificate()) {
++        // server validation is not required
++        tm = new TrustManager[]{new NonValidatingTM()};
++      } else {
++        // Load the server certificate
++
++        TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
++        KeyStore ks;
++        try {
++          ks = KeyStore.getInstance("jks");
++        } catch (KeyStoreException e) {
++          // this should never happen
++          throw new NoSuchAlgorithmException("jks KeyStore not available");
++        }
++        String sslrootcertfile = PGProperty.SSL_ROOT_CERT.get(info);
++        if (sslrootcertfile == null) { // Fall back to default
++          sslrootcertfile = defaultdir + "root.crt";
++        }
++        FileInputStream fis;
++        try {
++          fis = new FileInputStream(sslrootcertfile); // NOSONAR
++        } catch (FileNotFoundException ex) {
++          throw new PSQLException(
++              GT.tr("Could not open SSL root certificate file {0}.", sslrootcertfile),
++              PSQLState.CONNECTION_FAILURE, ex);
++        }
++        try {
++          CertificateFactory cf = CertificateFactory.getInstance("X.509");
++          // Certificate[] certs = cf.generateCertificates(fis).toArray(new Certificate[]{}); //Does
++          // not work in java 1.4
++          Object[] certs = cf.generateCertificates(fis).toArray(new Certificate[]{});
++          ks.load(null, null);
++          for (int i = 0; i < certs.length; i++) {
++            ks.setCertificateEntry("cert" + i, (Certificate) certs[i]);
++          }
++          tmf.init(ks);
++        } catch (IOException ioex) {
++          throw new PSQLException(
++              GT.tr("Could not read SSL root certificate file {0}.", sslrootcertfile),
++              PSQLState.CONNECTION_FAILURE, ioex);
++        } catch (GeneralSecurityException gsex) {
++          throw new PSQLException(
++              GT.tr("Loading the SSL root certificate {0} into a TrustManager failed.",
++                      sslrootcertfile),
++              PSQLState.CONNECTION_FAILURE, gsex);
++        } finally {
++          try {
++            fis.close();
++          } catch (IOException e) {
++            /* ignore */
++          }
++        }
++        tm = tmf.getTrustManagers();
++      }
++
++      // finally we can initialize the context
++      try {
++        ctx.init(new KeyManager[]{km}, tm, null);
++      } catch (KeyManagementException ex) {
++        throw new PSQLException(GT.tr("Could not initialize SSL context."),
++            PSQLState.CONNECTION_FAILURE, ex);
++      }
++
++      _factory = ctx.getSocketFactory();
++    } catch (NoSuchAlgorithmException ex) {
++      throw new PSQLException(GT.tr("Could not find a java cryptographic algorithm: {0}.",
++              ex.getMessage()), PSQLState.CONNECTION_FAILURE, ex);
++    }
++  }
++
++  /**
++   * Propagates any exception from {@link LazyKeyManager}.
++   *
++   * @throws PSQLException if there is an exception to propagate
++   */
++  public void throwKeyManagerException() throws PSQLException {
++    if (km != null) {
++      km.throwKeyManagerException();
++    }
++  }
++
++  /**
++   * A CallbackHandler that reads the password from the console or returns the password given to its
++   * constructor.
++   */
++  static class ConsoleCallbackHandler implements CallbackHandler {
++
++    private char[] password = null;
++
++    ConsoleCallbackHandler(String password) {
++      if (password != null) {
++        this.password = password.toCharArray();
++      }
++    }
++
++    /**
++     * Handles the callbacks.
++     *
++     * @param callbacks The callbacks to handle
++     * @throws UnsupportedCallbackException If the console is not available or other than
++     *         PasswordCallback is supplied
++     */
++    @Override
++    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
++      Console cons = System.console();
++      if (cons == null && password == null) {
++        throw new UnsupportedCallbackException(callbacks[0], "Console is not available");
++      }
++      for (Callback callback : callbacks) {
++        if (!(callback instanceof PasswordCallback)) {
++          throw new UnsupportedCallbackException(callback);
++        }
++        PasswordCallback pwdCallback = (PasswordCallback) callback;
++        if (password != null) {
++          pwdCallback.setPassword(password);
++          continue;
++        }
++        // It is used instead of cons.readPassword(prompt), because the prompt may contain '%'
++        // characters
++        pwdCallback.setPassword(cons.readPassword("%s", pwdCallback.getPrompt()));
++      }
++    }
++  }
++}
+diff --git a/pgjdbc/src/main/java/org/postgresql/ssl/MakeSSL.java b/pgjdbc/src/main/java/org/postgresql/ssl/MakeSSL.java
+index d2e453552c..e09d88edbe 100644
+--- a/pgjdbc/src/main/java/org/postgresql/ssl/MakeSSL.java
++++ b/pgjdbc/src/main/java/org/postgresql/ssl/MakeSSL.java
+@@ -7,7 +7,8 @@
+ 
+ import org.postgresql.PGProperty;
+ import org.postgresql.core.PGStream;
+-import org.postgresql.ssl.jdbc4.LibPQFactory;
++import org.postgresql.core.SocketFactoryFactory;
++import org.postgresql.jdbc.SslMode;
+ import org.postgresql.util.GT;
+ import org.postgresql.util.ObjectFactory;
+ import org.postgresql.util.PSQLException;
+@@ -17,7 +18,6 @@
+ import java.util.Properties;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+-
+ import javax.net.ssl.HostnameVerifier;
+ import javax.net.ssl.SSLSocket;
+ import javax.net.ssl.SSLSocketFactory;
+@@ -30,47 +30,38 @@ public static void convert(PGStream stream, Properties info)
+       throws PSQLException, IOException {
+     LOGGER.log(Level.FINE, "converting regular socket connection to ssl");
+ 
+-    SSLSocketFactory factory;
+-
+-    String sslmode = PGProperty.SSL_MODE.get(info);
+-    // Use the default factory if no specific factory is requested
+-    // unless sslmode is set
+-    String classname = PGProperty.SSL_FACTORY.get(info);
+-    if (classname == null) {
+-      // If sslmode is set, use the libpq compatible factory
+-      if (sslmode != null) {
+-        factory = new LibPQFactory(info);
+-      } else {
+-        factory = (SSLSocketFactory) SSLSocketFactory.getDefault();
+-      }
+-    } else {
+-      try {
+-        factory = (SSLSocketFactory) instantiate(classname, info, true,
+-            PGProperty.SSL_FACTORY_ARG.get(info));
+-      } catch (Exception e) {
+-        throw new PSQLException(
+-            GT.tr("The SSLSocketFactory class provided {0} could not be instantiated.", classname),
+-            PSQLState.CONNECTION_FAILURE, e);
+-      }
+-    }
+-
++    SSLSocketFactory factory = SocketFactoryFactory.getSslSocketFactory(info);
+     SSLSocket newConnection;
+     try {
+       newConnection = (SSLSocket) factory.createSocket(stream.getSocket(),
+           stream.getHostSpec().getHost(), stream.getHostSpec().getPort(), true);
+       // We must invoke manually, otherwise the exceptions are hidden
++      newConnection.setUseClientMode(true);
+       newConnection.startHandshake();
+     } catch (IOException ex) {
+-      if (factory instanceof LibPQFactory) { // throw any KeyManager exception
+-        ((LibPQFactory) factory).throwKeyManagerException();
+-      }
+       throw new PSQLException(GT.tr("SSL error: {0}", ex.getMessage()),
+           PSQLState.CONNECTION_FAILURE, ex);
+     }
++    if (factory instanceof LibPQFactory) { // throw any KeyManager exception
++      ((LibPQFactory) factory).throwKeyManagerException();
++    }
+ 
++    SslMode sslMode = SslMode.of(info);
++    if (sslMode.verifyPeerName()) {
++      verifyPeerName(stream, info, newConnection);
++    }
++
++    stream.changeSocket(newConnection);
++  }
++
++  private static void verifyPeerName(PGStream stream, Properties info, SSLSocket newConnection)
++      throws PSQLException {
++    HostnameVerifier hvn;
+     String sslhostnameverifier = PGProperty.SSL_HOSTNAME_VERIFIER.get(info);
+-    if (sslhostnameverifier != null) {
+-      HostnameVerifier hvn;
++    if (sslhostnameverifier == null) {
++      hvn = PGjdbcHostnameVerifier.INSTANCE;
++      sslhostnameverifier = "PgjdbcHostnameVerifier";
++    } else {
+       try {
+         hvn = (HostnameVerifier) instantiate(sslhostnameverifier, info, false, null);
+       } catch (Exception e) {
+@@ -79,24 +70,16 @@ public static void convert(PGStream stream, Properties info)
+                 sslhostnameverifier),
+             PSQLState.CONNECTION_FAILURE, e);
+       }
+-      if (!hvn.verify(stream.getHostSpec().getHost(), newConnection.getSession())) {
+-        throw new PSQLException(
+-            GT.tr("The hostname {0} could not be verified by hostnameverifier {1}.",
+-                stream.getHostSpec().getHost(), sslhostnameverifier),
+-            PSQLState.CONNECTION_FAILURE);
+-      }
+-    } else {
+-      if ("verify-full".equals(sslmode) && factory instanceof LibPQFactory) {
+-        if (!(((LibPQFactory) factory).verify(stream.getHostSpec().getHost(),
+-            newConnection.getSession()))) {
+-          throw new PSQLException(
+-              GT.tr("The hostname {0} could not be verified.", stream.getHostSpec().getHost()),
+-              PSQLState.CONNECTION_FAILURE);
+-        }
+-      }
++    }
+ 
++    if (hvn.verify(stream.getHostSpec().getHost(), newConnection.getSession())) {
++      return;
+     }
+-    stream.changeSocket(newConnection);
++
++    throw new PSQLException(
++        GT.tr("The hostname {0} could not be verified by hostnameverifier {1}.",
++            stream.getHostSpec().getHost(), sslhostnameverifier),
++        PSQLState.CONNECTION_FAILURE);
+   }
+ 
+ }
+diff --git a/pgjdbc/src/main/java/org/postgresql/ssl/PGjdbcHostnameVerifier.java b/pgjdbc/src/main/java/org/postgresql/ssl/PGjdbcHostnameVerifier.java
+new file mode 100644
+index 0000000000..851eb3aeb6
+--- /dev/null
++++ b/pgjdbc/src/main/java/org/postgresql/ssl/PGjdbcHostnameVerifier.java
+@@ -0,0 +1,264 @@
++/*
++ * Copyright (c) 2018, PostgreSQL Global Development Group
++ * See the LICENSE file in the project root for more information.
++ */
++
++package org.postgresql.ssl;
++
++import org.postgresql.util.GT;
++
++import java.net.IDN;
++import java.security.cert.CertificateParsingException;
++import java.security.cert.X509Certificate;
++import java.util.ArrayList;
++import java.util.Collection;
++import java.util.Collections;
++import java.util.Comparator;
++import java.util.List;
++import java.util.logging.Level;
++import java.util.logging.Logger;
++import javax.naming.InvalidNameException;
++import javax.naming.ldap.LdapName;
++import javax.naming.ldap.Rdn;
++import javax.net.ssl.HostnameVerifier;
++import javax.net.ssl.SSLPeerUnverifiedException;
++import javax.net.ssl.SSLSession;
++import javax.security.auth.x500.X500Principal;
++
++public class PGjdbcHostnameVerifier implements HostnameVerifier {
++  private static final Logger LOGGER = Logger.getLogger(PGjdbcHostnameVerifier.class.getName());
++
++  public static final PGjdbcHostnameVerifier INSTANCE = new PGjdbcHostnameVerifier();
++
++  private static final int TYPE_DNS_NAME = 2;
++  private static final int TYPE_IP_ADDRESS = 7;
++
++  public static Comparator HOSTNAME_PATTERN_COMPARATOR = new Comparator() {
++    private int countChars(String value, char ch) {
++      int count = 0;
++      int pos = -1;
++      while (true) {
++        pos = value.indexOf(ch, pos + 1);
++        if (pos == -1) {
++          break;
++        }
++        count++;
++      }
++      return count;
++    }
++
++    @Override
++    public int compare(String o1, String o2) {
++      // The more the dots the better: a.b.c.postgresql.org is more specific than postgresql.org
++      int d1 = countChars(o1, '.');
++      int d2 = countChars(o2, '.');
++      if (d1 != d2) {
++        return d1 > d2 ? 1 : -1;
++      }
++
++      // The less the stars the better: postgresql.org is more specific than *.*.postgresql.org
++      int s1 = countChars(o1, '*');
++      int s2 = countChars(o2, '*');
++      if (s1 != s2) {
++        return s1 < s2 ? 1 : -1;
++      }
++
++      // The longer the better: postgresql.org is more specific than sql.org
++      int l1 = o1.length();
++      int l2 = o2.length();
++      if (l1 != l2) {
++        return l1 > l2 ? 1 : -1;
++      }
++
++      return 0;
++    }
++  };
++
++  @Override
++  public boolean verify(String hostname, SSLSession session) {
++    X509Certificate[] peerCerts;
++    try {
++      peerCerts = (X509Certificate[]) session.getPeerCertificates();
++    } catch (SSLPeerUnverifiedException e) {
++      LOGGER.log(Level.SEVERE,
++          GT.tr("Unable to parse X509Certificate for hostname {0}", hostname), e);
++      return false;
++    }
++    if (peerCerts == null || peerCerts.length == 0) {
++      LOGGER.log(Level.SEVERE,
++          GT.tr("No certificates found for hostname {0}", hostname));
++      return false;
++    }
++
++    String canonicalHostname;
++    if (hostname.startsWith("[") && hostname.endsWith("]")) {
++      // IPv6 address like [2001:db8:0:1:1:1:1:1]
++      canonicalHostname = hostname.substring(1, hostname.length() - 1);
++    } else {
++      // This converts unicode domain name to ASCII
++      try {
++        canonicalHostname = IDN.toASCII(hostname);
++        if (LOGGER.isLoggable(Level.FINEST)) {
++          LOGGER.log(Level.FINEST, "Canonical host name for {0} is {1}",
++              new Object[]{hostname, canonicalHostname});
++        }
++      } catch (IllegalArgumentException e) {
++        // e.g. hostname is invalid
++        LOGGER.log(Level.SEVERE,
++            GT.tr("Hostname {0} is invalid", hostname), e);
++        return false;
++      }
++    }
++
++    X509Certificate serverCert = peerCerts[0];
++
++    // Check for Subject Alternative Names (see RFC 6125)
++
++    Collection> subjectAltNames;
++    try {
++      subjectAltNames = serverCert.getSubjectAlternativeNames();
++      if (subjectAltNames == null) {
++        subjectAltNames = Collections.emptyList();
++      }
++    } catch (CertificateParsingException e) {
++      LOGGER.log(Level.SEVERE,
++          GT.tr("Unable to parse certificates for hostname {0}", hostname), e);
++      return false;
++    }
++
++    boolean anyDnsSan = false;
++    /*
++     * Each item in the SAN collection is a 2-element list.
++     * See {@link X509Certificate#getSubjectAlternativeNames}
++     * The first element in each list is a number indicating the type of entry.
++     */
++    for (List sanItem : subjectAltNames) {
++      if (sanItem.size() != 2) {
++        continue;
++      }
++      Integer sanType = (Integer) sanItem.get(0);
++      if (sanType == null) {
++        // just in case
++        continue;
++      }
++      if (sanType != TYPE_IP_ADDRESS && sanType != TYPE_DNS_NAME) {
++        continue;
++      }
++      String san = (String) sanItem.get(1);
++      if (sanType == TYPE_IP_ADDRESS && san.startsWith("*")) {
++        // Wildcards should not be present in the IP Address field
++        continue;
++      }
++      anyDnsSan |= sanType == TYPE_DNS_NAME;
++      if (verifyHostName(canonicalHostname, san)) {
++        if (LOGGER.isLoggable(Level.FINEST)) {
++          LOGGER.log(Level.SEVERE,
++              GT.tr("Server name validation pass for {0}, subjectAltName {1}", hostname, san));
++        }
++        return true;
++      }
++    }
++
++    if (anyDnsSan) {
++      /*
++       * RFC2818, section 3.1 (I bet you won't recheck :)
++       * If a subjectAltName extension of type dNSName is present, that MUST
++       * be used as the identity. Otherwise, the (most specific) Common Name
++       * field in the Subject field of the certificate MUST be used. Although
++       * the use of the Common Name is existing practice, it is deprecated and
++       * Certification Authorities are encouraged to use the dNSName instead.
++       */
++      LOGGER.log(Level.SEVERE,
++          GT.tr("Server name validation failed: certificate for host {0} dNSName entries subjectAltName,"
++              + " but none of them match. Assuming server name validation failed", hostname));
++      return false;
++    }
++
++    // Last attempt: no DNS Subject Alternative Name entries detected, try common name
++    LdapName DN;
++    try {
++      DN = new LdapName(serverCert.getSubjectX500Principal().getName(X500Principal.RFC2253));
++    } catch (InvalidNameException e) {
++      LOGGER.log(Level.SEVERE,
++          GT.tr("Server name validation failed: unable to extract common name"
++              + " from X509Certificate for hostname {0}", hostname), e);
++      return false;
++    }
++
++    List commonNames = new ArrayList(1);
++    for (Rdn rdn : DN.getRdns()) {
++      if ("CN".equals(rdn.getType())) {
++        commonNames.add((String) rdn.getValue());
++      }
++    }
++    if (commonNames.isEmpty()) {
++      LOGGER.log(Level.SEVERE,
++          GT.tr("Server name validation failed: certificate for hostname {0} has no DNS subjectAltNames,"
++                  + " and it CommonName is missing as well",
++              hostname));
++      return false;
++    }
++    if (commonNames.size() > 1) {
++      /*
++       * RFC2818, section 3.1
++       * If a subjectAltName extension of type dNSName is present, that MUST
++       * be used as the identity. Otherwise, the (most specific) Common Name
++       * field in the Subject field of the certificate MUST be used
++       *
++       * The sort is from less specific to most specific.
++       */
++      Collections.sort(commonNames, HOSTNAME_PATTERN_COMPARATOR);
++    }
++    String commonName = commonNames.get(commonNames.size() - 1);
++    boolean result = verifyHostName(canonicalHostname, commonName);
++    if (!result) {
++      LOGGER.log(Level.SEVERE,
++          GT.tr("Server name validation failed: hostname {0} does not match common name {1}",
++              hostname, commonName));
++    }
++    return result;
++  }
++
++  public boolean verifyHostName(String hostname, String pattern) {
++    if (hostname == null || pattern == null) {
++      return false;
++    }
++    int lastStar = pattern.lastIndexOf('*');
++    if (lastStar == -1) {
++      // No wildcard => just compare hostnames
++      return hostname.equalsIgnoreCase(pattern);
++    }
++    if (lastStar > 0) {
++      // Wildcards like foo*.com are not supported yet
++      return false;
++    }
++    if (pattern.indexOf('.') == -1) {
++      // Wildcard certificates should contain at least one dot
++      return false;
++    }
++    // pattern starts with *, so hostname should be at least (pattern.length-1) long
++    if (hostname.length() < pattern.length() - 1) {
++      return false;
++    }
++    // Use case insensitive comparison
++    final boolean ignoreCase = true;
++    // Below code is "hostname.endsWithIgnoreCase(pattern.withoutFirstStar())"
++
++    // E.g. hostname==sub.host.com; pattern==*.host.com
++    // We need to start the offset of ".host.com" in hostname
++    // For this we take hostname.length() - pattern.length()
++    // and +1 is required since pattern is known to start with *
++    int toffset = hostname.length() - pattern.length() + 1;
++
++    // Wildcard covers just one domain level
++    // a.b.c.com should not be covered by *.c.com
++    if (hostname.lastIndexOf('.', toffset - 1) >= 0) {
++      // If there's a dot in between 0..toffset
++      return false;
++    }
++
++    return hostname.regionMatches(ignoreCase, toffset,
++        pattern, 1, pattern.length() - 1);
++  }
++
++}
+diff --git a/pgjdbc/src/main/java/org/postgresql/ssl/jdbc4/LibPQFactory.java b/pgjdbc/src/main/java/org/postgresql/ssl/jdbc4/LibPQFactory.java
+index 4aadabd4bb..7dbe9df63c 100644
+--- a/pgjdbc/src/main/java/org/postgresql/ssl/jdbc4/LibPQFactory.java
++++ b/pgjdbc/src/main/java/org/postgresql/ssl/jdbc4/LibPQFactory.java
+@@ -1,270 +1,63 @@
+ /*
+- * Copyright (c) 2004, PostgreSQL Global Development Group
++ * Copyright (c) 2017, PostgreSQL Global Development Group
+  * See the LICENSE file in the project root for more information.
+  */
+ 
+ package org.postgresql.ssl.jdbc4;
+ 
+-import org.postgresql.PGProperty;
+-import org.postgresql.ssl.MakeSSL;
+-import org.postgresql.ssl.NonValidatingFactory.NonValidatingTM;
+-import org.postgresql.ssl.WrappedFactory;
+-import org.postgresql.util.GT;
++import org.postgresql.jdbc.SslMode;
++import org.postgresql.ssl.PGjdbcHostnameVerifier;
+ import org.postgresql.util.PSQLException;
+-import org.postgresql.util.PSQLState;
+ 
+-import java.io.Console;
+-import java.io.FileInputStream;
+-import java.io.FileNotFoundException;
+-import java.io.IOException;
+-import java.security.GeneralSecurityException;
+-import java.security.KeyManagementException;
+-import java.security.KeyStore;
+-import java.security.KeyStoreException;
+-import java.security.NoSuchAlgorithmException;
+-import java.security.cert.Certificate;
+-import java.security.cert.CertificateFactory;
+-import java.security.cert.CertificateParsingException;
+-import java.security.cert.X509Certificate;
+-import java.util.Collection;
+-import java.util.List;
++import java.net.IDN;
+ import java.util.Properties;
+-
+-import javax.naming.InvalidNameException;
+-import javax.naming.ldap.LdapName;
+-import javax.naming.ldap.Rdn;
+ import javax.net.ssl.HostnameVerifier;
+-import javax.net.ssl.KeyManager;
+-import javax.net.ssl.SSLContext;
+-import javax.net.ssl.SSLPeerUnverifiedException;
+ import javax.net.ssl.SSLSession;
+-import javax.net.ssl.TrustManager;
+-import javax.net.ssl.TrustManagerFactory;
+-import javax.security.auth.callback.Callback;
+-import javax.security.auth.callback.CallbackHandler;
+-import javax.security.auth.callback.PasswordCallback;
+-import javax.security.auth.callback.UnsupportedCallbackException;
+-import javax.security.auth.x500.X500Principal;
+ 
+ /**
+- * Provide an SSLSocketFactory that is compatible with the libpq behaviour.
++ * @deprecated prefer {@link org.postgresql.ssl.LibPQFactory}
+  */
+-public class LibPQFactory extends WrappedFactory implements HostnameVerifier {
+-
+-  private static final int ALT_DNS_NAME = 2;
+-
+-  LazyKeyManager km = null;
+-  String sslmode;
++@Deprecated
++public class LibPQFactory extends org.postgresql.ssl.LibPQFactory implements HostnameVerifier {
++  private final SslMode sslMode;
+ 
+   /**
+    * @param info the connection parameters The following parameters are used:
+-   *        sslmode,sslcert,sslkey,sslrootcert,sslhostnameverifier,sslpasswordcallback,sslpassword
++   *             sslmode,sslcert,sslkey,sslrootcert,sslhostnameverifier,sslpasswordcallback,sslpassword
+    * @throws PSQLException if security error appears when initializing factory
++   * @deprecated prefer {@link org.postgresql.ssl.LibPQFactory}
+    */
++  @Deprecated
+   public LibPQFactory(Properties info) throws PSQLException {
+-    try {
+-      sslmode = PGProperty.SSL_MODE.get(info);
+-      SSLContext ctx = SSLContext.getInstance("TLS"); // or "SSL" ?
+-
+-      // Determining the default file location
+-      String pathsep = System.getProperty("file.separator");
+-      String defaultdir;
+-      boolean defaultfile = false;
+-      if (System.getProperty("os.name").toLowerCase().contains("windows")) { // It is Windows
+-        defaultdir = System.getenv("APPDATA") + pathsep + "postgresql" + pathsep;
+-      } else {
+-        defaultdir = System.getProperty("user.home") + pathsep + ".postgresql" + pathsep;
+-      }
+-
+-      // Load the client's certificate and key
+-      String sslcertfile = PGProperty.SSL_CERT.get(info);
+-      if (sslcertfile == null) { // Fall back to default
+-        defaultfile = true;
+-        sslcertfile = defaultdir + "postgresql.crt";
+-      }
+-      String sslkeyfile = PGProperty.SSL_KEY.get(info);
+-      if (sslkeyfile == null) { // Fall back to default
+-        defaultfile = true;
+-        sslkeyfile = defaultdir + "postgresql.pk8";
+-      }
+-
+-      // Determine the callback handler
+-      CallbackHandler cbh;
+-      String sslpasswordcallback = PGProperty.SSL_PASSWORD_CALLBACK.get(info);
+-      if (sslpasswordcallback != null) {
+-        try {
+-          cbh = (CallbackHandler) MakeSSL.instantiate(sslpasswordcallback, info, false, null);
+-        } catch (Exception e) {
+-          throw new PSQLException(
+-              GT.tr("The password callback class provided {0} could not be instantiated.",
+-                  sslpasswordcallback),
+-              PSQLState.CONNECTION_FAILURE, e);
+-        }
+-      } else {
+-        cbh = new ConsoleCallbackHandler(PGProperty.SSL_PASSWORD.get(info));
+-      }
+-
+-      // If the properties are empty, give null to prevent client key selection
+-      km = new LazyKeyManager(("".equals(sslcertfile) ? null : sslcertfile),
+-          ("".equals(sslkeyfile) ? null : sslkeyfile), cbh, defaultfile);
+-
+-      TrustManager[] tm;
+-      if ("verify-ca".equals(sslmode) || "verify-full".equals(sslmode)) {
+-        // Load the server certificate
+-
+-        TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
+-        KeyStore ks;
+-        try {
+-          ks = KeyStore.getInstance("jks");
+-        } catch (KeyStoreException e) {
+-          // this should never happen
+-          throw new NoSuchAlgorithmException("jks KeyStore not available");
+-        }
+-        String sslrootcertfile = PGProperty.SSL_ROOT_CERT.get(info);
+-        if (sslrootcertfile == null) { // Fall back to default
+-          sslrootcertfile = defaultdir + "root.crt";
+-        }
+-        FileInputStream fis;
+-        try {
+-          fis = new FileInputStream(sslrootcertfile); // NOSONAR
+-        } catch (FileNotFoundException ex) {
+-          throw new PSQLException(
+-              GT.tr("Could not open SSL root certificate file {0}.", sslrootcertfile),
+-              PSQLState.CONNECTION_FAILURE, ex);
+-        }
+-        try {
+-          CertificateFactory cf = CertificateFactory.getInstance("X.509");
+-          // Certificate[] certs = cf.generateCertificates(fis).toArray(new Certificate[]{}); //Does
+-          // not work in java 1.4
+-          Object[] certs = cf.generateCertificates(fis).toArray(new Certificate[]{});
+-          ks.load(null, null);
+-          for (int i = 0; i < certs.length; i++) {
+-            ks.setCertificateEntry("cert" + i, (Certificate) certs[i]);
+-          }
+-          tmf.init(ks);
+-        } catch (IOException ioex) {
+-          throw new PSQLException(
+-              GT.tr("Could not read SSL root certificate file {0}.", sslrootcertfile),
+-              PSQLState.CONNECTION_FAILURE, ioex);
+-        } catch (GeneralSecurityException gsex) {
+-          throw new PSQLException(
+-              GT.tr("Loading the SSL root certificate {0} into a TrustManager failed.",
+-                      sslrootcertfile),
+-              PSQLState.CONNECTION_FAILURE, gsex);
+-        } finally {
+-          try {
+-            fis.close();
+-          } catch (IOException e) {
+-            /* ignore */
+-          }
+-        }
+-        tm = tmf.getTrustManagers();
+-      } else { // server validation is not required
+-        tm = new TrustManager[]{new NonValidatingTM()};
+-      }
++    super(info);
+ 
+-      // finally we can initialize the context
+-      try {
+-        ctx.init(new KeyManager[]{km}, tm, null);
+-      } catch (KeyManagementException ex) {
+-        throw new PSQLException(GT.tr("Could not initialize SSL context."),
+-            PSQLState.CONNECTION_FAILURE, ex);
+-      }
+-
+-      _factory = ctx.getSocketFactory();
+-    } catch (NoSuchAlgorithmException ex) {
+-      throw new PSQLException(GT.tr("Could not find a java cryptographic algorithm: {0}.",
+-              ex.getMessage()), PSQLState.CONNECTION_FAILURE, ex);
+-    }
++    sslMode = SslMode.of(info);
+   }
+ 
+   /**
+-   * Propagates any exception from {@link LazyKeyManager}.
++   * Verifies if given hostname matches pattern.
+    *
+-   * @throws PSQLException if there is an exception to propagate
++   * @deprecated use {@link PGjdbcHostnameVerifier}
++   * @param hostname input hostname
++   * @param pattern domain name pattern
++   * @return true when domain matches pattern
+    */
+-  public void throwKeyManagerException() throws PSQLException {
+-    if (km != null) {
+-      km.throwKeyManagerException();
+-    }
+-  }
+-
+-  /**
+-   * A CallbackHandler that reads the password from the console or returns the password given to its
+-   * constructor.
+-   */
+-  static class ConsoleCallbackHandler implements CallbackHandler {
+-
+-    private char[] password = null;
+-
+-    ConsoleCallbackHandler(String password) {
+-      if (password != null) {
+-        this.password = password.toCharArray();
+-      }
+-    }
+-
+-    /**
+-     * Handles the callbacks.
+-     *
+-     * @param callbacks The callbacks to handle
+-     * @throws UnsupportedCallbackException If the console is not available or other than
+-     *         PasswordCallback is supplied
+-     */
+-    @Override
+-    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+-      Console cons = System.console();
+-      if (cons == null && password == null) {
+-        throw new UnsupportedCallbackException(callbacks[0], "Console is not available");
+-      }
+-      for (Callback callback : callbacks) {
+-        if (callback instanceof PasswordCallback) {
+-          if (password == null) {
+-            // It is used instead of cons.readPassword(prompt), because the prompt may contain '%'
+-            // characters
+-            ((PasswordCallback) callback).setPassword(
+-                cons.readPassword("%s", ((PasswordCallback) callback).getPrompt()));
+-          } else {
+-            ((PasswordCallback) callback).setPassword(password);
+-          }
+-        } else {
+-          throw new UnsupportedCallbackException(callback);
+-        }
+-      }
+-
+-    }
+-  }
+-
++  @Deprecated
+   public static boolean verifyHostName(String hostname, String pattern) {
+-    if (hostname == null || pattern == null) {
+-      return false;
+-    }
+-    if (!pattern.startsWith("*")) {
+-      // No wildcard => just compare hostnames
+-      return hostname.equalsIgnoreCase(pattern);
+-    }
+-    // pattern starts with *, so hostname should be at least (pattern.length-1) long
+-    if (hostname.length() < pattern.length() - 1) {
+-      return false;
+-    }
+-    // Compare ignore case
+-    final boolean ignoreCase = true;
+-    // Below code is "hostname.endsWithIgnoreCase(pattern.withoutFirstStar())"
+-
+-    // E.g. hostname==sub.host.com; pattern==*.host.com
+-    // We need to start the offset of ".host.com" in hostname
+-    // For this we take hostname.length() - pattern.length()
+-    // and +1 is required since pattern is known to start with *
+-    int toffset = hostname.length() - pattern.length() + 1;
+-
+-    // Wildcard covers just one domain level
+-    // a.b.c.com should not be covered by *.c.com
+-    if (hostname.lastIndexOf('.', toffset - 1) >= 0) {
+-      // If there's a dot in between 0..toffset
+-      return false;
++    String canonicalHostname;
++    if (hostname.startsWith("[") && hostname.endsWith("]")) {
++      // IPv6 address like [2001:db8:0:1:1:1:1:1]
++      canonicalHostname = hostname.substring(1, hostname.length() - 1);
++    } else {
++      // This converts unicode domain name to ASCII
++      try {
++        canonicalHostname = IDN.toASCII(hostname);
++      } catch (IllegalArgumentException e) {
++        // e.g. hostname is invalid
++        return false;
++      }
+     }
+-
+-    return hostname.regionMatches(ignoreCase, toffset,
+-        pattern, 1, pattern.length() - 1);
++    return PGjdbcHostnameVerifier.INSTANCE.verifyHostName(canonicalHostname, pattern);
+   }
+ 
+   /**
+@@ -274,56 +67,18 @@ public static boolean verifyHostName(String hostname, String pattern) {
+    * the certificate will not match subdomains. If the connection is made using an IP address
+    * instead of a hostname, the IP address will be matched (without doing any DNS lookups).
+    *
++   * @deprecated use PgjdbcHostnameVerifier
+    * @param hostname Hostname or IP address of the server.
+    * @param session The SSL session.
+    * @return true if the certificate belongs to the server, false otherwise.
++   * @see PGjdbcHostnameVerifier
+    */
++  @Deprecated
+   public boolean verify(String hostname, SSLSession session) {
+-    X509Certificate[] peerCerts;
+-    try {
+-      peerCerts = (X509Certificate[]) session.getPeerCertificates();
+-    } catch (SSLPeerUnverifiedException e) {
+-      return false;
++    if (!sslMode.verifyPeerName()) {
++      return true;
+     }
+-    if (peerCerts == null || peerCerts.length == 0) {
+-      return false;
+-    }
+-    // Extract the common name
+-    X509Certificate serverCert = peerCerts[0];
+-
+-    try {
+-      // Check for Subject Alternative Names (see RFC 6125)
+-      Collection> subjectAltNames = serverCert.getSubjectAlternativeNames();
+-
+-      if (subjectAltNames != null) {
+-        for (List sanit : subjectAltNames) {
+-          Integer type = (Integer) sanit.get(0);
+-          String san = (String) sanit.get(1);
+-
+-          // this mimics libpq check for ALT_DNS_NAME
+-          if (type != null && type == ALT_DNS_NAME && verifyHostName(hostname, san)) {
+-            return true;
+-          }
+-        }
+-      }
+-    } catch (CertificateParsingException e) {
+-      return false;
+-    }
+-
+-    LdapName DN;
+-    try {
+-      DN = new LdapName(serverCert.getSubjectX500Principal().getName(X500Principal.RFC2253));
+-    } catch (InvalidNameException e) {
+-      return false;
+-    }
+-    String CN = null;
+-    for (Rdn rdn : DN.getRdns()) {
+-      if ("CN".equals(rdn.getType())) {
+-        // Multiple AVAs are not treated
+-        CN = (String) rdn.getValue();
+-        break;
+-      }
+-    }
+-    return verifyHostName(hostname, CN);
++    return PGjdbcHostnameVerifier.INSTANCE.verify(hostname, session);
+   }
++
+ }
+diff --git a/pgjdbc/src/main/java/org/postgresql/util/ObjectFactory.java b/pgjdbc/src/main/java/org/postgresql/util/ObjectFactory.java
+index 4145bc54c0..273ac6d611 100644
+--- a/pgjdbc/src/main/java/org/postgresql/util/ObjectFactory.java
++++ b/pgjdbc/src/main/java/org/postgresql/util/ObjectFactory.java
+@@ -21,7 +21,7 @@
+    * single String argument is searched if it fails, or tryString is true a no argument constructor
+    * is tried.
+    *
+-   * @param classname Nam of the class to instantiate
++   * @param classname name of the class to instantiate
+    * @param info parameter to pass as Properties
+    * @param tryString weather to look for a single String argument constructor
+    * @param stringarg parameter to pass as String
+diff --git a/pgjdbc/src/test/java/org/postgresql/test/TestUtil.java b/pgjdbc/src/test/java/org/postgresql/test/TestUtil.java
+index 8a3fb7283a..789736a6ed 100644
+--- a/pgjdbc/src/test/java/org/postgresql/test/TestUtil.java
++++ b/pgjdbc/src/test/java/org/postgresql/test/TestUtil.java
+@@ -32,14 +32,28 @@
+  * Utility class for JDBC tests.
+  */
+ public class TestUtil {
++  /*
++   * The case is as follows:
++   * 1. Typically the database and hostname are taken from System.properties or build.properties or build.local.properties
++   *    That enables to override test DB via system property
++   * 2. There are tests where different DBs should be used (e.g. SSL tests), so we can't just use DB name from system property
++   *    That is why _test_ properties exist: they overpower System.properties and build.properties
++   */
++  public static final String SERVER_HOST_PORT_PROP = "_test_hostport";
++  public static final String DATABASE_PROP = "_test_database";
++
+   /*
+    * Returns the Test database JDBC URL
+    */
+   public static String getURL() {
+-    return getURL(getServer(), getPort());
++    return getURL(getServer(), + getPort());
+   }
+ 
+   public static String getURL(String server, int port) {
++    return getURL(server + ":" + port, getDatabase());
++  }
++
++  public static String getURL(String hostport, String database) {
+     String logLevel = "";
+     if (getLogLevel() != null && !getLogLevel().equals("")) {
+       logLevel = "&loggerLevel=" + getLogLevel();
+@@ -76,9 +90,8 @@ public static String getURL(String server, int port) {
+     }
+ 
+     return "jdbc:postgresql://"
+-        + server + ":"
+-        + port + "/"
+-        + getDatabase()
++        + hostport + "/"
++        + database
+         + "?ApplicationName=Driver Tests"
+         + logLevel
+         + logFile
+@@ -135,6 +148,13 @@ public static String getPassword() {
+     return System.getProperty("password");
+   }
+ 
++  /*
++   * Returns password for default callbackhandler
++   */
++  public static String getSslPassword() {
++    return System.getProperty(PGProperty.SSL_PASSWORD.getName());
++  }
++
+   /*
+    * Returns the user for SSPI authentication tests
+    */
+@@ -301,6 +321,11 @@ public static Connection openDB(Properties props) throws Exception {
+       password = "";
+     }
+     props.setProperty("password", password);
++    String sslPassword = getSslPassword();
++    if (sslPassword != null) {
++      PGProperty.SSL_PASSWORD.set(props, sslPassword);
++    }
++
+     if (!props.containsKey(PGProperty.PREPARE_THRESHOLD.getName())) {
+       PGProperty.PREPARE_THRESHOLD.set(props, getPrepareThreshold());
+     }
+@@ -310,8 +335,11 @@ public static Connection openDB(Properties props) throws Exception {
+         props.put(PGProperty.PREFER_QUERY_MODE.getName(), value);
+       }
+     }
++    // Enable Base4 tests to override host,port,database
++    String hostport = props.getProperty(SERVER_HOST_PORT_PROP, getServer() + ":" + getPort());
++    String database = props.getProperty(DATABASE_PROP, getDatabase());
+ 
+-    return DriverManager.getConnection(getURL(), props);
++    return DriverManager.getConnection(getURL(hostport, database), props);
+   }
+ 
+   /*
+diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/NotifyTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/NotifyTest.java
+index b9615b0967..faaa82bd45 100644
+--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/NotifyTest.java
++++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/NotifyTest.java
+@@ -9,6 +9,7 @@
+ import static org.junit.Assert.assertNotNull;
+ import static org.junit.Assert.assertNull;
+ 
++import org.postgresql.PGConnection;
+ import org.postgresql.PGNotification;
+ import org.postgresql.core.ServerVersion;
+ import org.postgresql.test.TestUtil;
+@@ -41,7 +42,7 @@ public void testNotify() throws SQLException {
+     stmt.executeUpdate("LISTEN mynotification");
+     stmt.executeUpdate("NOTIFY mynotification");
+ 
+-    PGNotification[] notifications = ((org.postgresql.PGConnection) conn).getNotifications();
++    PGNotification[] notifications = conn.unwrap(PGConnection.class).getNotifications();
+     assertNotNull(notifications);
+     assertEquals(1, notifications.length);
+     assertEquals("mynotification", notifications[0].getName());
+@@ -60,7 +61,7 @@ public void testNotifyArgument() throws Exception {
+     stmt.executeUpdate("LISTEN mynotification");
+     stmt.executeUpdate("NOTIFY mynotification, 'message'");
+ 
+-    PGNotification[] notifications = ((org.postgresql.PGConnection) conn).getNotifications();
++    PGNotification[] notifications = conn.unwrap(PGConnection.class).getNotifications();
+     assertNotNull(notifications);
+     assertEquals(1, notifications.length);
+     assertEquals("mynotification", notifications[0].getName());
+@@ -83,13 +84,14 @@ public void testAsyncNotify() throws Exception {
+     try {
+       int retries = 20;
+       while (retries-- > 0
+-        && (notifications = ((org.postgresql.PGConnection) conn).getNotifications()) == null ) {
++        && (notifications = conn.unwrap(PGConnection.class).getNotifications()) == null ) {
+         Thread.sleep(100);
+       }
+     } catch (InterruptedException ie) {
+     }
+ 
+-    assertNotNull(notifications);
++    assertNotNull("Notification is expected to be delivered when subscription was created"
++            + " before sending notification", notifications);
+     assertEquals(1, notifications.length);
+     assertEquals("mynotification", notifications[0].getName());
+     assertEquals("", notifications[0].getParameter());
+@@ -108,7 +110,7 @@ public void testAsyncNotifyWithTimeout() throws Exception {
+ 
+     // Here we let the getNotifications() timeout.
+     long startMillis = System.currentTimeMillis();
+-    PGNotification[] notifications = ((org.postgresql.PGConnection) conn).getNotifications(500);
++    PGNotification[] notifications = conn.unwrap(PGConnection.class).getNotifications(500);
+     long endMillis = System.currentTimeMillis();
+     long runtime = endMillis - startMillis;
+     assertNull("There have been notifications, although none have been expected.",notifications);
+@@ -126,7 +128,7 @@ public void testAsyncNotifyWithTimeoutAndMessagesAvailableWhenStartingListening(
+     // listen for notifications
+     connectAndNotify("mynotification");
+ 
+-    PGNotification[] notifications = ((org.postgresql.PGConnection) conn).getNotifications(10000);
++    PGNotification[] notifications = conn.unwrap(PGConnection.class).getNotifications(10000);
+     assertNotNull(notifications);
+     assertEquals(1, notifications.length);
+     assertEquals("mynotification", notifications[0].getName());
+@@ -143,7 +145,7 @@ public void testAsyncNotifyWithEndlessTimeoutAndMessagesAvailableWhenStartingLis
+     // Now we check the case where notifications are already available while we are waiting forever
+     connectAndNotify("mynotification");
+ 
+-    PGNotification[] notifications = ((org.postgresql.PGConnection) conn).getNotifications(0);
++    PGNotification[] notifications = conn.unwrap(PGConnection.class).getNotifications(0);
+     assertNotNull(notifications);
+     assertEquals(1, notifications.length);
+     assertEquals("mynotification", notifications[0].getName());
+@@ -169,7 +171,7 @@ public void run() {
+       }
+     }).start();
+ 
+-    PGNotification[] notifications = ((org.postgresql.PGConnection) conn).getNotifications(10000);
++    PGNotification[] notifications = conn.unwrap(PGConnection.class).getNotifications(10000);
+     assertNotNull(notifications);
+     assertEquals(1, notifications.length);
+     assertEquals("mynotification", notifications[0].getName());
+@@ -195,7 +197,7 @@ public void run() {
+       }
+     }).start();
+ 
+-    PGNotification[] notifications = ((org.postgresql.PGConnection) conn).getNotifications(0);
++    PGNotification[] notifications = conn.unwrap(PGConnection.class).getNotifications(0);
+     assertNotNull(notifications);
+     assertEquals(1, notifications.length);
+     assertEquals("mynotification", notifications[0].getName());
+@@ -226,7 +228,7 @@ public void run() {
+     }).start();
+ 
+     try {
+-      ((org.postgresql.PGConnection) conn).getNotifications(40000);
++      conn.unwrap(PGConnection.class).getNotifications(40000);
+       Assert.fail("The getNotifications(...) call didn't return when the socket closed.");
+     } catch (SQLException e) {
+       // We expected that
+diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc4/Jdbc4TestSuite.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc4/Jdbc4TestSuite.java
+index 46fcc4bb47..405d977fb8 100644
+--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc4/Jdbc4TestSuite.java
++++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc4/Jdbc4TestSuite.java
+@@ -24,7 +24,6 @@
+         BinaryStreamTest.class,
+         CharacterStreamTest.class,
+         UUIDTest.class,
+-        LibPQFactoryHostNameTest.class,
+         XmlTest.class
+ })
+ public class Jdbc4TestSuite {
+diff --git a/pgjdbc/src/test/java/org/postgresql/test/ssl/CommonNameVerifierTest.java b/pgjdbc/src/test/java/org/postgresql/test/ssl/CommonNameVerifierTest.java
+new file mode 100644
+index 0000000000..a162c90e05
+--- /dev/null
++++ b/pgjdbc/src/test/java/org/postgresql/test/ssl/CommonNameVerifierTest.java
+@@ -0,0 +1,51 @@
++/*
++ * Copyright (c) 2018, PostgreSQL Global Development Group
++ * See the LICENSE file in the project root for more information.
++ */
++
++package org.postgresql.test.ssl;
++
++import org.postgresql.ssl.PGjdbcHostnameVerifier;
++
++import org.junit.Assert;
++import org.junit.Test;
++import org.junit.runner.RunWith;
++import org.junit.runners.Parameterized;
++
++import java.util.Arrays;
++
++@RunWith(Parameterized.class)
++public class CommonNameVerifierTest {
++
++  private final String a;
++  private final String b;
++  private final int expected;
++
++  public CommonNameVerifierTest(String a, String b, int expected) {
++    this.a = a;
++    this.b = b;
++    this.expected = expected;
++  }
++
++  @Parameterized.Parameters(name = "a={0}, b={1}")
++  public static Iterable data() {
++    return Arrays.asList(new Object[][]{
++        {"com", "host.com", -1},
++        {"*.com", "host.com", -1},
++        {"*.com", "*.*.com", -1},
++        {"**.com", "*.com", -1},
++        {"a.com", "*.host.com", -1},
++        {"host.com", "subhost.host.com", -1},
++        {"host.com", "host.com", 0}
++    });
++  }
++
++  @Test
++  public void comparePatterns() throws Exception {
++    Assert.assertEquals(a + " vs " + b,
++        expected, PGjdbcHostnameVerifier.HOSTNAME_PATTERN_COMPARATOR.compare(a, b));
++
++    Assert.assertEquals(b + " vs " + a,
++        -expected, PGjdbcHostnameVerifier.HOSTNAME_PATTERN_COMPARATOR.compare(b, a));
++  }
++}
+diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc4/LibPQFactoryHostNameTest.java b/pgjdbc/src/test/java/org/postgresql/test/ssl/LibPQFactoryHostNameTest.java
+similarity index 79%
+rename from pgjdbc/src/test/java/org/postgresql/test/jdbc4/LibPQFactoryHostNameTest.java
+rename to pgjdbc/src/test/java/org/postgresql/test/ssl/LibPQFactoryHostNameTest.java
+index 1ee140c4ee..0d998b777d 100644
+--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc4/LibPQFactoryHostNameTest.java
++++ b/pgjdbc/src/test/java/org/postgresql/test/ssl/LibPQFactoryHostNameTest.java
+@@ -3,8 +3,9 @@
+  * See the LICENSE file in the project root for more information.
+  */
+ 
+-package org.postgresql.test.jdbc4;
++package org.postgresql.test.ssl;
+ 
++import org.postgresql.ssl.PGjdbcHostnameVerifier;
+ import org.postgresql.ssl.jdbc4.LibPQFactory;
+ 
+ import org.junit.Assert;
+@@ -47,11 +48,16 @@ public LibPQFactoryHostNameTest(String hostname, String pattern, boolean expecte
+         {"sub.host.com", "*.hoSt.com", true},
+         {"*.host.com", "host.com", false},
+         {"sub.sub.host.com", "*.host.com", false}, // Wildcard should cover just one level
++        {"com", "*", false}, // Wildcard should have al least one dot
+     });
+   }
+ 
+   @Test
+   public void checkPattern() throws Exception {
+-    Assert.assertEquals(expected, LibPQFactory.verifyHostName(hostname, pattern));
++    Assert.assertEquals(hostname + ", pattern: " + pattern,
++        expected, LibPQFactory.verifyHostName(hostname, pattern));
++
++    Assert.assertEquals(hostname + ", pattern: " + pattern,
++        expected, PGjdbcHostnameVerifier.INSTANCE.verifyHostName(hostname, pattern));
+   }
+ }
+diff --git a/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTest.java b/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTest.java
+index fa209a33fc..adfc1dda90 100644
+--- a/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTest.java
++++ b/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTest.java
+@@ -1,336 +1,481 @@
+ /*
+- * Copyright (c) 2004, PostgreSQL Global Development Group
++ * Copyright (c) 2018, PostgreSQL Global Development Group
+  * See the LICENSE file in the project root for more information.
+  */
+ 
+ package org.postgresql.test.ssl;
+ 
++import org.postgresql.PGProperty;
++import org.postgresql.jdbc.SslMode;
+ import org.postgresql.test.TestUtil;
++import org.postgresql.test.jdbc2.BaseTest4;
++import org.postgresql.util.PSQLState;
+ 
+-import junit.framework.TestCase;
+-import junit.framework.TestSuite;
++import org.junit.Assert;
++import org.junit.Test;
++import org.junit.runner.RunWith;
++import org.junit.runners.Parameterized;
+ 
+ import java.io.File;
+-import java.sql.Connection;
+-import java.sql.DriverManager;
++import java.io.FileNotFoundException;
++import java.net.SocketException;
++import java.security.cert.CertPathValidatorException;
+ import java.sql.ResultSet;
+ import java.sql.SQLException;
+-import java.util.Map;
++import java.util.ArrayList;
++import java.util.Collection;
++import java.util.Collections;
++import java.util.List;
+ import java.util.Properties;
+-import java.util.TreeMap;
++import javax.net.ssl.SSLHandshakeException;
+ 
+-public class SslTest extends TestCase {
++@RunWith(Parameterized.class)
++public class SslTest extends BaseTest4 {
++  enum Hostname {
++    GOOD("localhost"),
++    BAD("127.0.0.1"),
++    ;
+ 
+-  /**
+-   * Tries to connect to the database.
+-   *
+-   * @param connstr Connection string for the database
+-   * @param expected Expected values. the first element is a String holding the expected message of
+-   *        PSQLException or null, if no exception is expected, the second indicates weather ssl is
+-   *        to be used (Boolean)
+-   */
+-  protected void driver(String connstr, Object[] expected) throws SQLException {
+-    Connection conn = null;
+-    String exmsg = (String) expected[0];
+-    try {
+-      conn = DriverManager.getConnection(connstr, TestUtil.getUser(), TestUtil.getPassword());
+-      if (exmsg != null) {
+-        fail("Exception did not occur: " + exmsg);
++    final String value;
++
++    Hostname(String value) {
++      this.value = value;
++    }
++  }
++
++  enum TestDatabase {
++    hostdb,
++    hostnossldb,
++    hostssldb,
++    hostsslcertdb,
++    certdb,
++    ;
++
++    public static final TestDatabase[] VALUES = values();
++
++    public boolean requiresClientCert() {
++      return this == certdb || this == hostsslcertdb;
++    }
++
++    public boolean requiresSsl() {
++      return this == certdb || this == hostssldb || this == hostsslcertdb;
++    }
++
++    public boolean rejectsSsl() {
++      return this == hostnossldb;
++    }
++  }
++
++  enum ClientCertificate {
++    EMPTY(""),
++    GOOD("goodclient"),
++    BAD("badclient"),
++    ;
++
++    public static final ClientCertificate[] VALUES = values();
++    public final String fileName;
++
++    ClientCertificate(String fileName) {
++      this.fileName = fileName;
++    }
++  }
++
++  enum ClientRootCertificate {
++    EMPTY(""),
++    GOOD("goodroot"),
++    BAD("badroot"),
++    ;
++
++    public static final ClientRootCertificate[] VALUES = values();
++    public final String fileName;
++
++    ClientRootCertificate(String fileName) {
++      this.fileName = fileName;
++    }
++  }
++
++  @Parameterized.Parameter(0)
++  public Hostname host;
++
++  @Parameterized.Parameter(1)
++  public TestDatabase db;
++
++  @Parameterized.Parameter(2)
++  public SslMode sslmode;
++
++  @Parameterized.Parameter(3)
++  public ClientCertificate clientCertificate;
++
++  @Parameterized.Parameter(4)
++  public ClientRootCertificate clientRootCertificate;
++
++  @Parameterized.Parameter(5)
++  public String certdir;
++
++  @Parameterized.Parameters(name = "host={0}, db={1} sslMode={2}, cCert={3}, cRootCert={4}")
++  public static Iterable data() {
++    Properties prop = TestUtil.loadPropertyFiles("ssltest.properties");
++    String enableSslTests = prop.getProperty("enable_ssl_tests");
++    if (!Boolean.valueOf(enableSslTests)) {
++      System.out.println("enableSslTests is " + enableSslTests + ", skipping SSL tests");
++      return Collections.emptyList();
++    }
++
++    Collection tests = new ArrayList();
++
++
++    File certDirFile = TestUtil.getFile(prop.getProperty("certdir"));
++    String certdir = certDirFile.getAbsolutePath();
++
++    for (SslMode sslMode : SslMode.VALUES) {
++      for (Hostname hostname : Hostname.values()) {
++        for (TestDatabase database : TestDatabase.VALUES) {
++          for (ClientCertificate clientCertificate : ClientCertificate.VALUES) {
++            for (ClientRootCertificate rootCertificate : ClientRootCertificate.VALUES) {
++              if ((sslMode == SslMode.DISABLE
++                  || database.rejectsSsl())
++                  && (clientCertificate != ClientCertificate.GOOD
++                  || rootCertificate != ClientRootCertificate.GOOD)) {
++                // When SSL is disabled, it does not make sense to verify "bad certificates"
++                // since certificates are NOT used in plaintext connections
++                continue;
++              }
++              if (database.rejectsSsl()
++                  && (sslMode.verifyCertificate()
++                      || hostname == Hostname.BAD)
++              ) {
++                // DB would reject SSL connection, so it makes no sense to test cases like verify-full
++                continue;
++              }
++              tests.add(
++                  new Object[]{hostname, database, sslMode, clientCertificate, rootCertificate,
++                      certdir});
++            }
++          }
++        }
+       }
+-      //
+-      ResultSet rs = conn.createStatement().executeQuery("select ssl_is_used()");
+-      assertTrue(rs.next());
+-      assertEquals("ssl_is_used: ", ((Boolean) expected[1]).booleanValue(), rs.getBoolean(1));
+-      conn.close();
++    }
++
++    return tests;
++  }
++
++  @Override
++  protected void updateProperties(Properties props) {
++    super.updateProperties(props);
++    props.put(TestUtil.SERVER_HOST_PORT_PROP, host.value + ":" + TestUtil.getPort());
++    props.put(TestUtil.DATABASE_PROP, db.toString());
++    PGProperty.SSL_MODE.set(props, sslmode.value);
++    if (clientCertificate == ClientCertificate.EMPTY) {
++      PGProperty.SSL_CERT.set(props, "");
++      PGProperty.SSL_KEY.set(props, "");
++    } else {
++      PGProperty.SSL_CERT.set(props,
++          certdir + "/" + clientCertificate.fileName + ".crt");
++      PGProperty.SSL_KEY.set(props,
++          certdir + "/" + clientCertificate.fileName + ".pk8");
++    }
++    if (clientRootCertificate == ClientRootCertificate.EMPTY) {
++      PGProperty.SSL_ROOT_CERT.set(props, "");
++    } else {
++      PGProperty.SSL_ROOT_CERT.set(props,
++          certdir + "/" + clientRootCertificate.fileName + ".crt");
++    }
++  }
++
++  @Override
++  public void setUp() throws Exception {
++    SQLException e = null;
++    try {
++      super.setUp();
+     } catch (SQLException ex) {
+-      if (conn != null) {
+-        conn.close();
++      e = ex;
++    }
++
++    try {
++      // Note that checkErrorCodes throws AssertionError for unexpected cases
++      checkErrorCodes(e);
++    } catch (AssertionError ae) {
++      // Make sure original SQLException is printed as well even in case of AssertionError
++      if (e != null) {
++        ae.initCause(e);
++      }
++      throw ae;
++    }
++  }
++
++  private void assertClientCertRequired(SQLException e, String caseName) {
++    if (e == null) {
++      Assert.fail(caseName + " should result in failure of client validation");
++    }
++    Assert.assertEquals(caseName + " ==> CONNECTION_FAILURE is expected",
++        PSQLState.INVALID_AUTHORIZATION_SPECIFICATION.getState(), e.getSQLState());
++  }
++
++  private void checkErrorCodes(SQLException e) {
++    if (e == null && sslmode == SslMode.ALLOW && !db.requiresSsl()) {
++      // allowed to connect with plain connection
++      return;
++    }
++
++    if (clientRootCertificate == ClientRootCertificate.EMPTY
++        && (sslmode == SslMode.VERIFY_CA || sslmode == SslMode.VERIFY_FULL)) {
++      String caseName = "rootCertificate is missing and sslmode=" + sslmode;
++      if (e == null) {
++        Assert.fail(caseName + " should result in FileNotFound exception for root certificate");
++      }
++      Assert.assertEquals(caseName + " ==> CONNECTION_FAILURE is expected",
++          PSQLState.CONNECTION_FAILURE.getState(), e.getSQLState());
++      FileNotFoundException fnf = findCause(e, FileNotFoundException.class);
++      if (fnf == null) {
++        Assert.fail(caseName + " ==> FileNotFoundException should be present in getCause chain");
++      }
++      return;
++    }
++
++    if (db.requiresSsl() && sslmode == SslMode.DISABLE) {
++      String caseName = "sslmode=DISABLE and database " + db + " requires SSL";
++      if (e == null) {
++        Assert.fail(caseName + " should result in connection failure");
++      }
++      Assert.assertEquals(caseName + " ==> INVALID_AUTHORIZATION_SPECIFICATION is expected",
++          PSQLState.INVALID_AUTHORIZATION_SPECIFICATION.getState(), e.getSQLState());
++      return;
++    }
++
++    if (db.rejectsSsl() && sslmode.requireEncryption()) {
++      String caseName =
++          "database " + db + " rejects SSL, and sslmode " + sslmode + " requires encryption";
++      if (e == null) {
++        Assert.fail(caseName + " should result in connection failure");
+       }
+-      if (exmsg == null) { // no exception is excepted
+-        fail("Exception thrown: " + ex.getMessage());
++      Assert.assertEquals(caseName + " ==> INVALID_AUTHORIZATION_SPECIFICATION is expected",
++          PSQLState.INVALID_AUTHORIZATION_SPECIFICATION.getState(), e.getSQLState());
++      return;
++    }
++
++    // Server certificate, server hostname, and client certificate can be validated in any order
++    // So we have three validators and expect at least one of them to match
++    List errors = null;
++    try {
++      if (assertServerCertificate(e)) {
++        return;
++      }
++    } catch (AssertionError ae) {
++      errors = addError(errors, ae);
++    }
++
++    try {
++      if (assertServerHostname(e)) {
++        return;
++      }
++    } catch (AssertionError ae) {
++      errors = addError(errors, ae);
++    }
++
++
++    try {
++      if (assertClientCertificate(e)) {
++        return;
++      }
++    } catch (AssertionError ae) {
++      errors = addError(errors, ae);
++    }
++
++    if (sslmode == SslMode.ALLOW && db.requiresSsl()) {
++      // Allow tries to connect with non-ssl first, and it always throws the first error even after try SSL.
++      // "If SSL was expected to fail" (e.g. invalid certificate), and db requiresSsl, then ALLOW
++      // should fail as well
++      String caseName =
++          "sslmode=ALLOW and db " + db + " requires SSL, and there are expected SSL failures";
++      if (errors == null) {
++        if (e != null) {
++          Assert.fail(caseName + " ==> connection should be upgraded to SSL with no failures");
++        }
+       } else {
+-        assertTrue("expected: " + exmsg + " actual: " + ex.getMessage(),
+-            ex.getMessage().matches(exmsg));
++        if (e == null) {
++          Assert.fail(caseName + " ==> connection should fail");
++        }
++        Assert.assertEquals(caseName + " ==> INVALID_AUTHORIZATION_SPECIFICATION is expected",
++            PSQLState.INVALID_AUTHORIZATION_SPECIFICATION.getState(), e.getSQLState());
++      }
++      // ALLOW is ok
++      return;
++    }
++
++    if (errors == null) {
++      if (e == null) {
++        // Assume "no exception" was expected.
++        // The cases like "successfully connected in sslmode=DISABLE to SSLONLY db"
++        // should be handled with assertions above
+         return;
+       }
++      Assert.fail("SQLException present when it was not expected");
++    }
++
++    AssertionError firstError = errors.get(0);
++    if (errors.size() == 1) {
++      throw firstError;
++    }
++
++    for (int i = 1; i < errors.size(); i++) {
++      AssertionError error = errors.get(i);
++      // addSuppressed is Java 1.7+
++      //#if mvn.project.property.postgresql.jdbc.spec >= "JDBC4.1"
++      firstError.addSuppressed(error);
++      //#endif
++      error.printStackTrace();
+     }
+-  }
+ 
+-  protected String certdir;
+-  protected String connstr;
+-  protected String sslmode;
+-  protected boolean goodclient;
+-  protected boolean goodserver;
+-  protected String prefix;
+-  protected Object[] expected;
+-
+-  private String makeConnStr(String sslmode, boolean goodclient, boolean goodserver) {
+-    return connstr
+-        + "&sslmode=" + sslmode
+-        + "&sslcert=" + certdir + "/" + prefix + (goodclient ? "goodclient.crt" : "badclient.crt")
+-        + "&sslkey=" + certdir + "/" + prefix + (goodclient ? "goodclient.pk8" : "badclient.pk8")
+-        + "&sslrootcert=" + certdir + "/" + prefix + (goodserver ? "goodroot.crt" : "badroot.crt")
+-        // + "&sslfactory=org.postgresql.ssl.NonValidatingFactory"
+-        + "&loglevel=" + TestUtil.getLogLevel();
++    throw firstError;
+   }
+ 
+-  public SslTest(String name, String certdir, String connstr, String sslmode,
+-      boolean goodclient, boolean goodserver, String prefix, Object[] expected) {
+-    super(name);
+-    this.certdir = certdir;
+-    this.connstr = connstr;
+-    this.sslmode = sslmode;
+-    this.goodclient = goodclient;
+-    this.goodserver = goodserver;
+-    this.prefix = prefix;
+-    this.expected = expected;
++  private List addError(List errors, AssertionError ae) {
++    if (errors == null) {
++      errors = new ArrayList();
++    }
++    errors.add(ae);
++    return errors;
+   }
+ 
+-  static TestSuite getSuite(Properties prop, String param) {
+-    File certDirFile = TestUtil.getFile(prop.getProperty("certdir"));
+-    String certdir = certDirFile.getAbsolutePath();
+-    String sconnstr = prop.getProperty(param);
+-    String sprefix = prop.getProperty(param + "prefix");
+-    String[] sslModes = {"disable", "allow", "prefer", "require", "verify-ca", "verify-full"};
+-
+-    TestSuite suite = new TestSuite();
+-    Map expected = expectedmap.get(param);
+-    if (expected == null) {
+-      expected = defaultexpected;
+-    }
+-    for (String sslMode : sslModes) {
+-      suite.addTest(new SslTest(param + "-" + sslMode + "GG3", certdir, sconnstr, sslMode,
+-           true, true, sprefix, expected.get(sslMode + "GG")));
+-      suite.addTest(new SslTest(param + "-" + sslMode + "GB3", certdir, sconnstr, sslMode,
+-           true, false, sprefix, expected.get(sslMode + "GB")));
+-      suite.addTest(new SslTest(param + "-" + sslMode + "BG3", certdir, sconnstr, sslMode,
+-           false, true, sprefix, expected.get(sslMode + "BG")));
+-    }
+-    return suite;
++  /**
++   * Checks server certificate validation error.
++   *
++   * @param e connection exception or null if no exception
++   * @return true when validation pass, false when the case is not applicable
++   * @throws AssertionError when exception does not match expectations
++   */
++  private boolean assertServerCertificate(SQLException e) {
++    if (clientRootCertificate == ClientRootCertificate.GOOD
++        || (sslmode != SslMode.VERIFY_CA && sslmode != SslMode.VERIFY_FULL)) {
++      return false;
++    }
++
++    String caseName = "Server certificate is " + clientRootCertificate + " + sslmode=" + sslmode;
++    if (e == null) {
++      Assert.fail(caseName + " should result in failure of server validation");
++    }
++
++    Assert.assertEquals(caseName + " ==> CONNECTION_FAILURE is expected",
++        PSQLState.CONNECTION_FAILURE.getState(), e.getSQLState());
++    CertPathValidatorException validatorEx = findCause(e, CertPathValidatorException.class);
++    if (validatorEx == null) {
++      Assert.fail(caseName + " ==> exception should be caused by CertPathValidatorException,"
++          + " but no CertPathValidatorException is present in the getCause chain");
++    }
++    // getReason is Java 1.7+
++    //#if mvn.project.property.postgresql.jdbc.spec >= "JDBC4.1"
++    Assert.assertEquals(caseName + " ==> CertPathValidatorException.getReason",
++        "NO_TRUST_ANCHOR", validatorEx.getReason().toString());
++    //#endif
++    return true;
+   }
+ 
+-  protected void runTest() throws Throwable {
+-    driver(makeConnStr(sslmode, goodclient, goodserver), expected);
++  /**
++   * Checks hostname validation error.
++   *
++   * @param e connection exception or null if no exception
++   * @return true when validation pass, false when the case is not applicable
++   * @throws AssertionError when exception does not match expectations
++   */
++  private boolean assertServerHostname(SQLException e) {
++    if (sslmode != SslMode.VERIFY_FULL || host != Hostname.BAD) {
++      return false;
++    }
++
++    String caseName = "VERIFY_FULL + hostname that does not match server certificate";
++    if (e == null) {
++      Assert.fail(caseName + " ==> CONNECTION_FAILURE expected");
++    }
++    Assert.assertEquals(caseName + " ==> CONNECTION_FAILURE is expected",
++        PSQLState.CONNECTION_FAILURE.getState(), e.getSQLState());
++    if (!e.getMessage().contains("PgjdbcHostnameVerifier")) {
++      Assert.fail(caseName + " ==> message should contain"
++          + " 'PgjdbcHostnameVerifier'. Actual message is " + e.getMessage());
++    }
++    return true;
+   }
+ 
+-  static Map> expectedmap;
+-  static TreeMap defaultexpected;
+-
+-  // For some strange reason, the v2 driver begins these error messages by "Connection rejected: "
+-  // but the v3 does not.
+-  // Also, for v2 there are two spaces after FATAL:, and the message ends with "\n.".
+-  static String PG_HBA_ON =
+-      "(Connection rejected: )?FATAL:  ?no pg_hba.conf entry for host .*, user .*, database .*, SSL on(?s-d:.*)";
+-  static String PG_HBA_OFF =
+-      "(Connection rejected: )?FATAL:  ?no pg_hba.conf entry for host .*, user .*, database .*, SSL off(?s-d:.*)";
+-  static String FAILED = "The connection attempt failed.";
+-  static String BROKEN =
+-      "SSL error: (Broken pipe( \\(Write failed\\))?|Received fatal alert: unknown_ca|Connection reset|Protocol wrong type for socket)";
+-  static String SSLMODEALLOW  = "Invalid sslmode value: allow";
+-  static String SSLMODEPREFER  = "Invalid sslmode value: prefer";
+-  // static String UNKNOWN = "SSL error: Broken pipe";
+-  //static String UNKNOWN = "SSL error: Received fatal alert: unknown_ca";
+-  static String ANY = ".*";
+-  static String VALIDATOR =
+-      "SSL error: sun.security.validator.ValidatorException: PKIX path (building|validation) failed:.*";
+-  static String HOSTNAME = "The hostname .* could not be verified.";
+-
+-  static {
+-    defaultexpected = new TreeMap();
+-    defaultexpected.put("disableGG", new Object[]{null, Boolean.FALSE});
+-    defaultexpected.put("disableGB", new Object[]{null, Boolean.FALSE});
+-    defaultexpected.put("disableBG", new Object[]{null, Boolean.FALSE});
+-    defaultexpected.put("allowGG", new Object[]{SSLMODEALLOW, Boolean.TRUE});
+-    defaultexpected.put("allowGB", new Object[]{SSLMODEALLOW, Boolean.TRUE});
+-    defaultexpected.put("allowBG", new Object[]{SSLMODEALLOW, Boolean.TRUE});
+-    defaultexpected.put("preferGG", new Object[]{SSLMODEPREFER, Boolean.TRUE});
+-    defaultexpected.put("preferGB", new Object[]{SSLMODEPREFER, Boolean.TRUE});
+-    defaultexpected.put("preferBG", new Object[]{SSLMODEPREFER, Boolean.TRUE});
+-    defaultexpected.put("requireGG", new Object[]{null, Boolean.TRUE});
+-    defaultexpected.put("requireGB", new Object[]{null, Boolean.TRUE});
+-    defaultexpected.put("requireBG", new Object[]{null, Boolean.TRUE});
+-    defaultexpected.put("verify-caGG", new Object[]{null, Boolean.TRUE});
+-    defaultexpected.put("verify-caGB", new Object[]{ANY, Boolean.TRUE});
+-    defaultexpected.put("verify-caBG", new Object[]{null, Boolean.TRUE});
+-    defaultexpected.put("verify-fullGG", new Object[]{null, Boolean.TRUE});
+-    defaultexpected.put("verify-fullGB", new Object[]{ANY, Boolean.TRUE});
+-    defaultexpected.put("verify-fullBG", new Object[]{null, Boolean.TRUE});
+-
+-    expectedmap = new TreeMap>();
+-    TreeMap work;
+-
+-    work = (TreeMap) defaultexpected.clone();
+-    work.put("disableGG", new Object[]{null, Boolean.FALSE});
+-    work.put("disableGB", new Object[]{null, Boolean.FALSE});
+-    work.put("disableBG", new Object[]{null, Boolean.FALSE});
+-    work.put("allowGG", new Object[]{SSLMODEALLOW, Boolean.FALSE});
+-    work.put("allowGB", new Object[]{SSLMODEALLOW, Boolean.FALSE});
+-    work.put("allowBG", new Object[]{SSLMODEALLOW, Boolean.FALSE});
+-    work.put("preferGG", new Object[]{SSLMODEPREFER, Boolean.FALSE});
+-    work.put("preferGB", new Object[]{SSLMODEPREFER, Boolean.FALSE});
+-    work.put("preferBG", new Object[]{SSLMODEPREFER, Boolean.FALSE});
+-    work.put("requireGG", new Object[]{ANY, Boolean.TRUE});
+-    work.put("requireGB", new Object[]{ANY, Boolean.TRUE});
+-    work.put("requireBG", new Object[]{ANY, Boolean.TRUE});
+-    work.put("verify-caGG", new Object[]{ANY, Boolean.TRUE});
+-    work.put("verify-caGB", new Object[]{ANY, Boolean.TRUE});
+-    work.put("verify-caBG", new Object[]{ANY, Boolean.TRUE});
+-    work.put("verify-fullGG", new Object[]{ANY, Boolean.TRUE});
+-    work.put("verify-fullGB", new Object[]{ANY, Boolean.TRUE});
+-    work.put("verify-fullBG", new Object[]{ANY, Boolean.TRUE});
+-    expectedmap.put("ssloff9", work);
+-
+-    work = (TreeMap) defaultexpected.clone();
+-    work.put("disableGG", new Object[]{null, Boolean.FALSE});
+-    work.put("disableGB", new Object[]{null, Boolean.FALSE});
+-    work.put("disableBG", new Object[]{null, Boolean.FALSE});
+-    work.put("allowGG", new Object[]{SSLMODEALLOW, Boolean.FALSE});
+-    work.put("allowGB", new Object[]{SSLMODEALLOW, Boolean.FALSE});
+-    work.put("allowBG", new Object[]{SSLMODEALLOW, Boolean.FALSE});
+-    work.put("preferGG", new Object[]{SSLMODEPREFER, Boolean.FALSE});
+-    work.put("preferGB", new Object[]{SSLMODEPREFER, Boolean.FALSE});
+-    work.put("preferBG", new Object[]{SSLMODEPREFER, Boolean.FALSE});
+-    work.put("requireGG", new Object[]{PG_HBA_ON, Boolean.TRUE});
+-    work.put("requireGB", new Object[]{PG_HBA_ON, Boolean.TRUE});
+-    work.put("requireBG", new Object[]{BROKEN, Boolean.TRUE});
+-    work.put("verify-caGG", new Object[]{PG_HBA_ON, Boolean.TRUE});
+-    work.put("verify-caGB", new Object[]{VALIDATOR, Boolean.TRUE});
+-    work.put("verify-caBG", new Object[]{BROKEN, Boolean.TRUE});
+-    work.put("verify-fullGG", new Object[]{PG_HBA_ON, Boolean.TRUE});
+-    work.put("verify-fullGB", new Object[]{VALIDATOR, Boolean.TRUE});
+-    work.put("verify-fullBG", new Object[]{BROKEN, Boolean.TRUE});
+-    expectedmap.put("sslhostnossl9", work);
+-
+-    work = (TreeMap) defaultexpected.clone();
+-    work.put("disableGG", new Object[]{null, Boolean.FALSE});
+-    work.put("disableGB", new Object[]{null, Boolean.FALSE});
+-    work.put("disableBG", new Object[]{null, Boolean.FALSE});
+-    work.put("allowGG", new Object[]{SSLMODEALLOW, Boolean.FALSE});
+-    work.put("allowGB", new Object[]{SSLMODEALLOW, Boolean.FALSE});
+-    work.put("allowBG", new Object[]{SSLMODEALLOW, Boolean.FALSE});
+-    work.put("preferGG", new Object[]{SSLMODEPREFER, Boolean.TRUE});
+-    work.put("preferGB", new Object[]{SSLMODEPREFER, Boolean.TRUE});
+-    work.put("preferBG", new Object[]{SSLMODEPREFER, Boolean.FALSE});
+-    work.put("requireGG", new Object[]{null, Boolean.TRUE});
+-    work.put("requireGB", new Object[]{null, Boolean.TRUE});
+-    work.put("requireBG", new Object[]{BROKEN, Boolean.TRUE});
+-    work.put("verify-caGG", new Object[]{null, Boolean.TRUE});
+-    work.put("verify-caGB", new Object[]{VALIDATOR, Boolean.TRUE});
+-    work.put("verify-caBG", new Object[]{BROKEN, Boolean.TRUE});
+-    work.put("verify-fullGG", new Object[]{null, Boolean.TRUE});
+-    work.put("verify-fullGB", new Object[]{VALIDATOR, Boolean.TRUE});
+-    work.put("verify-fullBG", new Object[]{BROKEN, Boolean.TRUE});
+-    expectedmap.put("sslhostgh9", work);
+-
+-    work = (TreeMap) work.clone();
+-    work.put("disableGG", new Object[]{PG_HBA_OFF, Boolean.FALSE});
+-    work.put("disableGB", new Object[]{PG_HBA_OFF, Boolean.FALSE});
+-    work.put("disableBG", new Object[]{PG_HBA_OFF, Boolean.FALSE});
+-    work.put("allowGG", new Object[]{SSLMODEALLOW, Boolean.TRUE});
+-    work.put("allowGB", new Object[]{SSLMODEALLOW, Boolean.TRUE});
+-    work.put("allowBG", new Object[]{SSLMODEALLOW, Boolean.TRUE});
+-    work.put("preferBG", new Object[]{SSLMODEPREFER, Boolean.FALSE});
+-    expectedmap.put("sslhostsslgh9", work);
+-
+-    work = (TreeMap) defaultexpected.clone();
+-    work.put("disableGG", new Object[]{null, Boolean.FALSE});
+-    work.put("disableGB", new Object[]{null, Boolean.FALSE});
+-    work.put("disableBG", new Object[]{null, Boolean.FALSE});
+-    work.put("allowGG", new Object[]{SSLMODEALLOW, Boolean.FALSE});
+-    work.put("allowGB", new Object[]{SSLMODEALLOW, Boolean.FALSE});
+-    work.put("allowBG", new Object[]{SSLMODEALLOW, Boolean.FALSE});
+-    work.put("preferGG", new Object[]{SSLMODEPREFER, Boolean.TRUE});
+-    work.put("preferGB", new Object[]{SSLMODEPREFER, Boolean.TRUE});
+-    work.put("preferBG", new Object[]{SSLMODEPREFER, Boolean.FALSE});
+-    work.put("requireGG", new Object[]{null, Boolean.TRUE});
+-    work.put("requireGB", new Object[]{null, Boolean.TRUE});
+-    work.put("requireBG", new Object[]{BROKEN, Boolean.TRUE});
+-    work.put("verify-caGG", new Object[]{null, Boolean.TRUE});
+-    work.put("verify-caGB", new Object[]{VALIDATOR, Boolean.TRUE});
+-    work.put("verify-caBG", new Object[]{BROKEN, Boolean.TRUE});
+-    work.put("verify-fullGG", new Object[]{HOSTNAME, Boolean.TRUE});
+-    work.put("verify-fullGB", new Object[]{VALIDATOR, Boolean.TRUE});
+-    work.put("verify-fullBG", new Object[]{BROKEN, Boolean.TRUE});
+-    expectedmap.put("sslhostbh9", work);
+-
+-    work = (TreeMap) work.clone();
+-    work.put("disableGG", new Object[]{PG_HBA_OFF, Boolean.FALSE});
+-    work.put("disableGB", new Object[]{PG_HBA_OFF, Boolean.FALSE});
+-    work.put("disableBG", new Object[]{PG_HBA_OFF, Boolean.FALSE});
+-    work.put("allowGG", new Object[]{SSLMODEALLOW, Boolean.TRUE});
+-    work.put("allowGB", new Object[]{SSLMODEALLOW, Boolean.TRUE});
+-    work.put("allowBG", new Object[]{SSLMODEALLOW, Boolean.TRUE});
+-    work.put("preferBG", new Object[]{SSLMODEPREFER, Boolean.FALSE});
+-    expectedmap.put("sslhostsslbh9", work);
+-
+-    work = (TreeMap) defaultexpected.clone();
+-    work.put("disableGG", new Object[]{PG_HBA_OFF, Boolean.FALSE});
+-    work.put("disableGB", new Object[]{PG_HBA_OFF, Boolean.FALSE});
+-    work.put("disableBG", new Object[]{PG_HBA_OFF, Boolean.FALSE});
+-    work.put("allowGG", new Object[]{SSLMODEALLOW, Boolean.TRUE});
+-    work.put("allowGB", new Object[]{SSLMODEALLOW, Boolean.TRUE});
+-    work.put("allowBG", new Object[]{SSLMODEALLOW, Boolean.TRUE});
+-    work.put("preferGG", new Object[]{SSLMODEPREFER, Boolean.TRUE});
+-    work.put("preferGB", new Object[]{SSLMODEPREFER, Boolean.TRUE});
+-    work.put("preferBG", new Object[]{SSLMODEPREFER, Boolean.TRUE});
+-    work.put("requireGG", new Object[]{null, Boolean.TRUE});
+-    work.put("requireGB", new Object[]{null, Boolean.TRUE});
+-    work.put("requireBG", new Object[]{BROKEN, Boolean.TRUE});
+-    work.put("verify-caGG", new Object[]{null, Boolean.TRUE});
+-    work.put("verify-caGB", new Object[]{VALIDATOR, Boolean.TRUE});
+-    work.put("verify-caBG", new Object[]{BROKEN, Boolean.TRUE});
+-    work.put("verify-fullGG", new Object[]{null, Boolean.TRUE});
+-    work.put("verify-fullGB", new Object[]{VALIDATOR, Boolean.TRUE});
+-    work.put("verify-fullBG", new Object[]{BROKEN, Boolean.TRUE});
+-    expectedmap.put("sslhostsslcertgh9", work);
+-
+-    work = (TreeMap) defaultexpected.clone();
+-    work.put("disableGG", new Object[]{PG_HBA_OFF, Boolean.FALSE});
+-    work.put("disableGB", new Object[]{PG_HBA_OFF, Boolean.FALSE});
+-    work.put("disableBG", new Object[]{PG_HBA_OFF, Boolean.FALSE});
+-    work.put("allowGG", new Object[]{SSLMODEALLOW, Boolean.TRUE});
+-    work.put("allowGB", new Object[]{SSLMODEALLOW, Boolean.TRUE});
+-    work.put("allowBG", new Object[]{SSLMODEALLOW, Boolean.TRUE});
+-    work.put("preferGG", new Object[]{SSLMODEPREFER, Boolean.TRUE});
+-    work.put("preferGB", new Object[]{SSLMODEPREFER, Boolean.TRUE});
+-    work.put("preferBG", new Object[]{SSLMODEPREFER, Boolean.TRUE});
+-    work.put("requireGG", new Object[]{null, Boolean.TRUE});
+-    work.put("requireGB", new Object[]{null, Boolean.TRUE});
+-    work.put("requireBG", new Object[]{BROKEN, Boolean.TRUE});
+-    work.put("verify-caGG", new Object[]{null, Boolean.TRUE});
+-    work.put("verify-caGB", new Object[]{VALIDATOR, Boolean.TRUE});
+-    work.put("verify-caBG", new Object[]{BROKEN, Boolean.TRUE});
+-    work.put("verify-fullGG", new Object[]{HOSTNAME, Boolean.TRUE});
+-    work.put("verify-fullGB", new Object[]{VALIDATOR, Boolean.TRUE});
+-    work.put("verify-fullBG", new Object[]{BROKEN, Boolean.TRUE});
+-    expectedmap.put("sslhostsslcertbh9", work);
+-
+-    work = (TreeMap) defaultexpected.clone();
+-    work.put("disableGG", new Object[]{PG_HBA_OFF, Boolean.FALSE});
+-    work.put("disableGB", new Object[]{PG_HBA_OFF, Boolean.FALSE});
+-    work.put("disableBG", new Object[]{PG_HBA_OFF, Boolean.FALSE});
+-    work.put("allowGG", new Object[]{SSLMODEALLOW, Boolean.TRUE});
+-    work.put("allowGB", new Object[]{SSLMODEALLOW, Boolean.TRUE});
+-    work.put("allowBG", new Object[]{SSLMODEALLOW, Boolean.TRUE});
+-    work.put("preferGG", new Object[]{SSLMODEPREFER, Boolean.TRUE});
+-    work.put("preferGB", new Object[]{SSLMODEPREFER, Boolean.TRUE});
+-    work.put("preferBG", new Object[]{SSLMODEPREFER, Boolean.TRUE});
+-    work.put("requireGG", new Object[]{null, Boolean.TRUE});
+-    work.put("requireGB", new Object[]{null, Boolean.TRUE});
+-    work.put("requireBG", new Object[]{BROKEN, Boolean.TRUE});
+-    work.put("verify-caGG", new Object[]{null, Boolean.TRUE});
+-    work.put("verify-caGB", new Object[]{VALIDATOR, Boolean.TRUE});
+-    work.put("verify-caBG", new Object[]{BROKEN, Boolean.TRUE});
+-    work.put("verify-fullGG", new Object[]{null, Boolean.TRUE});
+-    work.put("verify-fullGB", new Object[]{VALIDATOR, Boolean.TRUE});
+-    work.put("verify-fullBG", new Object[]{BROKEN, Boolean.TRUE});
+-    expectedmap.put("sslcertgh9", work);
+-
+-    work = (TreeMap) work.clone();
+-    work.put("verify-fullGG", new Object[]{HOSTNAME, Boolean.TRUE});
+-    expectedmap.put("sslcertbh9", work);
++  /**
++   * Checks client certificate validation error.
++   *
++   * @param e connection exception or null if no exception
++   * @return true when validation pass, false when the case is not applicable
++   * @throws AssertionError when exception does not match expectations
++   */
++  private boolean assertClientCertificate(SQLException e) {
++    if (db.requiresClientCert() && clientCertificate == ClientCertificate.EMPTY) {
++      String caseName =
++          "client certificate was not sent and database " + db + " requires client certificate";
++      assertClientCertRequired(e, caseName);
++      return true;
++    }
+ 
++    if (clientCertificate != ClientCertificate.BAD) {
++      return false;
++    }
++    // Server verifies certificate no matter how it is configured, so sending BAD one
++    // is doomed to fail
++    String caseName = "BAD client certificate, and database " + db + " requires one";
++    if (e == null) {
++      Assert.fail(caseName + " should result in failure of client validation");
++    }
++    Assert.assertEquals(caseName + " ==> CONNECTION_FAILURE is expected",
++        PSQLState.CONNECTION_FAILURE.getState(), e.getSQLState());
++
++    // Two exceptions are possible
++    // SSLHandshakeException: Received fatal alert: unknown_ca
++    // SocketException: broken pipe (write failed)
++
++    SocketException brokenPipe = findCause(e, SocketException.class);
++    SSLHandshakeException handshakeException = findCause(e, SSLHandshakeException.class);
++
++    if (brokenPipe == null && handshakeException == null) {
++      Assert.fail(caseName + " ==> exception should be caused by SocketException(broken pipe)"
++          + " or SSLHandshakeException. No exceptions of such kind are present in the getCause chain");
++    }
++    if (brokenPipe != null && !brokenPipe.getMessage().contains("Broken pipe")) {
++      Assert.fail(
++          caseName + " ==> server should have terminated the connection (broken pipe expected)"
++              + ", actual exception was " + brokenPipe.getMessage());
++    }
++    if (handshakeException != null && !handshakeException.getMessage().contains("unknown_ca")) {
++      Assert.fail(
++          caseName + " ==> server should have terminated the connection (expected 'unknown_ca')"
++              + ", actual exception was " + handshakeException.getMessage());
++    }
++    return true;
+   }
+ 
++  private static  T findCause(Throwable t, Class cause) {
++    while (t != null) {
++      if (cause.isInstance(t)) {
++        return (T) t;
++      }
++      t = t.getCause();
++    }
++    return null;
++  }
++
++
++  @Test
++  public void run() throws SQLException {
++    if (con == null) {
++      // e.g. expected failure to connect
++      return;
++    }
++    ResultSet rs = con.createStatement().executeQuery("select ssl_is_used()");
++    Assert.assertTrue("select ssl_is_used() should return a row", rs.next());
++    boolean sslUsed = rs.getBoolean(1);
++    if (sslmode == SslMode.ALLOW) {
++      Assert.assertEquals("ssl_is_used: ",
++          db.requiresSsl(),
++          sslUsed);
++    } else {
++      Assert.assertEquals("ssl_is_used: ",
++          sslmode != SslMode.DISABLE && !db.rejectsSsl(),
++          sslUsed);
++    }
++    TestUtil.closeQuietly(rs);
++  }
+ 
+ }
+diff --git a/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTestSuite.java b/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTestSuite.java
+index 19c3a7c532..cf48916f42 100644
+--- a/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTestSuite.java
++++ b/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTestSuite.java
+@@ -5,43 +5,14 @@
+ 
+ package org.postgresql.test.ssl;
+ 
+-import org.postgresql.test.TestUtil;
+-
+-import junit.framework.TestSuite;
+-
+-import java.util.Properties;
+-
+-public class SslTestSuite extends TestSuite {
+-  private static Properties prop;
+-
+-  private static void add(TestSuite suite, String param) {
+-    if (prop.getProperty(param, "").equals("")) {
+-      System.out.println("Skipping " + param + ".");
+-    } else {
+-      suite.addTest(SslTest.getSuite(prop, param));
+-    }
+-  }
+-
+-  /*
+-   * The main entry point for JUnit
+-   */
+-  public static TestSuite suite() throws Exception {
+-    TestSuite suite = new TestSuite();
+-    prop = TestUtil.loadPropertyFiles("ssltest.properties");
+-    add(suite, "ssloff9");
+-    add(suite, "sslhostnossl9");
+-
+-    String[] hostModes = {"sslhost", "sslhostssl", "sslhostsslcert", "sslcert"};
+-    String[] certModes = {"gh", "bh"};
+-
+-    for (String hostMode : hostModes) {
+-      for (String certMode : certModes) {
+-        add(suite, hostMode + certMode + "9");
+-      }
+-    }
+-
+-    TestUtil.initDriver();
+-
+-    return suite;
+-  }
++import org.junit.runner.RunWith;
++import org.junit.runners.Suite;
++
++@RunWith(Suite.class)
++@Suite.SuiteClasses({
++    LibPQFactoryHostNameTest.class,
++    CommonNameVerifierTest.class,
++    SslTest.class
++})
++public class SslTestSuite {
+ }
+diff --git a/ssltest.properties b/ssltest.properties
+index 21d1d45a40..492399a428 100644
+--- a/ssltest.properties
++++ b/ssltest.properties
+@@ -1,32 +1,2 @@
+-
+-  
+ certdir=certdir
+-
+-# Uncomment to enable testing of SingleCertValidatingFactory
+-#testsinglecertfactory=true
+-
+-ssloff9=
+-ssloff9prefix=
+-
+-#sslhostnossl9=jdbc:postgresql://localhost:5432/hostnossldb?sslpassword=sslpwd
+-sslhostnossl9prefix=
+-
+-#sslhostgh9=jdbc:postgresql://localhost:5432/hostdb?sslpassword=sslpwd
+-sslhostgh9prefix=
+-#sslhostbh9=jdbc:postgresql://127.0.0.1:5432/hostdb?sslpassword=sslpwd
+-sslhostbh9prefix=
+-
+-#sslhostsslgh9=jdbc:postgresql://localhost:5432/hostssldb?sslpassword=sslpwd
+-sslhostsslgh9prefix=
+-#sslhostsslbh9=jdbc:postgresql://127.0.0.1:5432/hostssldb?sslpassword=sslpwd
+-sslhostsslbh9prefix=
+-
+-#sslhostsslcertgh9=jdbc:postgresql://localhost:5432/hostsslcertdb?sslpassword=sslpwd
+-sslhostsslcertgh9prefix=
+-#sslhostsslcertbh9=jdbc:postgresql://127.0.0.1:5432/hostsslcertdb?sslpassword=sslpwd
+-sslhostsslcertbh9prefix=
+-
+-#sslcertgh9=jdbc:postgresql://localhost:5432/certdb?sslpassword=sslpwd
+-sslcertgh9prefix=
+-#sslcertbh9=jdbc:postgresql://127.0.0.1:5432/certdb?sslpassword=sslpwd
+-sslcertbh9prefix=
+\ No newline at end of file
++#enable_ssl_tests=true
\ No newline at end of file
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue107_5.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue107_5.diff
new file mode 100644
index 00000000..f75a22af
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue107_5.diff
@@ -0,0 +1,835 @@
+diff --git a/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/client/Client.java b/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/client/Client.java
+index 1f2a7c4baec..9d636200d61 100644
+--- a/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/client/Client.java
++++ b/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/client/Client.java
+@@ -112,7 +112,6 @@ public static void main(String[] args) throws Exception {
+         Map properties = new HashMap<>();
+         properties.put("bus.jmx.usePlatformMBeanServer", Boolean.TRUE);
+         properties.put("bus.jmx.enabled", Boolean.TRUE);
+-        properties.put("bus.jmx.createMBServerConnectorFactory", Boolean.FALSE);
+         Bus b = new CXFBusFactory().createBus(null, properties);
+         MetricRegistry registry = new MetricRegistry();
+         CodahaleMetricsProvider.setupJMXReporter(b, registry);
+diff --git a/distribution/src/main/release/samples/wsdl_first/src/main/resources/server-applicationContext.xml b/distribution/src/main/release/samples/wsdl_first/src/main/resources/server-applicationContext.xml
+index 8bf5109ec95..391f97c624e 100644
+--- a/distribution/src/main/release/samples/wsdl_first/src/main/resources/server-applicationContext.xml
++++ b/distribution/src/main/release/samples/wsdl_first/src/main/resources/server-applicationContext.xml
+@@ -45,4 +45,4 @@
+             
+         
+     
+-
+\ No newline at end of file
++
+diff --git a/rt/management/pom.xml b/rt/management/pom.xml
+index f63f3bfa6d7..19ccf6ada0c 100644
+--- a/rt/management/pom.xml
++++ b/rt/management/pom.xml
+@@ -34,8 +34,7 @@
+         org.apache.cxf.management
+         
+             javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
+-            javax.annotation*;version="${cxf.osgi.javax.annotation.version}",
+-            sun.rmi*;resolution:=optional
++            javax.annotation*;version="${cxf.osgi.javax.annotation.version}"
+         
+     
+     
+diff --git a/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java b/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
+index ee7f0a71fee..d898a4b6f5f 100644
+--- a/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
++++ b/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
+@@ -19,7 +19,6 @@
+ 
+ package org.apache.cxf.management.jmx;
+ 
+-import java.io.IOException;
+ import java.lang.management.ManagementFactory;
+ import java.util.HashMap;
+ import java.util.HashSet;
+@@ -53,31 +52,25 @@
+ import org.apache.cxf.management.ManagedComponent;
+ import org.apache.cxf.management.ManagementConstants;
+ import org.apache.cxf.management.jmx.export.runtime.ModelMBeanAssembler;
+-import org.apache.cxf.management.jmx.type.JMXConnectorPolicyType;
+ 
+ /**
+  * The manager class for the JMXManagedComponent which hosts the JMXManagedComponents.
+  */
+-public class InstrumentationManagerImpl extends JMXConnectorPolicyType
++public class InstrumentationManagerImpl
+     implements InstrumentationManager, BusLifeCycleListener {
+     private static final Logger LOG = LogUtils.getL7dLogger(InstrumentationManagerImpl.class);
+ 
+     private static Map mbeanServerIDMap = new HashMap<>();
+ 
+     private Bus bus;
+-    private MBServerConnectorFactory mcf;
+     private MBeanServer mbs;
+     private Set busMBeans = new HashSet<>();
+     private boolean connectFailed;
+     private String persistentBusId;
+-    private Map environment;
+ 
+-    /**
+-     * For backward compatibility, {@link #createMBServerConnectorFactory} is true by default.
+-     */
+-    private boolean createMBServerConnectorFactory = true;
+     private String mbeanServerName = ManagementConstants.DEFAULT_DOMAIN_NAME;
+     private boolean usePlatformMBeanServer;
++    private boolean enabled;
+ 
+     public InstrumentationManagerImpl() {
+         super();
+@@ -119,16 +112,16 @@ public void setServerName(String s) {
+         mbeanServerName = s;
+     }
+ 
+-    public void setCreateMBServerConnectorFactory(boolean createMBServerConnectorFactory) {
+-        this.createMBServerConnectorFactory = createMBServerConnectorFactory;
+-    }
+-
+     public void setUsePlatformMBeanServer(Boolean flag) {
+         usePlatformMBeanServer = flag;
+     }
+ 
+-    public void setEnvironment(Map env) {
+-        environment = env;
++    public void setEnabled(boolean enabled) {
++        this.enabled = enabled;
++    }
++
++    public boolean isEnabled() {
++        return enabled;
+     }
+ 
+     @Deprecated
+@@ -139,7 +132,6 @@ public void register() {
+     public void init() {
+         if (bus != null && bus.getExtension(MBeanServer.class) != null) {
+             enabled = true;
+-            createMBServerConnectorFactory = false;
+             mbs = bus.getExtension(MBeanServer.class);
+         }
+         if (isEnabled()) {
+@@ -168,21 +160,6 @@ public void init() {
+                 }
+             }
+ 
+-            if (createMBServerConnectorFactory) {
+-                mcf = MBServerConnectorFactory.getInstance();
+-                mcf.setMBeanServer(mbs);
+-                mcf.setThreaded(isThreaded());
+-                mcf.setDaemon(isDaemon());
+-                mcf.setServiceUrl(getJMXServiceURL());
+-                mcf.setEnvironment(environment);
+-                try {
+-                    mcf.createConnector();
+-                } catch (IOException ex) {
+-                    connectFailed = true;
+-                    LOG.log(Level.SEVERE, "START_CONNECTOR_FAILURE_MSG", new Object[] {ex});
+-                }
+-            }
+-
+             if (!connectFailed && null != bus) {
+                 try {
+                     //Register Bus here since we can guarantee that Instrumentation
+@@ -282,14 +259,6 @@ public void shutdown() {
+             return;
+         }
+ 
+-        if (mcf != null) {
+-            try {
+-                mcf.destroy();
+-            } catch (IOException ex) {
+-                LOG.log(Level.SEVERE, "STOP_CONNECTOR_FAILURE_MSG", new Object[] {ex});
+-            }
+-        }
+-
+         //Using the array to hold the busMBeans to avoid the CurrentModificationException
+         Object[] mBeans = busMBeans.toArray();
+         for (Object name : mBeans) {
+@@ -400,12 +369,7 @@ private void readJMXProperties(Bus b) {
+                 getBusProperty(b, "bus.jmx.serverName", mbeanServerName);
+             usePlatformMBeanServer =
+                 getBusProperty(b, "bus.jmx.usePlatformMBeanServer", usePlatformMBeanServer);
+-            createMBServerConnectorFactory =
+-                getBusProperty(b, "bus.jmx.createMBServerConnectorFactory", createMBServerConnectorFactory);
+-            daemon = getBusProperty(b, "bus.jmx.daemon", daemon);
+-            threaded = getBusProperty(b, "bus.jmx.threaded", threaded);
+             enabled = getBusProperty(b, "bus.jmx.enabled", enabled);
+-            jmxServiceURL = getBusProperty(b, "bus.jmx.JMXServiceURL", jmxServiceURL);
+         }
+     }
+ 
+diff --git a/rt/management/src/main/java/org/apache/cxf/management/jmx/MBServerConnectorFactory.java b/rt/management/src/main/java/org/apache/cxf/management/jmx/MBServerConnectorFactory.java
+deleted file mode 100644
+index 5eb7059b8fb..00000000000
+--- a/rt/management/src/main/java/org/apache/cxf/management/jmx/MBServerConnectorFactory.java
++++ /dev/null
+@@ -1,260 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements. See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership. The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License. You may obtain a copy of the License at
+- *
+- * http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing,
+- * software distributed under the License is distributed on an
+- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+- * KIND, either express or implied. See the License for the
+- * specific language governing permissions and limitations
+- * under the License.
+- */
+-
+-package org.apache.cxf.management.jmx;
+-
+-import java.io.IOException;
+-import java.net.URI;
+-import java.net.URISyntaxException;
+-import java.rmi.AccessException;
+-import java.rmi.AlreadyBoundException;
+-import java.rmi.NotBoundException;
+-import java.rmi.Remote;
+-import java.rmi.RemoteException;
+-import java.util.Map;
+-import java.util.logging.Level;
+-import java.util.logging.Logger;
+-
+-import javax.management.MBeanServer;
+-import javax.management.MBeanServerFactory;
+-import javax.management.remote.JMXConnectorServer;
+-import javax.management.remote.JMXServiceURL;
+-import javax.management.remote.rmi.RMIConnectorServer;
+-import javax.management.remote.rmi.RMIJRMPServerImpl;
+-
+-import org.apache.cxf.common.logging.LogUtils;
+-
+-
+-
+-/**
+- * Deal with the MBeanServer Connections
+- *
+- */
+-public final class MBServerConnectorFactory {
+-
+-    public static final String DEFAULT_SERVICE_URL = "service:jmx:rmi:///jndi/rmi://localhost:9913/jmxrmi";
+-
+-    private static final Logger LOG = LogUtils.getL7dLogger(MBServerConnectorFactory.class);
+-
+-    private static MBeanServer server;
+-
+-    private static String serviceUrl = DEFAULT_SERVICE_URL;
+-
+-    private static Map environment;
+-
+-    private static boolean threaded;
+-
+-    private static boolean daemon;
+-
+-    private static JMXConnectorServer connectorServer;
+-
+-    private static Remote remoteServerStub;
+-
+-    private static RMIJRMPServerImpl rmiServer;
+-
+-    private static class MBServerConnectorFactoryHolder {
+-        private static final MBServerConnectorFactory INSTANCE =
+-            new MBServerConnectorFactory();
+-    }
+-
+-    private static class MBeanServerHolder {
+-        private static final MBeanServer INSTANCE =
+-            MBeanServerFactory.createMBeanServer();
+-    }
+-
+-    private MBServerConnectorFactory() {
+-
+-    }
+-
+-    static int getServerPort(final String url) {
+-        int portStart = url.indexOf("localhost") + 10;
+-        int portEnd;
+-        int port = 0;
+-        if (portStart > 0) {
+-            portEnd = indexNotOfNumber(url, portStart);
+-            if (portEnd > portStart) {
+-                final String portString = url.substring(portStart, portEnd);
+-                port = Integer.parseInt(portString);
+-            }
+-        }
+-        return port;
+-    }
+-
+-    private static int indexNotOfNumber(String str, int index) {
+-        int i = 0;
+-        for (i = index; i < str.length(); i++) {
+-            if (str.charAt(i) < '0' || str.charAt(i) > '9') {
+-                return i;
+-            }
+-        }
+-        return -1;
+-    }
+-
+-    public static MBServerConnectorFactory getInstance() {
+-        return MBServerConnectorFactoryHolder.INSTANCE;
+-    }
+-
+-    public void setMBeanServer(MBeanServer ms) {
+-        server = ms;
+-    }
+-
+-    public void setServiceUrl(String url) {
+-        serviceUrl = url;
+-    }
+-
+-    public void setEnvironment(Map env) {
+-        environment = env;
+-    }
+-
+-    public void setThreaded(boolean fthread) {
+-        threaded = fthread;
+-    }
+-
+-    public void setDaemon(boolean fdaemon) {
+-        daemon = fdaemon;
+-    }
+-
+-
+-    public void createConnector() throws IOException {
+-
+-        if (server == null) {
+-            server = MBeanServerHolder.INSTANCE;
+-        }
+-
+-        // Create the JMX service URL.
+-        final JMXServiceURL url = new JMXServiceURL(serviceUrl);
+-
+-        // if the URL is localhost, start up an Registry
+-        if (serviceUrl.indexOf("localhost") > -1
+-            && url.getProtocol().compareToIgnoreCase("rmi") == 0) {
+-            try {
+-                int port = getRegistryPort(serviceUrl);
+-                new JmxRegistry(port, getBindingName(url));
+-
+-            } catch (Exception ex) {
+-                LOG.log(Level.SEVERE, "CREATE_REGISTRY_FAULT_MSG", new Object[]{ex});
+-            }
+-        }
+-
+-        rmiServer = new RMIJRMPServerImpl(getServerPort(serviceUrl), null, null, environment);
+-
+-        // Create the connector server now.
+-        connectorServer = new RMIConnectorServer(url, environment, rmiServer, server);
+-
+-        if (threaded) {
+-             // Start the connector server asynchronously (in a separate thread).
+-            Thread connectorThread = new Thread() {
+-                public void run() {
+-                    try {
+-                        connectorServer.start();
+-                        remoteServerStub = rmiServer.toStub();
+-                    } catch (IOException ex) {
+-                        LOG.log(Level.SEVERE, "START_CONNECTOR_FAILURE_MSG", new Object[]{ex});
+-                    }
+-                }
+-            };
+-
+-            connectorThread.setName("JMX Connector Thread [" + serviceUrl + "]");
+-            connectorThread.setDaemon(daemon);
+-            connectorThread.start();
+-        } else {
+-             // Start the connector server in the same thread.
+-            connectorServer.start();
+-            remoteServerStub = rmiServer.toStub();
+-        }
+-
+-        if (LOG.isLoggable(Level.INFO)) {
+-            LOG.info("JMX connector server started: " + connectorServer);
+-        }
+-    }
+-
+-    static int getRegistryPort(final String url) {
+-        int serverStart = url.indexOf("/jndi/rmi://");
+-        final String serverPart = url.substring(serverStart + 12);
+-        int portStart = serverPart.indexOf(':') + 1;
+-
+-        int portEnd;
+-        int port = 0;
+-        if (portStart > 0) {
+-            portEnd = indexNotOfNumber(serverPart, portStart);
+-            if (portEnd > portStart) {
+-                final String portString = serverPart.substring(portStart, portEnd);
+-                port = Integer.parseInt(portString);
+-            }
+-        }
+-        return port;
+-    }
+-
+-    protected static String getBindingName(final JMXServiceURL jmxServiceURL) {
+-        final String urlPath = jmxServiceURL.getURLPath();
+-
+-        try {
+-            if (urlPath.startsWith("/jndi/")) {
+-                return new URI(urlPath.substring(6)).getPath()
+-                        .replaceAll("^/+", "").replaceAll("/+$", "");
+-            }
+-        } catch (URISyntaxException e) {
+-            // ignore
+-        }
+-
+-        return "jmxrmi"; // use the default
+-    }
+-
+-    public void destroy() throws IOException {
+-        connectorServer.stop();
+-        if (LOG.isLoggable(Level.INFO)) {
+-            LOG.info("JMX connector server stopped: " + connectorServer);
+-        }
+-    }
+-
+-    /*
+-     * Better to use the internal API than re-invent the wheel.
+-     */
+-    @SuppressWarnings("restriction")
+-    private class JmxRegistry extends sun.rmi.registry.RegistryImpl {
+-        private final String lookupName;
+-
+-        JmxRegistry(final int port, final String lookupName) throws RemoteException {
+-            super(port);
+-            this.lookupName = lookupName;
+-        }
+-
+-        @Override
+-        public Remote lookup(String s) throws RemoteException, NotBoundException {
+-            return lookupName.equals(s) ? remoteServerStub : null;
+-        }
+-
+-        @Override
+-        public void bind(String s, Remote remote) throws RemoteException, AlreadyBoundException, AccessException {
+-        }
+-
+-        @Override
+-        public void unbind(String s) throws RemoteException, NotBoundException, AccessException {
+-        }
+-
+-        @Override
+-        public void rebind(String s, Remote remote) throws RemoteException, AccessException {
+-        }
+-
+-        @Override
+-        public String[] list() throws RemoteException {
+-            return new String[] {lookupName};
+-        }
+-    }
+-}
+diff --git a/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java b/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java
+index 3fa2fe2891c..3739ffaa915 100644
+--- a/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java
++++ b/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java
+@@ -42,7 +42,7 @@
+ public final class ManagementConsole {
+     private static MBeanServerConnection mbsc;
+     private static final String DEFAULT_JMXSERVICE_URL =
+-        "service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi";
++        "service:jmx:rmi:///jndi/rmi://localhost:9913/jmxrmi";
+     private static final Logger LOG = LogUtils.getL7dLogger(ManagementConsole.class);
+ 
+     String jmxServerURL;
+diff --git a/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java b/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
+index 9ebc7ca4fe2..c505835d10a 100644
+--- a/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
++++ b/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
+@@ -158,7 +158,6 @@ public void testInstrumentBusWithBusProperties() {
+             assertNotNull("Instrumentation Manager of cxf1 should not be null", im1);
+ 
+             assertTrue(im1.isEnabled());
+-            assertEquals("service:jmx:rmi:///jndi/rmi://localhost:9914/jmxrmi", im1.getJMXServiceURL());
+ 
+             cxf2 = (Bus)context.getBean("cxf2");
+             InstrumentationManagerImpl im2 =
+@@ -166,7 +165,6 @@ public void testInstrumentBusWithBusProperties() {
+             assertNotNull("Instrumentation Manager of cxf2 should not be null", im2);
+ 
+             assertFalse(im2.isEnabled());
+-            assertEquals("service:jmx:rmi:///jndi/rmi://localhost:9913/jmxrmi", im2.getJMXServiceURL());
+ 
+         } finally {
+             if (cxf1 != null) {
+diff --git a/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java b/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java
+index e9f9308289a..6c458f3085b 100644
+--- a/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java
++++ b/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java
+@@ -64,12 +64,6 @@ public void tearDown() throws Exception {
+         }
+     }
+ 
+-    @Test
+-    public void testRegisterMultipleBuses() throws Exception {
+-        // classic external IM-bean
+-        testRegisterMultipleBuses("managed-spring.xml");
+-    }
+-
+     @Test
+     public void testRegisterMultipleBuses2() throws Exception {
+         // integrated IM configuration in bus
+diff --git a/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java b/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java
+index d516da39c06..20a7b091435 100644
+--- a/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java
++++ b/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java
+@@ -28,7 +28,6 @@
+ import javax.management.ObjectName;
+ 
+ import org.apache.cxf.management.jmx.export.AnnotationTestInstrumentation;
+-import org.apache.cxf.testutil.common.TestUtil;
+ 
+ import org.junit.After;
+ import org.junit.Before;
+@@ -38,17 +37,13 @@
+ import static org.junit.Assert.fail;
+ 
+ public class JMXManagedComponentManagerTest {
+-    private static final String PORT = TestUtil.getPortNumber(JMXManagedComponentManagerTest.class);
+     private static final String NAME_ATTRIBUTE = "Name";
+     private InstrumentationManagerImpl manager;
+ 
+     @Before
+     public void setUp() throws Exception {
+         manager = new InstrumentationManagerImpl();
+-        manager.setDaemon(false);
+-        manager.setThreaded(true);
+         manager.setEnabled(true);
+-        manager.setJMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:" + PORT + "/jmxrmi");
+         manager.init();
+         //Wait for MBeanServer connector to be initialized on separate thread.
+         Thread.sleep(2000);
+@@ -61,10 +56,6 @@ public void tearDown() throws Exception {
+ 
+     @Test
+     public void testRegisterInstrumentation() throws Exception {
+-        //manager.setDaemon(false);
+-        //manager.setThreaded(false);
+-        //manager.setJMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:9913/jmxrmi");
+-        //manager.init();
+ 
+         AnnotationTestInstrumentation im = new AnnotationTestInstrumentation();
+         ObjectName name = new ObjectName("org.apache.cxf:type=foo,name=bar");
+@@ -128,13 +119,7 @@ public void testBusLifecycleListener() throws Exception {
+         MBeanServer server = ManagementFactory.getPlatformMBeanServer();
+ 
+         this.manager = new InstrumentationManagerImpl();
+-        this.manager.setDaemon(false);
+-        // Turn threading off so that we get the exception in this thread
+-        // and the manager is set into a failed state if the connector
+-        // cannot be created.
+-        this.manager.setThreaded(false);
+         this.manager.setEnabled(true);
+-        this.manager.setJMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:" + PORT + "/jmxrmi");
+         this.manager.setServer(server);
+         this.manager.init();
+ 
+@@ -161,13 +146,7 @@ public void testBusLifecycleListener() throws Exception {
+         }
+ 
+         this.manager = new InstrumentationManagerImpl();
+-        this.manager.setDaemon(false);
+-        // Turn threading off so that we get the exception in this thread
+-        // and the manager is set into a failed state if the connector
+-        // cannot be created.
+-        this.manager.setThreaded(false);
+         this.manager.setEnabled(true);
+-        this.manager.setJMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:" + PORT + "/jmxrmi");
+         this.manager.setServer(server);
+         this.manager.init();
+ 
+@@ -183,4 +162,4 @@ private ObjectName registerStandardMBean(String name) throws Exception {
+         this.manager.register(hw, oName);
+         return oName;
+     }
+-}
+\ No newline at end of file
++}
+diff --git a/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorFactoryTest.java b/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorFactoryTest.java
+deleted file mode 100644
+index 468ec0cbfaf..00000000000
+--- a/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorFactoryTest.java
++++ /dev/null
+@@ -1,55 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements. See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership. The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License. You may obtain a copy of the License at
+- *
+- * http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing,
+- * software distributed under the License is distributed on an
+- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+- * KIND, either express or implied. See the License for the
+- * specific language governing permissions and limitations
+- * under the License.
+- */
+-package org.apache.cxf.management.jmx;
+-
+-import javax.management.remote.JMXServiceURL;
+-
+-import org.junit.Assert;
+-import org.junit.Test;
+-
+-
+-public class MBServerConnectorFactoryTest {
+-
+-    @Test
+-    public void testGetServerPort() throws Exception {
+-        Assert.assertEquals(9914, MBServerConnectorFactory.getServerPort(
+-                "service:jmx:rmi:///jndi/rmi://localhost:9914/jmxrmi"));
+-
+-        Assert.assertEquals(10002, MBServerConnectorFactory.getServerPort(
+-                "service:jmx:rmi://localhost:10002/jndi/rmi://localhost:10001/jmxrmi"));
+-    }
+-
+-    @Test
+-    public void testGetRegistryPort() throws Exception {
+-        Assert.assertEquals(9914, MBServerConnectorFactory.getRegistryPort(
+-                "service:jmx:rmi:///jndi/rmi://localhost:9914/jmxrmi"));
+-
+-        Assert.assertEquals(10001, MBServerConnectorFactory.getRegistryPort(
+-                        "service:jmx:rmi://localhost:10002/jndi/rmi://localhost:10001/jmxrmi"));
+-    }
+-
+-    @Test
+-    public void testGetBindingName() throws Exception {
+-        Assert.assertEquals("jmxrmi", MBServerConnectorFactory.getBindingName(
+-                new JMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:9913/jmxrmi")));
+-
+-        Assert.assertEquals("cxf-jmxrmi", MBServerConnectorFactory.getBindingName(
+-                new JMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:9913/cxf-jmxrmi")));
+-    }
+-}
+\ No newline at end of file
+diff --git a/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorTest.java b/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorTest.java
+deleted file mode 100644
+index c01e10fc6f2..00000000000
+--- a/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorTest.java
++++ /dev/null
+@@ -1,57 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements. See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership. The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License. You may obtain a copy of the License at
+- *
+- * http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing,
+- * software distributed under the License is distributed on an
+- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+- * KIND, either express or implied. See the License for the
+- * specific language governing permissions and limitations
+- * under the License.
+- */
+-
+-package org.apache.cxf.management.jmx;
+-
+-
+-
+-import javax.management.MBeanServer;
+-import javax.management.MBeanServerFactory;
+-
+-import org.apache.cxf.testutil.common.TestUtil;
+-
+-import org.junit.Test;
+-
+-import static org.junit.Assert.fail;
+-
+-
+-public class MBServerConnectorTest {
+-    private static final String PORT = TestUtil.getPortNumber(MBServerConnectorTest.class);
+-
+-    @Test
+-    public void testMBServerConnector() {
+-        MBServerConnectorFactory mcf;
+-        MBeanServer mbs;
+-        mbs = MBeanServerFactory.createMBeanServer("test");
+-        mcf = MBServerConnectorFactory.getInstance();
+-        mcf.setMBeanServer(mbs);
+-        mcf.setThreaded(true);
+-        mcf.setDaemon(true);
+-        mcf.setServiceUrl("service:jmx:rmi:///jndi/rmi://localhost:" + PORT + "/jmxrmi");
+-        try {
+-            mcf.createConnector();
+-            Thread.sleep(1000);
+-            mcf.destroy();
+-        } catch (Exception ex) {
+-            ex.printStackTrace();
+-            fail("Some Exception happened to MBServerConnectorTest");
+-        }
+-    }
+-
+-}
+diff --git a/rt/management/src/test/resources/managed-spring.xml b/rt/management/src/test/resources/managed-spring.xml
+index 81808a54a5a..683c1b3ab32 100644
+--- a/rt/management/src/test/resources/managed-spring.xml
++++ b/rt/management/src/test/resources/managed-spring.xml
+@@ -24,11 +24,7 @@
+     xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+     
+     
+-        
+         
+-        
+-        
+-        
+     
+     
+     
+diff --git a/rt/management/src/test/resources/managed-spring3.xml b/rt/management/src/test/resources/managed-spring3.xml
+index 83add997fe0..57009b7cf40 100644
+--- a/rt/management/src/test/resources/managed-spring3.xml
++++ b/rt/management/src/test/resources/managed-spring3.xml
+@@ -26,9 +26,5 @@
+     
+     
+         
+-        
+-        
+-        
+-        
+     
+ 
+\ No newline at end of file
+diff --git a/rt/management/src/test/resources/no-connector-spring.xml b/rt/management/src/test/resources/no-connector-spring.xml
+index f6c197d9a2c..565d92dffe0 100644
+--- a/rt/management/src/test/resources/no-connector-spring.xml
++++ b/rt/management/src/test/resources/no-connector-spring.xml
+@@ -24,6 +24,5 @@
+     
+         
+         
+-        
+     
+ 
+\ No newline at end of file
+diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/managed-manager-bean.xml b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/managed-manager-bean.xml
+index 8e01539b360..7571a48693d 100644
+--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/managed-manager-bean.xml
++++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/managed-manager-bean.xml
+@@ -26,9 +26,6 @@
+     
+         
+         
+-        
+-        
+-        
+     
+     
+         
+diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java
+index dbde562570a..a40c61d394c 100644
+--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java
++++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java
+@@ -98,8 +98,6 @@ public void testManagedSpringBus() throws Exception {
+         assertNotNull(im);
+ 
+         InstrumentationManagerImpl imi = (InstrumentationManagerImpl)im;
+-        assertEquals("service:jmx:rmi:///jndi/rmi://localhost:9913/jmxrmi",
+-                     imi.getJMXServiceURL());
+         assertFalse(imi.isEnabled());
+         assertNull(imi.getMBeanServer());
+ 
+@@ -127,8 +125,6 @@ private void doManagedBusTest(Bus bus, String expect, String reject, int port) t
+         InstrumentationManager im = bus.getExtension(InstrumentationManager.class);
+         assertNotNull(im);
+         InstrumentationManagerImpl imi = (InstrumentationManagerImpl)im;
+-        assertEquals("service:jmx:rmi:///jndi/rmi://localhost:" + port + "/jmxrmi",
+-                     imi.getJMXServiceURL());
+         assertTrue(imi.isEnabled());
+         assertNotNull(imi.getMBeanServer());
+ 
+diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/counter-spring.xml b/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/counter-spring.xml
+index e5cc90f9a17..b3d516022d9 100644
+--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/counter-spring.xml
++++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/counter-spring.xml
+@@ -24,7 +24,6 @@
+     
+         
+         
+-        
+     
+     
+         
+diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/managed-bus.xml b/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/managed-bus.xml
+index 7304a399d39..fed391b4a60 100644
+--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/managed-bus.xml
++++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/managed-bus.xml
+@@ -24,7 +24,6 @@
+     
+         
+         
+-        
+     
+     
+         
+diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/managed-spring.xml b/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/managed-spring.xml
+index 4beb120a457..fed391b4a60 100644
+--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/managed-spring.xml
++++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/managed-spring.xml
+@@ -24,7 +24,6 @@
+     
+         
+         
+-        
+     
+     
+         
+diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/persistent-id.xml b/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/persistent-id.xml
+index 118abfe7978..9219b56bcf3 100644
+--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/persistent-id.xml
++++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/persistent-id.xml
+@@ -24,7 +24,6 @@
+     
+         
+         
+-        
+         
+     
+     
+diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/managed-client.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/managed-client.xml
+index c0cd5b2700a..514038f02b8 100644
+--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/managed-client.xml
++++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/managed-client.xml
+@@ -43,7 +43,5 @@
+     
+         
+         
+-        
+-        
+     
+-
+\ No newline at end of file
++
+diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/managed-server.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/managed-server.xml
+index 823d8f0622e..1ee90cfbae4 100644
+--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/managed-server.xml
++++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/managed-server.xml
+@@ -43,6 +43,5 @@
+     
+         
+         
+-        
+     
+-
+\ No newline at end of file
++
\ No newline at end of file

From 89ce30112325125f812e3d295f9b2131c6689686 Mon Sep 17 00:00:00 2001
From: Ilari Suhonen <52505120+bluelhf@users.noreply.github.com>
Date: Wed, 7 Jul 2021 08:15:55 +0300
Subject: [PATCH 182/266] Fix typo in
 UnifiedDiff#spplyPatchTo(Predicate, List) (#127)

* Fix typo in UnifiedDiff.java

Changes UnifiedDiff#spplyPatchTo to UnifiedDiff#applyPatchTo

* Fix typo in test

Fixes the method invocation in the UnifiedDiff roundtrip test to account for the typo fix in UnifiedDiff
---
 .../main/java/com/github/difflib/unifieddiff/UnifiedDiff.java   | 2 +-
 .../github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java
index bdabc589..f2bb231d 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java
@@ -55,7 +55,7 @@ public String getTail() {
         return tail;
     }
 
-    public List spplyPatchTo(Predicate findFile, List originalLines) throws PatchFailedException {
+    public List applyPatchTo(Predicate findFile, List originalLines) throws PatchFailedException {
         UnifiedDiffFile file = files.stream()
                 .filter(diff -> findFile.test(diff.getFromFile()))
                 .findFirst().orElse(null);
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java
index acc84e9a..d1892771 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java
@@ -150,7 +150,7 @@ private void verify(List origLines, List revLines,
 //                Patch fromUnifiedPatch = unifiedDiff.getFiles().get(0).getPatch();
 //                patchedLines = fromUnifiedPatch.applyTo(origLines);
 //            }
-            patchedLines = unifiedDiff.spplyPatchTo(file -> originalFile.equals(file), origLines);
+            patchedLines = unifiedDiff.applyPatchTo(file -> originalFile.equals(file), origLines);
             assertEquals(revLines.size(), patchedLines.size());
             for (int i = 0; i < revLines.size(); i++) {
                 String l1 = revLines.get(i);

From 8bb4a9a8b1209f461b320a16150fc738107701ae Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Thu, 8 Jul 2021 21:01:10 +0200
Subject: [PATCH 183/266] first implementation of meyers diff with linear space

---
 .../myers/MeyersDiffWithLinearSpace.java      | 195 ++++++++++++++++++
 .../difflib/algorithm/myers/MyersDiff.java    |   3 +-
 .../myers/MeyersDiffWithLinearSpaceTest.java  |  73 +++++++
 .../algorithm/myers/MyersDiffTest.java        |   1 -
 ...ithMeyersDiffWithLinearSpacePatchTest.java | 104 ++++++++++
 .../unifieddiff/UnifiedDiffReaderTest.java    |  20 ++
 .../unifieddiff/problem_diff_issue122.diff    |  26 +++
 .../unifieddiff/problem_diff_issue123.diff    |  94 +++++++++
 .../src/test/resources/logging.properties     |   2 +-
 9 files changed, 514 insertions(+), 4 deletions(-)
 create mode 100644 java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java
 create mode 100644 java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpaceTest.java
 create mode 100644 java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMeyersDiffWithLinearSpacePatchTest.java
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue122.diff
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue123.diff

diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java
new file mode 100644
index 00000000..1dcae646
--- /dev/null
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java
@@ -0,0 +1,195 @@
+/*
+ * Copyright 2021 java-diff-utils.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.difflib.algorithm.myers;
+
+import com.github.difflib.algorithm.Change;
+import com.github.difflib.algorithm.DiffAlgorithmI;
+import com.github.difflib.algorithm.DiffAlgorithmListener;
+import com.github.difflib.patch.DeltaType;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.BiPredicate;
+
+/**
+ *
+ * @author tw
+ */
+public class MeyersDiffWithLinearSpace implements DiffAlgorithmI {
+
+    private final BiPredicate equalizer;
+
+    public MeyersDiffWithLinearSpace() {
+        equalizer = Object::equals;
+    }
+
+    public MeyersDiffWithLinearSpace(final BiPredicate equalizer) {
+        Objects.requireNonNull(equalizer, "equalizer must not be null");
+        this.equalizer = equalizer;
+    }
+
+    @Override
+    public List computeDiff(List source, List target, DiffAlgorithmListener progress) {
+        DiffData data = new DiffData(source, target);
+        //shouldn't it be source.size() - 1?
+        buildScript(data, 0, source.size(), 0, target.size());
+        return data.script;
+    }
+
+    private void buildScript(DiffData data, int start1, int end1, int start2, int end2) {
+        final Snake middle = getMiddleSnake(data, start1, end1, start2, end2);
+        if (middle == null
+                || middle.start == end1 && middle.diag == end1 - end2
+                || middle.end == start1 && middle.diag == start1 - start2) {
+            int i = start1;
+            int j = start2;
+            while (i < end1 || j < end2) {
+                if (i < end1 && j < end2 && equalizer.test(data.source.get(i), data.target.get(j))) {
+                    //script.append(new KeepCommand<>(left.charAt(i)));
+                    ++i;
+                    ++j;
+                } else {
+                    //TODO: compress these commands.
+                    if (end1 - start1 > end2 - start2) {
+                        //script.append(new DeleteCommand<>(left.charAt(i)));
+                        data.script.add(new Change(DeltaType.DELETE, i, i + 1, j, j));
+                        ++i;
+                    } else {
+                        //script.append(new InsertCommand<>(right.charAt(j)));
+                        data.script.add(new Change(DeltaType.INSERT, i, i, j, j + 1));
+                        ++j;
+                    }
+                }
+            }
+        } else {
+            buildScript(data, start1, middle.start, start2, middle.start - middle.diag);
+//            for (int i = middle.getStart(); i < middle.getEnd(); ++i) {
+//                script.append(new KeepCommand<>(left.charAt(i)));
+//            }
+            buildScript(data, middle.end, end1, middle.end - middle.diag, end2);
+        }
+    }
+
+    private Snake getMiddleSnake(DiffData data, int start1, int end1, int start2, int end2) {
+        final int m = end1 - start1;
+        final int n = end2 - start2;
+        if (m == 0 || n == 0) {
+            return null;
+        }
+
+        final int delta = m - n;
+        final int sum = n + m;
+        final int offset = (sum % 2 == 0 ? sum : sum + 1) / 2;
+        data.vDown[1 + offset] = start1;
+        data.vUp[1 + offset] = end1 + 1;
+
+        for (int d = 0; d <= offset; ++d) {
+            // Down
+            for (int k = -d; k <= d; k += 2) {
+                // First step
+
+                final int i = k + offset;
+                if (k == -d || k != d && data.vDown[i - 1] < data.vDown[i + 1]) {
+                    data.vDown[i] = data.vDown[i + 1];
+                } else {
+                    data.vDown[i] = data.vDown[i - 1] + 1;
+                }
+
+                int x = data.vDown[i];
+                int y = x - start1 + start2 - k;
+
+                while (x < end1 && y < end2 && equalizer.test(data.source.get(x), data.target.get(y))) {
+                    data.vDown[i] = ++x;
+                    ++y;
+                }
+                // Second step
+                if (delta % 2 != 0 && delta - d <= k && k <= delta + d) {
+                    if (data.vUp[i - delta] <= data.vDown[i]) {
+                        return buildSnake(data, data.vUp[i - delta], k + start1 - start2, end1, end2);
+                    }
+                }
+            }
+
+            // Up
+            for (int k = delta - d; k <= delta + d; k += 2) {
+                // First step
+                final int i = k + offset - delta;
+                if (k == delta - d
+                        || k != delta + d && data.vUp[i + 1] <= data.vUp[i - 1]) {
+                    data.vUp[i] = data.vUp[i + 1] - 1;
+                } else {
+                    data.vUp[i] = data.vUp[i - 1];
+                }
+
+                int x = data.vUp[i] - 1;
+                int y = x - start1 + start2 - k;
+                while (x >= start1 && y >= start2 && equalizer.test(data.source.get(x), data.target.get(y))) {
+                    data.vUp[i] = x--;
+                    y--;
+                }
+                // Second step
+                if (delta % 2 == 0 && -d <= k && k <= d) {
+                    if (data.vUp[i] <= data.vDown[i + delta]) {
+                        return buildSnake(data, data.vUp[i], k + start1 - start2, end1, end2);
+                    }
+                }
+            }
+        }
+
+        // According to Myers, this cannot happen
+        throw new IllegalStateException("could not find a diff path");
+    }
+
+    private Snake buildSnake(DiffData data, final int start, final int diag, final int end1, final int end2) {
+        int end = start;
+        while (end - diag < end2 && end < end1 && equalizer.test(data.source.get(end), data.target.get(end - diag))) {
+            ++end;
+        }
+        return new Snake(start, end, diag);
+    }
+
+    class DiffData {
+
+        final int size;
+        final int[] vDown;
+        final int[] vUp;
+        final List script;
+        final List source;
+        final List target;
+
+        public DiffData(List source, List target) {
+            this.source = source;
+            this.target = target;
+            size = source.size() + target.size() + 2;
+            vDown = new int[size];
+            vUp = new int[size];
+            script = new ArrayList<>();
+        }
+    }
+
+    class Snake {
+
+        final int start;
+        final int end;
+        final int diag;
+
+        public Snake(final int start, final int end, final int diag) {
+            this.start = start;
+            this.end = end;
+            this.diag = diag;
+        }
+    }
+}
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java
index 631bc38c..f1345577 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java
@@ -30,11 +30,10 @@
  */
 public final class MyersDiff implements DiffAlgorithmI {
 
-    private final BiPredicate DEFAULT_EQUALIZER = Object::equals;
     private final BiPredicate equalizer;
 
     public MyersDiff() {
-        equalizer = DEFAULT_EQUALIZER;
+        equalizer = Object::equals;
     }
 
     public MyersDiff(final BiPredicate equalizer) {
diff --git a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpaceTest.java b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpaceTest.java
new file mode 100644
index 00000000..5462eb40
--- /dev/null
+++ b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpaceTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2021 java-diff-utils.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.difflib.algorithm.myers;
+
+import com.github.difflib.algorithm.DiffAlgorithmListener;
+import com.github.difflib.patch.Patch;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ *
+ * @author tw
+ */
+public class MeyersDiffWithLinearSpaceTest {
+    
+    @Test
+    public void testDiffMyersExample1Forward() {
+        List original = Arrays.asList("A", "B", "C", "A", "B", "B", "A");
+        List revised = Arrays.asList("C", "B", "A", "B", "A", "C");
+        final Patch patch = Patch.generate(original, revised, new MeyersDiffWithLinearSpace().computeDiff(original, revised, null));
+        assertNotNull(patch);
+        System.out.println(patch);
+        assertEquals(4, patch.getDeltas().size());
+        assertEquals("Patch{deltas=[[DeleteDelta, position: 0, lines: [A, B]], [InsertDelta, position: 3, lines: [B]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]}", patch.toString());
+    }
+    
+    @Test
+    public void testDiffMyersExample1ForwardWithListener() {
+        List original = Arrays.asList("A", "B", "C", "A", "B", "B", "A");
+        List revised = Arrays.asList("C", "B", "A", "B", "A", "C");
+        
+        List logdata = new ArrayList<>();
+        final Patch patch = Patch.generate(original, revised, 
+                new MeyersDiffWithLinearSpace().computeDiff(original, revised, new DiffAlgorithmListener() {
+            @Override
+            public void diffStart() {
+                logdata.add("start");
+            }
+
+            @Override
+            public void diffStep(int value, int max) {
+                logdata.add(value + " - " + max);
+            }
+
+            @Override
+            public void diffEnd() {
+                logdata.add("end");
+            }
+        }));
+        assertNotNull(patch);
+        System.out.println(patch);
+        assertEquals(4, patch.getDeltas().size());
+        assertEquals("Patch{deltas=[[DeleteDelta, position: 0, lines: [A, B]], [InsertDelta, position: 3, lines: [B]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]}", patch.toString());
+        System.out.println(logdata);
+        assertEquals(8, logdata.size());
+    }
+}
diff --git a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java
index 5b8348e6..1e233a8c 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java
@@ -69,5 +69,4 @@ public void diffEnd() {
         System.out.println(logdata);
         assertEquals(8, logdata.size());
     }
-
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMeyersDiffWithLinearSpacePatchTest.java b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMeyersDiffWithLinearSpacePatchTest.java
new file mode 100644
index 00000000..2b060011
--- /dev/null
+++ b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMeyersDiffWithLinearSpacePatchTest.java
@@ -0,0 +1,104 @@
+package com.github.difflib.algorithm.myers;
+
+import com.github.difflib.patch.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.github.difflib.DiffUtils;
+
+public class WithMeyersDiffWithLinearSpacePatchTest {
+
+    @Test
+    public void testPatch_Insert() {
+        final List insertTest_from = Arrays.asList("hhh");
+        final List insertTest_to = Arrays.asList("hhh", "jjj", "kkk", "lll");
+
+        final Patch patch = DiffUtils.diff(insertTest_from, insertTest_to, new MeyersDiffWithLinearSpace());
+        try {
+            assertEquals(insertTest_to, DiffUtils.patch(insertTest_from, patch));
+        } catch (PatchFailedException e) {
+            fail(e.getMessage());
+        }
+    }
+
+    @Test
+    public void testPatch_Delete() {
+        final List deleteTest_from = Arrays.asList("ddd", "fff", "ggg", "hhh");
+        final List deleteTest_to = Arrays.asList("ggg");
+
+        final Patch patch = DiffUtils.diff(deleteTest_from, deleteTest_to, new MeyersDiffWithLinearSpace());
+        try {
+            assertEquals(deleteTest_to, DiffUtils.patch(deleteTest_from, patch));
+        } catch (PatchFailedException e) {
+            fail(e.getMessage());
+        }
+    }
+
+    @Test
+    public void testPatch_Change() {
+        final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
+        final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
+
+        final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to, new MeyersDiffWithLinearSpace());
+        try {
+            assertEquals(changeTest_to, DiffUtils.patch(changeTest_from, patch));
+        } catch (PatchFailedException e) {
+            fail(e.getMessage());
+        }
+    }
+
+    @Test
+    public void testPatch_Serializable() throws IOException, ClassNotFoundException {
+        final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
+        final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
+
+        final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to, new MeyersDiffWithLinearSpace());
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        ObjectOutputStream out = new ObjectOutputStream(baos);
+        out.writeObject(patch);
+        out.close();
+        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+        ObjectInputStream in = new ObjectInputStream(bais);
+        Patch result = (Patch) in.readObject();
+        in.close();
+
+        try {
+            assertEquals(changeTest_to, DiffUtils.patch(changeTest_from, result));
+        } catch (PatchFailedException e) {
+            fail(e.getMessage());
+        }
+
+    }
+
+    @Test
+    public void testPatch_Change_withExceptionProcessor() {
+        final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
+        final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
+
+        final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to, new MeyersDiffWithLinearSpace());
+
+        changeTest_from.set(2, "CDC");
+
+        patch.withConflictOutput(Patch.CONFLICT_PRODUCES_MERGE_CONFLICT);
+
+        try {
+            List data = DiffUtils.patch(changeTest_from, patch);
+            assertEquals(9, data.size());
+            
+            assertEquals(Arrays.asList("aaa", "<<<<<< HEAD", "bbb", "CDC", "======", "bbb", "ccc", ">>>>>>> PATCH", "ddd"), data);
+            
+        } catch (PatchFailedException e) {
+            fail(e.getMessage());
+        }
+    }
+}
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
index fdc80fd8..02e7c4d8 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -364,4 +364,24 @@ public void testParseIssue117() throws IOException {
 //            });
 //        });
     }
+    
+    @Test
+    public void testParseIssue122() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue122.diff"));
+
+        assertThat(diff.getFiles().size()).isEqualTo(22);
+
+        assertThat(diff.getFiles()).extracting(f -> f.getFromFile()).contains("rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorFactoryTest.java");
+    }
+    
+    @Test
+    public void testParseIssue123() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue123.diff"));
+
+        assertThat(diff.getFiles().size()).isEqualTo(22);
+
+        assertThat(diff.getFiles()).extracting(f -> f.getFromFile()).contains("rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorFactoryTest.java");
+    }
 }
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue122.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue122.diff
new file mode 100644
index 00000000..a2a382a0
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue122.diff
@@ -0,0 +1,26 @@
+
+diff -r fcd3ed3394f6 -r 135bdcb88b8d coders/wpg.c
+--- a/coders/wpg.c	Sun Nov 05 01:11:09 2017 +0100
++++ b/coders/wpg.c	Sun Nov 05 01:35:28 2017 +0100
+@@ -340,12 +340,15 @@
+ 
+ 
+   if(RetVal==MagickFail)
++  {
+     (void) LogMagickEvent(CoderEvent,GetMagickModule(),"ImportImagePixelArea failed for row: %ld, bpp: %d", y, bpp);
++    return MagickFail;
++  }
+ 
+-  if (!SyncImagePixels(image))
++  if(!SyncImagePixels(image))
+   {
+     (void) LogMagickEvent(CoderEvent,GetMagickModule(),"SyncImagePixels failed for row: %ld, bpp: %d", y, bpp);
+-    RetVal = MagickFail;
++    return MagickFail;
+   }
+           
+ return RetVal;
+
+
+
+
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue123.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue123.diff
new file mode 100644
index 00000000..2228fc8a
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue123.diff
@@ -0,0 +1,94 @@
+Index: src/java/test/org/apache/zookeeper/test/ACLTest.java
+===================================================================
+--- src/java/test/org/apache/zookeeper/test/ACLTest.java	(revision 1510080)
++++ src/java/test/org/apache/zookeeper/test/ACLTest.java	(working copy)
+@@ -28,6 +28,7 @@
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+ import org.apache.zookeeper.CreateMode;
++import org.apache.zookeeper.KeeperException;
+ import org.apache.zookeeper.PortAssignment;
+ import org.apache.zookeeper.WatchedEvent;
+ import org.apache.zookeeper.Watcher;
+@@ -35,8 +36,10 @@
+ import org.apache.zookeeper.ZooKeeper;
+ import org.apache.zookeeper.Watcher.Event.KeeperState;
+ import org.apache.zookeeper.ZooDefs.Ids;
++import org.apache.zookeeper.ZooDefs.Perms;
+ import org.apache.zookeeper.data.ACL;
+ import org.apache.zookeeper.data.Id;
++import org.apache.zookeeper.data.Stat;
+ import org.apache.zookeeper.server.ServerCnxnFactory;
+ import org.apache.zookeeper.server.SyncRequestProcessor;
+ import org.apache.zookeeper.server.ZooKeeperServer;
+@@ -77,6 +80,48 @@
+                             ClientBase.CONNECTION_TIMEOUT));
+         }
+     }
++    
++    /**
++     * Verify that getAcl should fail when there is not
++     * read permission to that node
++     */
++    @Test
++    public void testAclReadPermission() throws Exception {
++        File tmpDir = ClientBase.createTmpDir();
++        ClientBase.setupTestEnv();
++        ZooKeeperServer zks = new ZooKeeperServer(tmpDir, tmpDir, 3000);
++        SyncRequestProcessor.setSnapCount(1000);
++        final int PORT = Integer.parseInt(HOSTPORT.split(":")[1]);
++        ServerCnxnFactory f = ServerCnxnFactory.createFactory(PORT, -1);
++        f.startup(zks);
++        ZooKeeper zk;
++        String path = "/node1";
++        boolean readPermLimitWorks = false;
++        try {
++            LOG.info("starting up the zookeeper server .. waiting");
++            Assert.assertTrue("waiting for server being up",
++                    ClientBase.waitForServerUp(HOSTPORT, CONNECTION_TIMEOUT));
++            zk = new ZooKeeper(HOSTPORT, CONNECTION_TIMEOUT, this);            
++            Id id = new Id("ip", "127.0.0.1");
++            ArrayList acl = new ArrayList(); // Not set read permission
++            acl.add(new ACL(Perms.CREATE, id));
++            acl.add(new ACL(Perms.DELETE, id));
++            acl.add(new ACL(Perms.WRITE, id));
++            acl.add(new ACL(Perms.ADMIN, id));
++            zk.create(path, path.getBytes(), acl, CreateMode.PERSISTENT);            
++            Stat stat = new Stat();
++            zk.getACL(path, stat);  // Should cause exception without read permission
++        } catch (KeeperException.NoAuthException e) {
++            readPermLimitWorks = true;
++        } finally {
++            f.shutdown();
++            Assert.assertTrue("waiting for server down",
++                    ClientBase.waitForServerDown(HOSTPORT, CONNECTION_TIMEOUT));
++        }
++        if (!readPermLimitWorks) {
++            Assert.fail("Should not reach here as ACL has no read permission");
++        }
++    }
+ 
+     /**
+      * Verify that acl optimization of storing just
+Index: src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java
+===================================================================
+--- src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java	(revision 1510080)
++++ src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java	(working copy)
+@@ -324,6 +324,17 @@
+                 GetACLRequest getACLRequest = new GetACLRequest();
+                 ByteBufferInputStream.byteBuffer2Record(request.request,
+                         getACLRequest);
++                DataNode n = zks.getZKDatabase().getNode(getACLRequest.getPath());
++                if (n == null) {
++                    throw new KeeperException.NoNodeException();
++                }
++                Long aclL;
++                synchronized(n) {
++                    aclL = n.acl;
++                }
++                PrepRequestProcessor.checkACL(zks, zks.getZKDatabase().convertLong(aclL),
++                        ZooDefs.Perms.READ,
++                        request.authInfo);
+                 Stat stat = new Stat();
+                 List acl =
+                     zks.getZKDatabase().getACL(getACLRequest.getPath(), stat);
\ No newline at end of file
diff --git a/java-diff-utils/src/test/resources/logging.properties b/java-diff-utils/src/test/resources/logging.properties
index 4c1655b6..bc5042e0 100644
--- a/java-diff-utils/src/test/resources/logging.properties
+++ b/java-diff-utils/src/test/resources/logging.properties
@@ -1,7 +1,7 @@
 handlers=java.util.logging.ConsoleHandler
 
 .level=INFO
-com.github.difflib.unifieddiff.level=FINE
+com.github.difflib.unifieddiff.level=INFO
 
 java.util.logging.ConsoleHandler.level=INFO
 #java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter

From 976505222683234b11505191394f9e046c7cfbdd Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Thu, 8 Jul 2021 22:42:53 +0200
Subject: [PATCH 184/266] first implementation of meyers diff with linear space

---
 .../com/github/difflib/algorithm/Change.java    |  8 ++++++++
 .../myers/MeyersDiffWithLinearSpace.java        | 17 ++++++++++++++---
 .../WithMeyersDiffWithLinearSpacePatchTest.java |  2 +-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/Change.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/Change.java
index 57fbb788..9b6f1dfe 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/Change.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/Change.java
@@ -36,4 +36,12 @@ public Change(DeltaType deltaType, int startOriginal, int endOriginal, int start
         this.startRevised = startRevised;
         this.endRevised = endRevised;
     }
+    
+    public Change withEndOriginal(int endOriginal) {
+        return new Change(deltaType, startOriginal, endOriginal, startRevised, endRevised);
+    }
+    
+    public Change withEndRevised(int endRevised) {
+        return new Change(deltaType, startOriginal, endOriginal, startRevised, endRevised);
+    }
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java
index 1dcae646..98a49dcd 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java
@@ -65,11 +65,22 @@ private void buildScript(DiffData data, int start1, int end1, int start2, int en
                     //TODO: compress these commands.
                     if (end1 - start1 > end2 - start2) {
                         //script.append(new DeleteCommand<>(left.charAt(i)));
-                        data.script.add(new Change(DeltaType.DELETE, i, i + 1, j, j));
+                        if (data.script.isEmpty()
+                                || data.script.get(data.script.size() - 1).endOriginal != i
+                                || data.script.get(data.script.size() - 1).deltaType != DeltaType.DELETE) {
+                            data.script.add(new Change(DeltaType.DELETE, i, i + 1, j, j));
+                        } else {
+                            data.script.set(data.script.size() - 1, data.script.get(data.script.size() - 1).withEndOriginal(i + 1));
+                        }
                         ++i;
                     } else {
-                        //script.append(new InsertCommand<>(right.charAt(j)));
-                        data.script.add(new Change(DeltaType.INSERT, i, i, j, j + 1));
+                        if (data.script.isEmpty()
+                                || data.script.get(data.script.size() - 1).endRevised != j
+                                || data.script.get(data.script.size() - 1).deltaType != DeltaType.INSERT) {
+                            data.script.add(new Change(DeltaType.INSERT, i, i, j, j + 1));
+                        } else {
+                            data.script.set(data.script.size() - 1, data.script.get(data.script.size() - 1).withEndRevised(j + 1));
+                        }
                         ++j;
                     }
                 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMeyersDiffWithLinearSpacePatchTest.java b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMeyersDiffWithLinearSpacePatchTest.java
index 2b060011..d2a02ca4 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMeyersDiffWithLinearSpacePatchTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMeyersDiffWithLinearSpacePatchTest.java
@@ -93,7 +93,7 @@ public void testPatch_Change_withExceptionProcessor() {
 
         try {
             List data = DiffUtils.patch(changeTest_from, patch);
-            assertEquals(9, data.size());
+            assertEquals(11, data.size());
             
             assertEquals(Arrays.asList("aaa", "<<<<<< HEAD", "bbb", "CDC", "======", "bbb", "ccc", ">>>>>>> PATCH", "ddd"), data);
             

From 24c3df1f39d67e3de20b31b4de2214e2000f0e38 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Fri, 9 Jul 2021 18:27:52 +0200
Subject: [PATCH 185/266]

---
 .../myers/MeyersDiffWithLinearSpace.java       |  3 ---
 .../myers/MeyersDiffWithLinearSpaceTest.java   | 18 ++++++++++++++++++
 ...WithMeyersDiffWithLinearSpacePatchTest.java |  2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java
index 98a49dcd..e7678be4 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java
@@ -87,9 +87,6 @@ private void buildScript(DiffData data, int start1, int end1, int start2, int en
             }
         } else {
             buildScript(data, start1, middle.start, start2, middle.start - middle.diag);
-//            for (int i = middle.getStart(); i < middle.getEnd(); ++i) {
-//                script.append(new KeepCommand<>(left.charAt(i)));
-//            }
             buildScript(data, middle.end, end1, middle.end - middle.diag, end2);
         }
     }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpaceTest.java b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpaceTest.java
index 5462eb40..fc397575 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpaceTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpaceTest.java
@@ -15,11 +15,14 @@
  */
 package com.github.difflib.algorithm.myers;
 
+import com.github.difflib.DiffUtils;
 import com.github.difflib.algorithm.DiffAlgorithmListener;
 import com.github.difflib.patch.Patch;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import static java.util.stream.Collectors.toList;
+import java.util.stream.IntStream;
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -70,4 +73,19 @@ public void diffEnd() {
         System.out.println(logdata);
         assertEquals(8, logdata.size());
     }
+    
+    
+    @Test
+    public void testPerformanceProblemsIssue124() {
+         List old = Arrays.asList("abcd");
+         List newl = IntStream.range(0, 90000)
+                    .boxed()
+                    .map(i -> i.toString())
+                    .collect(toList());
+         
+        long start = System.currentTimeMillis();
+        Patch diff = DiffUtils.diff(old, newl, new MeyersDiffWithLinearSpace());
+        long end = System.currentTimeMillis();
+        System.out.println("Finished in " + (end - start) + "ms and resulted " + diff.getDeltas().size() + " deltas");
+    }
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMeyersDiffWithLinearSpacePatchTest.java b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMeyersDiffWithLinearSpacePatchTest.java
index d2a02ca4..82aa04d4 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMeyersDiffWithLinearSpacePatchTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMeyersDiffWithLinearSpacePatchTest.java
@@ -95,7 +95,7 @@ public void testPatch_Change_withExceptionProcessor() {
             List data = DiffUtils.patch(changeTest_from, patch);
             assertEquals(11, data.size());
             
-            assertEquals(Arrays.asList("aaa", "<<<<<< HEAD", "bbb", "CDC", "======", "bbb", "ccc", ">>>>>>> PATCH", "ddd"), data);
+            assertEquals(Arrays.asList("aaa", "bxb", "cxc", "<<<<<< HEAD", "bbb", "CDC", "======", "bbb", "ccc", ">>>>>>> PATCH", "ddd"), data);
             
         } catch (PatchFailedException e) {
             fail(e.getMessage());

From c765616957fc690553e34d4007eca7f038937f10 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 18 Jul 2021 01:20:25 +0200
Subject: [PATCH 186/266] attached logging to new meyer diff algorithm

---
 .../java/com/github/difflib/DiffUtils.java    | 71 +++++++++++--------
 .../algorithm/DiffAlgorithmFactory.java       | 29 ++++++++
 .../myers/{MyersDiff.java => MeyersDiff.java} | 37 +++++++---
 .../myers/MeyersDiffWithLinearSpace.java      | 35 +++++++--
 .../myers/MeyersDiffWithLinearSpaceTest.java  |  8 +--
 .../algorithm/myers/MyersDiffTest.java        |  4 +-
 6 files changed, 133 insertions(+), 51 deletions(-)
 create mode 100644 java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmFactory.java
 rename java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/{MyersDiff.java => MeyersDiff.java} (85%)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
index f85b6178..44a8cff6 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
@@ -15,9 +15,10 @@
  */
 package com.github.difflib;
 
+import com.github.difflib.algorithm.DiffAlgorithmFactory;
 import com.github.difflib.algorithm.DiffAlgorithmI;
 import com.github.difflib.algorithm.DiffAlgorithmListener;
-import com.github.difflib.algorithm.myers.MyersDiff;
+import com.github.difflib.algorithm.myers.MeyersDiff;
 import com.github.difflib.patch.AbstractDelta;
 import com.github.difflib.patch.Patch;
 import com.github.difflib.patch.PatchFailedException;
@@ -34,26 +35,35 @@
 public final class DiffUtils {
 
     /**
-     * Computes the difference between the original and revised list of elements with default diff
-     * algorithm
+     * This factory generates the DEFAULT_DIFF algorithm for all these routines.
+     */
+    static DiffAlgorithmFactory DEFAULT_DIFF = MeyersDiff.factory();
+
+    public static void withDefaultDiffAlgorithmFactory(DiffAlgorithmFactory factory) {
+        DEFAULT_DIFF = factory;
+    }
+
+    /**
+     * Computes the difference between the original and revised list of elements
+     * with default diff algorithm
      *
      * @param  types to be diffed
      * @param original The original text. Must not be {@code null}.
      * @param revised The revised text. Must not be {@code null}.
      * @param progress progress listener
-     * @return The patch describing the difference between the original and revised sequences. Never
-     * {@code null}.
+     * @return The patch describing the difference between the original and
+     * revised sequences. Never {@code null}.
      */
     public static  Patch diff(List original, List revised, DiffAlgorithmListener progress) {
-        return DiffUtils.diff(original, revised, new MyersDiff<>(), progress);
+        return DiffUtils.diff(original, revised, DEFAULT_DIFF.create(), progress);
     }
 
     public static  Patch diff(List original, List revised) {
-        return DiffUtils.diff(original, revised, new MyersDiff<>(), null);
+        return DiffUtils.diff(original, revised, DEFAULT_DIFF.create(), null);
     }
-    
+
     public static  Patch diff(List original, List revised, boolean includeEqualParts) {
-        return DiffUtils.diff(original, revised, new MyersDiff<>(), null, includeEqualParts);
+        return DiffUtils.diff(original, revised, DEFAULT_DIFF.create(), null, includeEqualParts);
     }
 
     /**
@@ -67,45 +77,46 @@ public static Patch diff(String sourceText, String targetText,
     }
 
     /**
-     * Computes the difference between the original and revised list of elements with default diff
-     * algorithm
+     * Computes the difference between the original and revised list of elements
+     * with default diff algorithm
      *
      * @param source The original text. Must not be {@code null}.
      * @param target The revised text. Must not be {@code null}.
      *
-     * @param equalizer the equalizer object to replace the default compare algorithm
-     * (Object.equals). If {@code null} the default equalizer of the default algorithm is used..
-     * @return The patch describing the difference between the original and revised sequences. Never
-     * {@code null}.
+     * @param equalizer the equalizer object to replace the default compare
+     * algorithm (Object.equals). If {@code null} the default equalizer of the
+     * default algorithm is used..
+     * @return The patch describing the difference between the original and
+     * revised sequences. Never {@code null}.
      */
     public static  Patch diff(List source, List target,
             BiPredicate equalizer) {
         if (equalizer != null) {
             return DiffUtils.diff(source, target,
-                    new MyersDiff<>(equalizer));
+                    DEFAULT_DIFF.create(equalizer));
         }
-        return DiffUtils.diff(source, target, new MyersDiff<>());
+        return DiffUtils.diff(source, target, new MeyersDiff<>());
     }
 
     public static  Patch diff(List original, List revised,
             DiffAlgorithmI algorithm, DiffAlgorithmListener progress) {
         return diff(original, revised, algorithm, progress, false);
     }
-    
+
     /**
-     * Computes the difference between the original and revised list of elements with default diff
-     * algorithm
+     * Computes the difference between the original and revised list of elements
+     * with default diff algorithm
      *
      * @param original The original text. Must not be {@code null}.
      * @param revised The revised text. Must not be {@code null}.
      * @param algorithm The diff algorithm. Must not be {@code null}.
      * @param progress The diff algorithm listener.
      * @param includeEqualParts Include equal data parts into the patch.
-     * @return The patch describing the difference between the original and revised sequences. Never
-     * {@code null}.
+     * @return The patch describing the difference between the original and
+     * revised sequences. Never {@code null}.
      */
     public static  Patch diff(List original, List revised,
-            DiffAlgorithmI algorithm, DiffAlgorithmListener progress, 
+            DiffAlgorithmI algorithm, DiffAlgorithmListener progress,
             boolean includeEqualParts) {
         Objects.requireNonNull(original, "original must not be null");
         Objects.requireNonNull(revised, "revised must not be null");
@@ -115,23 +126,23 @@ public static  Patch diff(List original, List revised,
     }
 
     /**
-     * Computes the difference between the original and revised list of elements with default diff
-     * algorithm
+     * Computes the difference between the original and revised list of elements
+     * with default diff algorithm
      *
      * @param original The original text. Must not be {@code null}.
      * @param revised The revised text. Must not be {@code null}.
      * @param algorithm The diff algorithm. Must not be {@code null}.
-     * @return The patch describing the difference between the original and revised sequences. Never
-     * {@code null}.
+     * @return The patch describing the difference between the original and
+     * revised sequences. Never {@code null}.
      */
     public static  Patch diff(List original, List revised, DiffAlgorithmI algorithm) {
         return diff(original, revised, algorithm, null);
     }
 
     /**
-     * Computes the difference between the given texts inline. This one uses the "trick" to make out
-     * of texts lists of characters, like DiffRowGenerator does and merges those changes at the end
-     * together again.
+     * Computes the difference between the given texts inline. This one uses the
+     * "trick" to make out of texts lists of characters, like DiffRowGenerator
+     * does and merges those changes at the end together again.
      *
      * @param original
      * @param revised
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmFactory.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmFactory.java
new file mode 100644
index 00000000..7e5205cd
--- /dev/null
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmFactory.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2021 java-diff-utils.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.difflib.algorithm;
+
+import java.util.function.BiPredicate;
+
+/**
+ * Tool to create new instances of a diff algorithm. This one is only needed at the moment to 
+ * set DiffUtils default diff algorithm.
+ * @author tw
+ */
+public interface DiffAlgorithmFactory {
+     DiffAlgorithmI create();
+    
+     DiffAlgorithmI create(BiPredicate equalizer);
+}
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiff.java
similarity index 85%
rename from java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java
rename to java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiff.java
index f1345577..7daa91d2 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiff.java
@@ -16,6 +16,7 @@
 package com.github.difflib.algorithm.myers;
 
 import com.github.difflib.algorithm.Change;
+import com.github.difflib.algorithm.DiffAlgorithmFactory;
 import com.github.difflib.algorithm.DiffAlgorithmI;
 import com.github.difflib.algorithm.DiffAlgorithmListener;
 import com.github.difflib.patch.DeltaType;
@@ -26,17 +27,17 @@
 import java.util.function.BiPredicate;
 
 /**
- * A clean-room implementation of Eugene Myers greedy differencing algorithm.
+ * A clean-room implementation of Eugene Meyers greedy differencing algorithm.
  */
-public final class MyersDiff implements DiffAlgorithmI {
+public final class MeyersDiff implements DiffAlgorithmI {
 
     private final BiPredicate equalizer;
 
-    public MyersDiff() {
+    public MeyersDiff() {
         equalizer = Object::equals;
     }
 
-    public MyersDiff(final BiPredicate equalizer) {
+    public MeyersDiff(final BiPredicate equalizer) {
         Objects.requireNonNull(equalizer, "equalizer must not be null");
         this.equalizer = equalizer;
     }
@@ -63,8 +64,9 @@ public List computeDiff(final List source, final List target, Diff
     }
 
     /**
-     * Computes the minimum diffpath that expresses de differences between the original and revised
-     * sequences, according to Gene Myers differencing algorithm.
+     * Computes the minimum diffpath that expresses de differences between the
+     * original and revised sequences, according to Gene Myers differencing
+     * algorithm.
      *
      * @param orig The original sequence.
      * @param rev The revised sequence.
@@ -138,8 +140,8 @@ private PathNode buildPath(final List orig, final List rev, DiffAlgorithmL
      * @param orig The original sequence.
      * @param rev The revised sequence.
      * @return A {@link Patch} script corresponding to the path.
-     * @throws DifferentiationFailedException if a {@link Patch} could not be built from the given
-     * path.
+     * @throws DifferentiationFailedException if a {@link Patch} could not be
+     * built from the given path.
      */
     private List buildRevision(PathNode actualPath, List orig, List rev) {
         Objects.requireNonNull(actualPath, "path is null");
@@ -176,4 +178,23 @@ private List buildRevision(PathNode actualPath, List orig, List re
         }
         return changes;
     }
+
+    /**
+     * Factory to create instances of this specific diff algorithm.
+     */
+    public static DiffAlgorithmFactory factory() {
+        return new DiffAlgorithmFactory() {
+            @Override
+            public  DiffAlgorithmI 
+            create() {
+                return new MeyersDiff();
+            }
+
+            @Override
+            public  DiffAlgorithmI 
+            create(BiPredicate < T, T > equalizer) {
+                return new MeyersDiff(equalizer);
+            }
+        };
+    }
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java
index e7678be4..ebcc02f1 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java
@@ -23,6 +23,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.function.BiPredicate;
+import java.util.function.Consumer;
 
 /**
  *
@@ -43,13 +44,33 @@ public MeyersDiffWithLinearSpace(final BiPredicate equalizer) {
 
     @Override
     public List computeDiff(List source, List target, DiffAlgorithmListener progress) {
+        Objects.requireNonNull(source, "source list must not be null");
+        Objects.requireNonNull(target, "target list must not be null");
+
+        if (progress != null) {
+            progress.diffStart();
+        }
+
         DiffData data = new DiffData(source, target);
-        //shouldn't it be source.size() - 1?
-        buildScript(data, 0, source.size(), 0, target.size());
+
+        int maxIdx = source.size() + target.size();
+
+        buildScript(data, 0, source.size(), 0, target.size(), idx -> {
+            if (progress != null) {
+                progress.diffStep(idx, maxIdx);
+            }
+        });
+
+        if (progress != null) {
+            progress.diffEnd();
+        }
         return data.script;
     }
 
-    private void buildScript(DiffData data, int start1, int end1, int start2, int end2) {
+    private void buildScript(DiffData data, int start1, int end1, int start2, int end2, Consumer progress) {
+        if (progress != null) {
+            progress.accept(start1);
+        }
         final Snake middle = getMiddleSnake(data, start1, end1, start2, end2);
         if (middle == null
                 || middle.start == end1 && middle.diag == end1 - end2
@@ -86,8 +107,8 @@ private void buildScript(DiffData data, int start1, int end1, int start2, int en
                 }
             }
         } else {
-            buildScript(data, start1, middle.start, start2, middle.start - middle.diag);
-            buildScript(data, middle.end, end1, middle.end - middle.diag, end2);
+            buildScript(data, start1, middle.start, start2, middle.start - middle.diag, progress);
+            buildScript(data, middle.end, end1, middle.end - middle.diag, end2, progress);
         }
     }
 
@@ -169,7 +190,7 @@ private Snake buildSnake(DiffData data, final int start, final int diag, final i
         return new Snake(start, end, diag);
     }
 
-    class DiffData {
+    private class DiffData {
 
         final int size;
         final int[] vDown;
@@ -188,7 +209,7 @@ public DiffData(List source, List target) {
         }
     }
 
-    class Snake {
+    private class Snake {
 
         final int start;
         final int end;
diff --git a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpaceTest.java b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpaceTest.java
index fc397575..3608140d 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpaceTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpaceTest.java
@@ -39,8 +39,8 @@ public void testDiffMyersExample1Forward() {
         final Patch patch = Patch.generate(original, revised, new MeyersDiffWithLinearSpace().computeDiff(original, revised, null));
         assertNotNull(patch);
         System.out.println(patch);
-        assertEquals(4, patch.getDeltas().size());
-        assertEquals("Patch{deltas=[[DeleteDelta, position: 0, lines: [A, B]], [InsertDelta, position: 3, lines: [B]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]}", patch.toString());
+        assertEquals(5, patch.getDeltas().size());
+        assertEquals("Patch{deltas=[[InsertDelta, position: 0, lines: [C]], [DeleteDelta, position: 0, lines: [A]], [DeleteDelta, position: 2, lines: [C]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]}", patch.toString());
     }
     
     @Test
@@ -68,8 +68,8 @@ public void diffEnd() {
         }));
         assertNotNull(patch);
         System.out.println(patch);
-        assertEquals(4, patch.getDeltas().size());
-        assertEquals("Patch{deltas=[[DeleteDelta, position: 0, lines: [A, B]], [InsertDelta, position: 3, lines: [B]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]}", patch.toString());
+        assertEquals(5, patch.getDeltas().size());
+        assertEquals("Patch{deltas=[[InsertDelta, position: 0, lines: [C]], [DeleteDelta, position: 0, lines: [A]], [DeleteDelta, position: 2, lines: [C]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]}", patch.toString());
         System.out.println(logdata);
         assertEquals(8, logdata.size());
     }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java
index 1e233a8c..10db0e43 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java
@@ -34,7 +34,7 @@ public class MyersDiffTest {
     public void testDiffMyersExample1Forward() {
         List original = Arrays.asList("A", "B", "C", "A", "B", "B", "A");
         List revised = Arrays.asList("C", "B", "A", "B", "A", "C");
-        final Patch patch = Patch.generate(original, revised, new MyersDiff().computeDiff(original, revised, null));
+        final Patch patch = Patch.generate(original, revised, new MeyersDiff().computeDiff(original, revised, null));
         assertNotNull(patch);
         assertEquals(4, patch.getDeltas().size());
         assertEquals("Patch{deltas=[[DeleteDelta, position: 0, lines: [A, B]], [InsertDelta, position: 3, lines: [B]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]}", patch.toString());
@@ -47,7 +47,7 @@ public void testDiffMyersExample1ForwardWithListener() {
         
         List logdata = new ArrayList<>();
         final Patch patch = Patch.generate(original, revised, 
-                new MyersDiff().computeDiff(original, revised, new DiffAlgorithmListener() {
+                new MeyersDiff().computeDiff(original, revised, new DiffAlgorithmListener() {
             @Override
             public void diffStart() {
                 logdata.add("start");

From e413d79ecd0af293fdc0f2474b8b097dc360d78d Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 18 Jul 2021 01:30:44 +0200
Subject: [PATCH 187/266] attached logging to new meyer diff algorithm

---
 .../difflib/algorithm/myers/MeyersDiffWithLinearSpace.java      | 2 +-
 .../difflib/algorithm/myers/MeyersDiffWithLinearSpaceTest.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java
index ebcc02f1..3fec0fd8 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java
@@ -69,7 +69,7 @@ public List computeDiff(List source, List target, DiffAlgorithmLis
 
     private void buildScript(DiffData data, int start1, int end1, int start2, int end2, Consumer progress) {
         if (progress != null) {
-            progress.accept(start1);
+            progress.accept((end1 - start1) / 2 + (end2 - start2) / 2);
         }
         final Snake middle = getMiddleSnake(data, start1, end1, start2, end2);
         if (middle == null
diff --git a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpaceTest.java b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpaceTest.java
index 3608140d..7a10f1f1 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpaceTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpaceTest.java
@@ -71,7 +71,7 @@ public void diffEnd() {
         assertEquals(5, patch.getDeltas().size());
         assertEquals("Patch{deltas=[[InsertDelta, position: 0, lines: [C]], [DeleteDelta, position: 0, lines: [A]], [DeleteDelta, position: 2, lines: [C]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]}", patch.toString());
         System.out.println(logdata);
-        assertEquals(8, logdata.size());
+        assertEquals(11, logdata.size());
     }
     
     

From 7203d4890f088771161d14e7597682e872e0765a Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Mon, 19 Jul 2021 00:15:39 +0200
Subject: [PATCH 188/266] mmoved header to inner processing to allow a header
 for each diff block

---
 .../unifieddiff/UnifiedDiffReader.java        | 72 +++++++++++++------
 .../unifieddiff/UnifiedDiffReaderTest.java    |  8 +--
 2 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
index da75e6ff..181b41ae 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
@@ -72,26 +72,45 @@ public final class UnifiedDiffReader {
     // [/^---\s/, from_file], [/^\+\+\+\s/, to_file], [/^@@\s+\-(\d+),?(\d+)?\s+\+(\d+),?(\d+)?\s@@/, chunk], 
     // [/^-/, del], [/^\+/, add], [/^\\ No newline at end of file$/, eof]];
     private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
-        String headerTxt = "";
-        LOG.log(Level.FINE, "header parsing");
-        String line = null;
-        while (READER.ready()) {
-            line = READER.readLine();
-            LOG.log(Level.FINE, "parsing line {0}", line);
-            if (DIFF_COMMAND.validLine(line) || INDEX.validLine(line)
-                    || FROM_FILE.validLine(line) || TO_FILE.validLine(line)
-                    || NEW_FILE_MODE.validLine(line)) {
-                break;
-            } else {
-                headerTxt += line + "\n";
-            }
-        }
-        if (!"".equals(headerTxt)) {
-            data.setHeader(headerTxt);
-        }
-
+//        String headerTxt = "";
+//        LOG.log(Level.FINE, "header parsing");
+//        String line = null;
+//        while (READER.ready()) {
+//            line = READER.readLine();
+//            LOG.log(Level.FINE, "parsing line {0}", line);
+//            if (DIFF_COMMAND.validLine(line) || INDEX.validLine(line)
+//                    || FROM_FILE.validLine(line) || TO_FILE.validLine(line)
+//                    || NEW_FILE_MODE.validLine(line)) {
+//                break;
+//            } else {
+//                headerTxt += line + "\n";
+//            }
+//        }
+//        if (!"".equals(headerTxt)) {
+//            data.setHeader(headerTxt);
+//        }
+
+        String line = READER.readLine();
         while (line != null) {
-            if (!CHUNK.validLine(line)) {
+            String headerTxt = "";
+            LOG.log(Level.FINE, "header parsing");
+            while (line != null) {
+                LOG.log(Level.FINE, "parsing line {0}", line);
+                if (validLine(line, DIFF_COMMAND, SIMILARITY_INDEX, INDEX,
+                            FROM_FILE, TO_FILE,
+                            RENAME_FROM, RENAME_TO,
+                            NEW_FILE_MODE, DELETED_FILE_MODE, 
+                            CHUNK)) {
+                    break;
+                } else {
+                    headerTxt += line + "\n";
+                }
+                line = READER.readLine();
+            }
+            if (!"".equals(headerTxt)) {
+                data.setHeader(headerTxt);
+            }
+            if (line != null && !CHUNK.validLine(line)) {
                 initFileIfNecessary();
                 while (line != null && !CHUNK.validLine(line)) {
                     if (!processLine(line, DIFF_COMMAND, SIMILARITY_INDEX, INDEX,
@@ -107,7 +126,7 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
                 processLine(line, CHUNK);
                 while ((line = READER.readLine()) != null) {
                     line = checkForNoNewLineAtTheEndOfTheFile(line);
-                    
+
                     if (!processLine(line, LINE_NORMAL, LINE_ADD, LINE_DEL)) {
                         throw new UnifiedDiffParserException("expected data line not found");
                     }
@@ -186,6 +205,19 @@ private boolean processLine(String line, UnifiedDiffLine... rules) throws Unifie
         return false;
         //throw new UnifiedDiffParserException("parsing error at line " + line);
     }
+    
+    private boolean validLine(String line, UnifiedDiffLine ... rules) {
+        if (line == null) {
+            return false;
+        }
+        for (UnifiedDiffLine rule : rules) {
+            if (rule.validLine(line)) {
+                LOG.fine("  >>> accepted rule " + rule.toString());
+                return true;
+            }
+        }
+        return false;
+    }
 
     private void initFileIfNecessary() {
         if (!originalTxt.isEmpty() || !revisedTxt.isEmpty()) {
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
index 02e7c4d8..912b72fd 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -370,9 +370,9 @@ public void testParseIssue122() throws IOException {
         UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
                 UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue122.diff"));
 
-        assertThat(diff.getFiles().size()).isEqualTo(22);
+        assertThat(diff.getFiles().size()).isEqualTo(1);
 
-        assertThat(diff.getFiles()).extracting(f -> f.getFromFile()).contains("rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorFactoryTest.java");
+        assertThat(diff.getFiles()).extracting(f -> f.getFromFile()).contains("coders/wpg.c");
     }
     
     @Test
@@ -380,8 +380,8 @@ public void testParseIssue123() throws IOException {
         UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
                 UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue123.diff"));
 
-        assertThat(diff.getFiles().size()).isEqualTo(22);
+        assertThat(diff.getFiles().size()).isEqualTo(2);
 
-        assertThat(diff.getFiles()).extracting(f -> f.getFromFile()).contains("rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorFactoryTest.java");
+        assertThat(diff.getFiles()).extracting(f -> f.getFromFile()).contains("src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java");
     }
 }

From 2294c5be7b70b79df932e6a046825e4dff609dd6 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 15 Aug 2021 00:51:24 +0200
Subject: [PATCH 189/266] implemented multi algorithm patch test

---
 .../myers/MeyersDiffWithLinearSpace.java      | 20 ++++++
 ...va => PatchWithAllDiffAlgorithmsTest.java} | 63 +++++++++++++-----
 .../difflib/patch/PatchWithMeyerDiffTest.java | 51 ++++++++++++++
 ...PatchWithMeyerDiffWithLinearSpaceTest.java | 66 +++++++++++++++++++
 4 files changed, 185 insertions(+), 15 deletions(-)
 rename java-diff-utils/src/test/java/com/github/difflib/patch/{PatchTest.java => PatchWithAllDiffAlgorithmsTest.java} (64%)
 create mode 100644 java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMeyerDiffTest.java
 create mode 100644 java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMeyerDiffWithLinearSpaceTest.java

diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java
index 3fec0fd8..bb3577f8 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java
@@ -16,6 +16,7 @@
 package com.github.difflib.algorithm.myers;
 
 import com.github.difflib.algorithm.Change;
+import com.github.difflib.algorithm.DiffAlgorithmFactory;
 import com.github.difflib.algorithm.DiffAlgorithmI;
 import com.github.difflib.algorithm.DiffAlgorithmListener;
 import com.github.difflib.patch.DeltaType;
@@ -221,4 +222,23 @@ public Snake(final int start, final int end, final int diag) {
             this.diag = diag;
         }
     }
+    
+    /**
+     * Factory to create instances of this specific diff algorithm.
+     */
+    public static DiffAlgorithmFactory factory() {
+        return new DiffAlgorithmFactory() {
+            @Override
+            public  DiffAlgorithmI 
+            create() {
+                return new MeyersDiffWithLinearSpace();
+            }
+
+            @Override
+            public  DiffAlgorithmI 
+            create(BiPredicate < T, T > equalizer) {
+                return new MeyersDiffWithLinearSpace(equalizer);
+            }
+        };
+    }
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithAllDiffAlgorithmsTest.java
similarity index 64%
rename from java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java
rename to java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithAllDiffAlgorithmsTest.java
index 91d514a3..117055a1 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithAllDiffAlgorithmsTest.java
@@ -11,14 +11,35 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.jupiter.api.Test;
 
 import com.github.difflib.DiffUtils;
+import com.github.difflib.algorithm.DiffAlgorithmFactory;
+import com.github.difflib.algorithm.myers.MeyersDiff;
+import com.github.difflib.algorithm.myers.MeyersDiffWithLinearSpace;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class PatchWithAllDiffAlgorithmsTest {
+
+    private static Stream provideAlgorithms() {
+        return Stream.of(
+                Arguments.of(MeyersDiff.factory()), 
+                Arguments.of(MeyersDiffWithLinearSpace.factory()));
+    }
+    
+    @AfterAll
+    public static void afterAll() {
+        DiffUtils.withDefaultDiffAlgorithmFactory(MeyersDiff.factory());
+    }
 
-public class PatchTest {
-
-    @Test
-    public void testPatch_Insert() {
+    @ParameterizedTest
+    @MethodSource("provideAlgorithms")
+    public void testPatch_Insert(DiffAlgorithmFactory factory) {
+        DiffUtils.withDefaultDiffAlgorithmFactory(factory);
+        
         final List insertTest_from = Arrays.asList("hhh");
         final List insertTest_to = Arrays.asList("hhh", "jjj", "kkk", "lll");
 
@@ -30,8 +51,11 @@ public void testPatch_Insert() {
         }
     }
 
-    @Test
-    public void testPatch_Delete() {
+    @ParameterizedTest
+    @MethodSource("provideAlgorithms")
+    public void testPatch_Delete(DiffAlgorithmFactory factory) {
+        DiffUtils.withDefaultDiffAlgorithmFactory(factory);
+        
         final List deleteTest_from = Arrays.asList("ddd", "fff", "ggg", "hhh");
         final List deleteTest_to = Arrays.asList("ggg");
 
@@ -43,8 +67,11 @@ public void testPatch_Delete() {
         }
     }
 
-    @Test
-    public void testPatch_Change() {
+    @ParameterizedTest
+    @MethodSource("provideAlgorithms")
+    public void testPatch_Change(DiffAlgorithmFactory factory) {
+        DiffUtils.withDefaultDiffAlgorithmFactory(factory);
+        
         final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
         final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
 
@@ -56,8 +83,11 @@ public void testPatch_Change() {
         }
     }
 
-    @Test
-    public void testPatch_Serializable() throws IOException, ClassNotFoundException {
+    @ParameterizedTest
+    @MethodSource("provideAlgorithms")
+    public void testPatch_Serializable(DiffAlgorithmFactory factory) throws IOException, ClassNotFoundException {
+        DiffUtils.withDefaultDiffAlgorithmFactory(factory);
+        
         final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
         final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
 
@@ -79,8 +109,11 @@ public void testPatch_Serializable() throws IOException, ClassNotFoundException
 
     }
 
-    @Test
-    public void testPatch_Change_withExceptionProcessor() {
+    @ParameterizedTest
+    @MethodSource("provideAlgorithms")
+    public void testPatch_Change_withExceptionProcessor(DiffAlgorithmFactory factory) {
+        DiffUtils.withDefaultDiffAlgorithmFactory(factory);
+        
         final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
         final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
 
@@ -93,9 +126,9 @@ public void testPatch_Change_withExceptionProcessor() {
         try {
             List data = DiffUtils.patch(changeTest_from, patch);
             assertEquals(9, data.size());
-            
+
             assertEquals(Arrays.asList("aaa", "<<<<<< HEAD", "bbb", "CDC", "======", "bbb", "ccc", ">>>>>>> PATCH", "ddd"), data);
-            
+
         } catch (PatchFailedException e) {
             fail(e.getMessage());
         }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMeyerDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMeyerDiffTest.java
new file mode 100644
index 00000000..d7bf2798
--- /dev/null
+++ b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMeyerDiffTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2021 java-diff-utils.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.difflib.patch;
+
+import com.github.difflib.DiffUtils;
+import java.util.Arrays;
+import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
+
+/**
+ *
+ * @author tw
+ */
+public class PatchWithMeyerDiffTest {
+    @Test
+    public void testPatch_Change_withExceptionProcessor() {
+        final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
+        final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
+
+        final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to);
+
+        changeTest_from.set(2, "CDC");
+
+        patch.withConflictOutput(Patch.CONFLICT_PRODUCES_MERGE_CONFLICT);
+
+        try {
+            List data = DiffUtils.patch(changeTest_from, patch);
+            assertEquals(9, data.size());
+
+            assertEquals(Arrays.asList("aaa", "<<<<<< HEAD", "bbb", "CDC", "======", "bbb", "ccc", ">>>>>>> PATCH", "ddd"), data);
+
+        } catch (PatchFailedException e) {
+            fail(e.getMessage());
+        }
+    }
+}
diff --git a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMeyerDiffWithLinearSpaceTest.java b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMeyerDiffWithLinearSpaceTest.java
new file mode 100644
index 00000000..8a62992e
--- /dev/null
+++ b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMeyerDiffWithLinearSpaceTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2021 java-diff-utils.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.difflib.patch;
+
+import com.github.difflib.DiffUtils;
+import com.github.difflib.algorithm.myers.MeyersDiff;
+import com.github.difflib.algorithm.myers.MeyersDiffWithLinearSpace;
+import java.util.Arrays;
+import java.util.List;
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+/**
+ *
+ * @author tw
+ */
+public class PatchWithMeyerDiffWithLinearSpaceTest {
+
+    @BeforeAll
+    public static void setupClass() {
+        DiffUtils.withDefaultDiffAlgorithmFactory(MeyersDiffWithLinearSpace.factory());
+    }
+
+    @AfterAll
+    public static void resetClass() {
+        DiffUtils.withDefaultDiffAlgorithmFactory(MeyersDiff.factory());
+    }
+
+    @Test
+    public void testPatch_Change_withExceptionProcessor() {
+        final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
+        final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
+
+        final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to);
+
+        changeTest_from.set(2, "CDC");
+
+        patch.withConflictOutput(Patch.CONFLICT_PRODUCES_MERGE_CONFLICT);
+
+        try {
+            List data = DiffUtils.patch(changeTest_from, patch);
+            assertEquals(11, data.size());
+
+            assertEquals(Arrays.asList("aaa", "bxb", "cxc", "<<<<<< HEAD", "bbb", "CDC", "======", "bbb", "ccc", ">>>>>>> PATCH", "ddd"), data);
+
+        } catch (PatchFailedException e) {
+            fail(e.getMessage());
+        }
+    }
+}

From 894b8ba300e85d4a502f4f48a7029bc48bed032c Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 15 Aug 2021 00:52:08 +0200
Subject: [PATCH 190/266] implemented multi algorithm patch test

---
 .../patch/PatchWithAllDiffAlgorithmsTest.java | 27 +------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithAllDiffAlgorithmsTest.java b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithAllDiffAlgorithmsTest.java
index 117055a1..82e72294 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithAllDiffAlgorithmsTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithAllDiffAlgorithmsTest.java
@@ -107,30 +107,5 @@ public void testPatch_Serializable(DiffAlgorithmFactory factory) throws IOExcept
             fail(e.getMessage());
         }
 
-    }
-
-    @ParameterizedTest
-    @MethodSource("provideAlgorithms")
-    public void testPatch_Change_withExceptionProcessor(DiffAlgorithmFactory factory) {
-        DiffUtils.withDefaultDiffAlgorithmFactory(factory);
-        
-        final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
-        final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
-
-        final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to);
-
-        changeTest_from.set(2, "CDC");
-
-        patch.withConflictOutput(Patch.CONFLICT_PRODUCES_MERGE_CONFLICT);
-
-        try {
-            List data = DiffUtils.patch(changeTest_from, patch);
-            assertEquals(9, data.size());
-
-            assertEquals(Arrays.asList("aaa", "<<<<<< HEAD", "bbb", "CDC", "======", "bbb", "ccc", ">>>>>>> PATCH", "ddd"), data);
-
-        } catch (PatchFailedException e) {
-            fail(e.getMessage());
-        }
-    }
+    }    
 }

From 7dea4e229843c5ffbcf7c5a93028f584ca5e7a59 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Wed, 8 Sep 2021 12:16:50 +0200
Subject: [PATCH 191/266]

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 93899e85..b4d066d6 100644
--- a/README.md
+++ b/README.md
@@ -49,12 +49,13 @@ This is a test ~senctence~**for diffutils**.
 * producing human-readable differences
 * inline difference construction
 * Algorithms:
-  * Myer
+  * Meyers Standard Algorithm
+  * Meyers with linear space improvement
   * HistogramDiff using JGit Library
 
 ### Algorithms
 
-* Myer's diff
+* Meyer's diff
 * HistogramDiff
 
 But it can easily replaced by any other which is better for handing your texts. I have plan to add implementation of some in future.

From 4c457b39dc011a47b32ab64fee671c747759f517 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Wed, 8 Sep 2021 12:19:53 +0200
Subject: [PATCH 192/266]

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7662f7e7..8f5dab30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,12 @@ This project uses a custom versioning scheme (and not [Semantic Versioning](http
 
 ### Changed
 
+* bugfixing new UnifiedDiff reader
+  * header for each file
+  * skip empty lines
+* introduction of Meyers Diff Algorithm with Linear Space improvment (until matured this will not be the default diff algorithm)
+* introduction of DiffAlgorithmFactory to set the default diff algorithm DiffUtils use (`DiffUtils.withDefaultDiffAlgorithmFactory(MeyersDiffWithLinearSpace.factory());`)
+
 ## [4.10]
 
 ### Changed

From c85296b63de0b8c2cf5ced8b20bc9eb1c19b4d96 Mon Sep 17 00:00:00 2001
From: Jerry James 
Date: Wed, 8 Sep 2021 04:21:50 -0600
Subject: [PATCH 193/266] Javadoc warning fixes (#109)

Co-authored-by: Tobias 
---
 .../main/java/com/github/difflib/UnifiedDiffUtils.java   | 9 +++------
 .../java/com/github/difflib/text/DiffRowGenerator.java   | 4 ++--
 .../github/difflib/unifieddiff/UnifiedDiffWriter.java    | 6 +++---
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
index 2098aacf..06a61073 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
@@ -129,7 +129,7 @@ private static void processLinesInPrevChunk(List rawChunk, Patch rawChunk, Patch generateUnifiedDiff(String originalFileName,
             String revisedFileName, List originalLines, Patch patch,
@@ -200,13 +199,12 @@ public static List generateUnifiedDiff(String originalFileName,
 
     /**
      * processDeltas takes a list of Deltas and outputs them together in a single block of
-     * Unified-Diff-format text.
+     * Unified-Diff-format text.  Author: Bill James (tankerbay@gmail.com).
      *
      * @param origLines - the lines of the original file
      * @param deltas - the Deltas to be output as a single block
      * @param contextSize - the number of lines of context to place around block
      * @return
-     * @author Bill James (tankerbay@gmail.com)
      */
     private static List processDeltas(List origLines,
             List> deltas, int contextSize, boolean newFile) {
@@ -297,11 +295,10 @@ private static List processDeltas(List origLines,
     }
 
     /**
-     * getDeltaText returns the lines to be added to the Unified Diff text from the Delta parameter
+     * getDeltaText returns the lines to be added to the Unified Diff text from the Delta parameter.  Author: Bill James (tankerbay@gmail.com).
      *
      * @param delta - the Delta to output
      * @return list of String lines of code.
-     * @author Bill James (tankerbay@gmail.com)
      */
     private static List getDeltaText(AbstractDelta delta) {
         List buffer = new ArrayList<>();
diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
index 6cd13b38..5370b16d 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
@@ -554,8 +554,8 @@ public Builder processDiffs(Function processDiffs) {
          * Set the column width of generated lines of original and revised
          * texts.
          *
-         * @param width the width to set. Making it < 0 doesn't make any sense.
-         * Default 80. @return builder with config of column width
+         * @param width the width to set. Making it < 0 doesn't make any sense. Default 80.
+         * @return builder with config of column width
          */
         public Builder columnWidth(int width) {
             if (width >= 0) {
diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java
index 8d6c58bf..7cac8a2c 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java
@@ -189,10 +189,10 @@ private static void processDeltas(Consumer writer,
     }
 
     /**
-     * getDeltaText returns the lines to be added to the Unified Diff text from the Delta parameter
+     * getDeltaText returns the lines to be added to the Unified Diff text from the Delta parameter. 
      *
-     * @param delta - the Delta to output
-     * @return list of String lines of code.
+     * @param writer consumer for the list of String lines of code
+     * @param delta the Delta to output
      */
     private static void getDeltaText(Consumer writer, AbstractDelta delta) {
         for (String line : delta.getSource().getLines()) {

From ab1e38c57b39ec6f9bd48bcbf7f696321616218a Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Wed, 8 Sep 2021 12:28:13 +0200
Subject: [PATCH 194/266] [maven-release-plugin] prepare release
 java-diff-utils-parent-4.11

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index ae872975..0f2df3bb 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.11-SNAPSHOT
+        4.11
     
     java-diff-utils-jgit
     java-diff-utils-jgit
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index 734f3d5f..2bb6b30c 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -7,7 +7,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.11-SNAPSHOT
+        4.11
     
     
         UTF-8
diff --git a/pom.xml b/pom.xml
index 50dd9510..75ebd8b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.11-SNAPSHOT
+    4.11
     java-diff-utils-parent
     pom
     
@@ -29,7 +29,7 @@
         scm:git:https://github.com/java-diff-utils/java-diff-utils.git
         scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
         https://github.com/java-diff-utils/java-diff-utils.git
-        HEAD
+        java-diff-utils-parent-4.11
     
     
         GitHub Issues

From 8ae1f6cbbf154fd50943d500f0f67b24984b2bc2 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Wed, 8 Sep 2021 12:28:14 +0200
Subject: [PATCH 195/266] [maven-release-plugin] prepare for next development
 iteration

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index 0f2df3bb..eadc1cfb 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.11
+        4.12-SNAPSHOT
     
     java-diff-utils-jgit
     java-diff-utils-jgit
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index 2bb6b30c..e9e78f76 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -7,7 +7,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.11
+        4.12-SNAPSHOT
     
     
         UTF-8
diff --git a/pom.xml b/pom.xml
index 75ebd8b0..3703674c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.11
+    4.12-SNAPSHOT
     java-diff-utils-parent
     pom
     
@@ -29,7 +29,7 @@
         scm:git:https://github.com/java-diff-utils/java-diff-utils.git
         scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
         https://github.com/java-diff-utils/java-diff-utils.git
-        java-diff-utils-parent-4.11
+        HEAD
     
     
         GitHub Issues

From 3663cb5d87ee5d79749308564170d9cf950e31d2 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Wed, 8 Sep 2021 12:37:20 +0200
Subject: [PATCH 196/266] changed gpg plugin version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3703674c..40cdd391 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,7 +199,7 @@
                     
                         org.apache.maven.plugins
                         maven-gpg-plugin
-                        1.4
+                        1.6
                         
                             
                                 sign-artifacts

From 0fd38db8ae3b62854e96d8623840792166b5181d Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Thu, 21 Oct 2021 23:17:04 +0200
Subject: [PATCH 197/266] fixes #129 - added the possibility to skip delta
 decompression

---
 .../github/difflib/text/DiffRowGenerator.java | 29 ++++++-
 .../difflib/text/DiffRowGeneratorTest.java    | 82 ++++++++++++++++++-
 2 files changed, 106 insertions(+), 5 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
index 5370b16d..9dbf052b 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
@@ -173,6 +173,7 @@ static void wrapInTag(List sequence, int startPosition,
 
     private final boolean showInlineDiffs;
     private final boolean replaceOriginalLinefeedInChangesWithSpaces;
+    private final boolean decompressDeltas;
 
     private DiffRowGenerator(Builder builder) {
         showInlineDiffs = builder.showInlineDiffs;
@@ -182,6 +183,7 @@ private DiffRowGenerator(Builder builder) {
         columnWidth = builder.columnWidth;
         mergeOriginalRevised = builder.mergeOriginalRevised;
         inlineDiffSplitter = builder.inlineDiffSplitter;
+        decompressDeltas = builder.decompressDeltas;
 
         if (builder.equalizer != null) {
             equalizer = builder.equalizer;
@@ -225,8 +227,14 @@ public List generateDiffRows(final List original, Patch
         int endPos = 0;
         final List> deltaList = patch.getDeltas();
 
-        for (AbstractDelta originalDelta : deltaList) {
-            for (AbstractDelta delta : decompressDeltas(originalDelta)) {
+        if (decompressDeltas) {
+            for (AbstractDelta originalDelta : deltaList) {
+                for (AbstractDelta delta : decompressDeltas(originalDelta)) {
+                    endPos = transformDeltaIntoDiffRow(original, endPos, diffRows, delta);
+                }
+            }
+        } else {
+            for (AbstractDelta delta : deltaList) {
                 endPos = transformDeltaIntoDiffRow(original, endPos, diffRows, delta);
             }
         }
@@ -442,6 +450,7 @@ public static class Builder {
 
         private boolean showInlineDiffs = false;
         private boolean ignoreWhiteSpaces = false;
+        private boolean decompressDeltas = true;
 
         private BiFunction oldTag
                 = (tag, f) -> f ? "" : "";
@@ -554,7 +563,8 @@ public Builder processDiffs(Function processDiffs) {
          * Set the column width of generated lines of original and revised
          * texts.
          *
-         * @param width the width to set. Making it < 0 doesn't make any sense. Default 80.
+         * @param width the width to set. Making it < 0 doesn't make any
+         * sense. Default 80.
          * @return builder with config of column width
          */
         public Builder columnWidth(int width) {
@@ -586,6 +596,19 @@ public Builder mergeOriginalRevised(boolean mergeOriginalRevised) {
             return this;
         }
 
+        /**
+         * Deltas could be in a state, that would produce some unreasonable
+         * results within an inline diff. So the deltas are decompressed into
+         * smaller parts and rebuild. But this could result in more differences.
+         *
+         * @param decompressDeltas
+         * @return
+         */
+        public Builder decompressDeltas(boolean decompressDeltas) {
+            this.decompressDeltas = decompressDeltas;
+            return this;
+        }
+
         /**
          * Per default each character is separatly processed. This variant
          * introduces processing by word, which does not deliver in word
diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
index d9a3c4ff..08172d81 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
@@ -641,7 +641,7 @@ public void testCorrectChangeIssue114() throws IOException {
 
         assertThat(rows).extracting(item -> item.getTag().name()).containsExactly("CHANGE", "DELETE", "EQUAL", "CHANGE", "EQUAL");
     }
-    
+
     @Test
     public void testCorrectChangeIssue114_2() throws IOException {
         List original = Arrays.asList("A", "B", "C", "D", "E");
@@ -662,7 +662,7 @@ public void testCorrectChangeIssue114_2() throws IOException {
         assertThat(rows).extracting(item -> item.getTag().name()).containsExactly("CHANGE", "DELETE", "EQUAL", "CHANGE", "EQUAL");
         assertThat(rows.get(1).toString()).isEqualTo("[DELETE,~B~,]");
     }
-    
+
     @Test
     public void testIssue119WrongContextLength() throws IOException {
         String original = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue_119_original.txt")).collect(joining("\n"));
@@ -683,4 +683,82 @@ public void testIssue119WrongContextLength() throws IOException {
                 .filter(item -> item.getTag() != DiffRow.Tag.EQUAL)
                 .forEach(System.out::println);
     }
+
+    @Test
+    public void testIssue129WithDeltaDecompression() {
+        List lines1 = Arrays.asList(
+                "apple1",
+                "apple2",
+                "apple3",
+                "A man named Frankenstein abc to Switzerland for cookies!",
+                "banana1",
+                "banana2",
+                "banana3");
+        List lines2 = Arrays.asList(
+                "apple1",
+                "apple2",
+                "apple3",
+                "A man named Frankenstein",
+                "xyz",
+                "to Switzerland for cookies!",
+                "banana1",
+                "banana2",
+                "banana3");
+        int[] entry = {1};
+        String txt = DiffRowGenerator.create()
+                .showInlineDiffs(true)
+                .oldTag((tag, isOpening) -> isOpening ? "==old" + tag + "==>" : "<==old==")
+                .newTag((tag, isOpening) -> isOpening ? "==new" + tag + "==>" : "<==new==")
+                .build()
+                .generateDiffRows(lines1, lines2)
+                .stream()
+                .map(row -> row.getTag().toString())
+                .collect(joining(" "));
+//                .forEachOrdered(row -> {
+//                    System.out.printf("%4d %-8s %-80s %-80s\n", entry[0]++,
+//                            row.getTag(), row.getOldLine(), row.getNewLine());
+//                });
+
+        assertThat(txt).isEqualTo("EQUAL EQUAL EQUAL CHANGE INSERT INSERT EQUAL EQUAL EQUAL");
+    }
+    
+    @Test
+    public void testIssue129SkipDeltaDecompression() {
+        List lines1 = Arrays.asList(
+                "apple1",
+                "apple2",
+                "apple3",
+                "A man named Frankenstein abc to Switzerland for cookies!",
+                "banana1",
+                "banana2",
+                "banana3");
+        List lines2 = Arrays.asList(
+                "apple1",
+                "apple2",
+                "apple3",
+                "A man named Frankenstein",
+                "xyz",
+                "to Switzerland for cookies!",
+                "banana1",
+                "banana2",
+                "banana3");
+        int[] entry = {1};
+        String txt = 
+                DiffRowGenerator.create()
+                .showInlineDiffs(true)
+                .decompressDeltas(false)
+                .oldTag((tag, isOpening) -> isOpening ? "==old" + tag + "==>" : "<==old==")
+                .newTag((tag, isOpening) -> isOpening ? "==new" + tag + "==>" : "<==new==")
+                .build()
+                .generateDiffRows(lines1, lines2)
+                .stream()
+                .map(row -> row.getTag().toString())
+                .collect(joining(" "));
+//                .forEachOrdered(row -> {
+//                    System.out.printf("%4d %-8s %-80s %-80s\n", entry[0]++,
+//                            row.getTag(), row.getOldLine(), row.getNewLine());
+//                });
+
+        assertThat(txt).isEqualTo("EQUAL EQUAL EQUAL CHANGE CHANGE CHANGE EQUAL EQUAL EQUAL");
+    }
 }

From 37f9eafaa90070d42e343cf9076a982dd693a6ae Mon Sep 17 00:00:00 2001
From: anatawa12 
Date: Mon, 29 Nov 2021 07:10:52 +0900
Subject: [PATCH 198/266] Fizzy apply (#125)

* add applyFuzzyTo and restoreFuzzy

* implement applyFuzzyTo and restoreFuzzy for EqualDelta

* add verifyChunk with fuzzy and delta

* implement fuzzy apply and add tests

* fix style

* extract method

* fix: assign lastPatchDelta and lastPatchEnd

* fix use explict import

* document EqualDelta#applyFuzzyToAt

* set access modifiers

* change test method name

* document empty method

* apply from first

* add more tests

* add more documentation about fuzz parameter

* fix documentation about fizzy patch

Co-authored-by: cowwoc 

Co-authored-by: cowwoc 
---
 .../github/difflib/patch/AbstractDelta.java   |  13 +
 .../com/github/difflib/patch/ChangeDelta.java |  13 +
 .../java/com/github/difflib/patch/Chunk.java  |  22 +-
 .../com/github/difflib/patch/EqualDelta.java  |   8 +
 .../java/com/github/difflib/patch/Patch.java  | 111 +++++++
 ...ithMeyersDiffWithLinearSpacePatchTest.java | 290 ++++++++++++++++++
 .../com/github/difflib/patch/ChunkTest.java   |  43 +++
 7 files changed, 498 insertions(+), 2 deletions(-)
 create mode 100644 java-diff-utils/src/test/java/com/github/difflib/patch/ChunkTest.java

diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
index 7db3ac50..a315e010 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
@@ -70,6 +70,19 @@ protected VerifyChunk verifyAntApplyTo(List target) throws PatchFailedExcepti
     
     protected abstract void restore(List target);
     
+    /**
+     * Apply patch fuzzy.
+     *
+     * @param target the list this patch will be applied to
+     * @param fuzz the number of elements to ignore before/after the patched elements
+     * @param position the position this patch will be applied to. ignores {@code source.getPosition()}
+     * @see Description of Fuzzy Patch for more information.
+     */
+    @SuppressWarnings("RedundantThrows")
+    protected void applyFuzzyToAt(List target, int fuzz, int position) throws PatchFailedException {
+        throw new UnsupportedOperationException(this.getClass().getSimpleName() + " does not supports applying patch fuzzy");
+    }
+
     /**
      * Create a new delta of the actual instance with customized chunk data.
      */
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java
index ddb37665..376fd625 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java
@@ -66,6 +66,19 @@ protected void restore(List target) {
         }
     }
 
+    protected void applyFuzzyToAt(List target, int fuzz, int position) throws PatchFailedException {
+        int size = getSource().size();
+        for (int i = fuzz; i < size - fuzz; i++) {
+            target.remove(position + fuzz);
+        }
+
+        int i = fuzz;
+        for (T line : getTarget().getLines().subList(fuzz, getTarget().size() - fuzz)) {
+            target.add(position + i, line);
+            i++;
+        }
+    }
+
     @Override
     public String toString() {
         return "[ChangeDelta, position: " + getSource().getPosition() + ", lines: "
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
index 8ff19875..7e55ac0d 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
@@ -95,10 +95,28 @@ public Chunk(int position, T[] lines) {
      * @throws com.github.difflib.patch.PatchFailedException
      */
     public VerifyChunk verifyChunk(List target) throws PatchFailedException {
-        if (position > target.size() || last() > target.size()) {
+        return verifyChunk(target, 0, getPosition());
+    }
+
+    /**
+     * Verifies that this chunk's saved text matches the corresponding text in
+     * the given sequence.
+     *
+     * @param target the sequence to verify against.
+     * @param fuzz the count of ignored prefix/suffix
+     * @param position the position of target
+     * @throws com.github.difflib.patch.PatchFailedException
+     */
+    public VerifyChunk verifyChunk(List target, int fuzz, int position) throws PatchFailedException {
+        //noinspection UnnecessaryLocalVariable
+        int startIndex = fuzz;
+        int lastIndex = size() - fuzz;
+        int last = position + size() - 1;
+
+        if (position + fuzz > target.size() || last - fuzz > target.size()) {
             return VerifyChunk.POSITION_OUT_OF_TARGET;
         }
-        for (int i = 0; i < size(); i++) {
+        for (int i = startIndex; i < lastIndex; i++) {
             if (!target.get(position + i).equals(lines.get(i))) {
                 return VerifyChunk.CONTENT_DOES_NOT_MATCH_TARGET;
             }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java
index e13cf52e..17fdadc6 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java
@@ -35,6 +35,14 @@ protected void applyTo(List target) throws PatchFailedException {
     protected void restore(List target) {
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void applyFuzzyToAt(List target, int fuzz, int delta) {
+        // equals so no operations
+    }
+
     @Override
     public String toString() {
         return "[EqualDelta, position: " + getSource().getPosition() + ", lines: "
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
index 5a952f6c..5e3e51f8 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
@@ -66,6 +66,117 @@ public List applyTo(List target) throws PatchFailedException {
         return result;
     }
 
+    private static class PatchApplyingContext {
+        public final List result;
+        public final int maxFuzz;
+
+        // the position last patch applied to.
+        public int lastPatchEnd = -1;
+
+        ///// passing values from find to apply
+        public int currentFuzz = 0;
+
+        public int defaultPosition;
+        public boolean beforeOutRange = false;
+        public boolean afterOutRange = false;
+
+        private PatchApplyingContext(List result, int maxFuzz) {
+            this.result = result;
+            this.maxFuzz = maxFuzz;
+        }
+    }
+
+    public List applyFuzzy(List target, int maxFuzz) throws PatchFailedException {
+        PatchApplyingContext ctx = new PatchApplyingContext<>(new ArrayList<>(target), maxFuzz);
+
+        // the difference between patch's position and actually applied position
+        int lastPatchDelta = 0;
+
+        for (AbstractDelta delta : getDeltas()) {
+            ctx.defaultPosition = delta.getSource().getPosition() + lastPatchDelta;
+            int patchPosition = findPositionFuzzy(ctx, delta);
+            if (0 <= patchPosition) {
+                delta.applyFuzzyToAt(ctx.result, ctx.currentFuzz, patchPosition);
+                lastPatchDelta = patchPosition - delta.getSource().getPosition();
+                ctx.lastPatchEnd = delta.getSource().last() + lastPatchDelta;
+            } else {
+                conflictOutput.processConflict(VerifyChunk.CONTENT_DOES_NOT_MATCH_TARGET, delta, ctx.result);
+            }
+        }
+
+        return ctx.result;
+    }
+
+    // negative for not found
+    private int findPositionFuzzy(PatchApplyingContext ctx, AbstractDelta delta) throws PatchFailedException {
+        for (int fuzz = 0; fuzz <= ctx.maxFuzz; fuzz++) {
+            ctx.currentFuzz = fuzz;
+            int foundPosition = findPositionWithFuzz(ctx, delta, fuzz);
+            if (foundPosition >= 0) {
+                return foundPosition;
+            }
+        }
+        return -1;
+    }
+
+    // negative for not found
+    private int findPositionWithFuzz(PatchApplyingContext ctx, AbstractDelta delta, int fuzz) throws PatchFailedException {
+        if (delta.getSource().verifyChunk(ctx.result, fuzz, ctx.defaultPosition) == VerifyChunk.OK) {
+            return ctx.defaultPosition;
+        }
+
+        ctx.beforeOutRange = false;
+        ctx.afterOutRange = false;
+
+        // moreDelta >= 0: just for overflow guard, not a normal condition
+        //noinspection OverflowingLoopIndex
+        for (int moreDelta = 0; moreDelta >= 0; moreDelta++) {
+            int pos = findPositionWithFuzzAndMoreDelta(ctx, delta, fuzz, moreDelta);
+            if (pos >= 0) {
+                return pos;
+            }
+            if (ctx.beforeOutRange && ctx.afterOutRange) {
+                break;
+            }
+        }
+
+        return -1;
+    }
+
+    // negative for not found
+    private int findPositionWithFuzzAndMoreDelta(PatchApplyingContext ctx, AbstractDelta delta, int fuzz, int moreDelta) throws PatchFailedException {
+        // range check: can't apply before end of last patch
+        if (!ctx.beforeOutRange) {
+            int beginAt = ctx.defaultPosition - moreDelta + fuzz;
+            // We can't apply patch before end of last patch.
+            if (beginAt <= ctx.lastPatchEnd) {
+                ctx.beforeOutRange = true;
+            }
+        }
+        // range check: can't apply after end of result
+        if (!ctx.afterOutRange) {
+            int beginAt = ctx.defaultPosition + moreDelta + delta.getSource().size() - fuzz;
+            // We can't apply patch before end of last patch.
+            if (ctx.result.size() < beginAt) {
+                ctx.afterOutRange = true;
+            }
+        }
+
+        if (!ctx.beforeOutRange) {
+            VerifyChunk before = delta.getSource().verifyChunk(ctx.result, fuzz, ctx.defaultPosition - moreDelta);
+            if (before == VerifyChunk.OK) {
+                return ctx.defaultPosition - moreDelta;
+            }
+        }
+        if (!ctx.afterOutRange) {
+            VerifyChunk after = delta.getSource().verifyChunk(ctx.result, fuzz, ctx.defaultPosition + moreDelta);
+            if (after == VerifyChunk.OK) {
+                return ctx.defaultPosition + moreDelta;
+            }
+        }
+        return -1;
+    }
+
     /**
      * Standard Patch behaviour to throw an exception for pathching conflicts.
      */
diff --git a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMeyersDiffWithLinearSpacePatchTest.java b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMeyersDiffWithLinearSpacePatchTest.java
index 82aa04d4..65ea1839 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMeyersDiffWithLinearSpacePatchTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMeyersDiffWithLinearSpacePatchTest.java
@@ -2,6 +2,7 @@
 
 import com.github.difflib.patch.*;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.ByteArrayInputStream;
@@ -9,8 +10,13 @@
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import org.junit.jupiter.api.Test;
 
@@ -57,6 +63,104 @@ public void testPatch_Change() {
         }
     }
 
+    // region testPatch_fuzzyApply utils
+
+    private List intRange(int count) {
+        return IntStream.range(0, count)
+                .mapToObj(Integer::toString)
+                .collect(Collectors.toList());
+    }
+
+    @SafeVarargs
+    private final List join(List... lists) {
+        return Arrays.stream(lists).flatMap(Collection::stream).collect(Collectors.toList());
+    }
+
+    private static class FuzzyApplyTestPair {
+        public final List from;
+        public final List to;
+        public final int requiredFuzz;
+
+        private FuzzyApplyTestPair(List from, List to, int requiredFuzz) {
+            this.from = from;
+            this.to = to;
+            this.requiredFuzz = requiredFuzz;
+        }
+    }
+
+    // endregion
+
+    @Test
+    public void fuzzyApply() throws PatchFailedException {
+        Patch patch = new Patch<>();
+        List deltaFrom = Arrays.asList("aaa", "bbb", "ccc", "ddd", "eee", "fff");
+        List deltaTo = Arrays.asList("aaa", "bbb", "cxc", "dxd", "eee", "fff");
+        patch.addDelta(new ChangeDelta<>(
+                new Chunk<>(6, deltaFrom),
+                new Chunk<>(6, deltaTo)));
+
+        //noinspection unchecked
+        List[] moves = new List[] {
+                intRange(6), // no patch move
+                intRange(3), // forward patch move
+                intRange(9), // backward patch move
+                intRange(0), // apply to the first
+        };
+
+        for (FuzzyApplyTestPair pair : FUZZY_APPLY_TEST_PAIRS) {
+            for (List move : moves) {
+                List from = join(move, pair.from);
+                List to = join(move, pair.to);
+
+                for (int i = 0; i < pair.requiredFuzz; i++) {
+                    int maxFuzz = i;
+                    assertThrows(PatchFailedException.class, () ->
+                            patch.applyFuzzy(from, maxFuzz),
+                            () -> "fail for " + from + " -> " + to + " for fuzz " + maxFuzz + " required " + pair.requiredFuzz);
+                }
+                for (int i = pair.requiredFuzz; i < 4; i++) {
+                    int maxFuzz = i;
+                    assertEquals(to, patch.applyFuzzy(from, maxFuzz),
+                            () -> "with " + maxFuzz);
+                }
+            }
+        }
+    }
+
+    @Test
+    public void fuzzyApplyTwoSideBySidePatches() throws PatchFailedException {
+        Patch patch = new Patch<>();
+        List deltaFrom = Arrays.asList("aaa", "bbb", "ccc", "ddd", "eee", "fff");
+        List deltaTo = Arrays.asList("aaa", "bbb", "cxc", "dxd", "eee", "fff");
+        patch.addDelta(new ChangeDelta<>(
+                new Chunk<>(0, deltaFrom),
+                new Chunk<>(0, deltaTo)));
+        patch.addDelta(new ChangeDelta<>(
+                new Chunk<>(6, deltaFrom),
+                new Chunk<>(6, deltaTo)));
+
+
+        assertEquals(join(deltaTo, deltaTo), patch.applyFuzzy(join(deltaFrom, deltaFrom), 0));
+    }
+
+    @Test
+    public void fuzzyApplyToNearest() throws PatchFailedException {
+        Patch patch = new Patch<>();
+        List deltaFrom = Arrays.asList("aaa", "bbb", "ccc", "ddd", "eee", "fff");
+        List deltaTo = Arrays.asList("aaa", "bbb", "cxc", "dxd", "eee", "fff");
+        patch.addDelta(new ChangeDelta<>(
+                new Chunk<>(0, deltaFrom),
+                new Chunk<>(0, deltaTo)));
+        patch.addDelta(new ChangeDelta<>(
+                new Chunk<>(10, deltaFrom),
+                new Chunk<>(10, deltaTo)));
+
+        assertEquals(join(deltaTo, deltaFrom, deltaTo),
+                patch.applyFuzzy(join(deltaFrom, deltaFrom, deltaFrom), 0));
+        assertEquals(join(intRange(1), deltaTo, deltaFrom, deltaTo),
+                patch.applyFuzzy(join(intRange(1), deltaFrom, deltaFrom, deltaFrom), 0));
+    }
+
     @Test
     public void testPatch_Serializable() throws IOException, ClassNotFoundException {
         final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
@@ -101,4 +205,190 @@ public void testPatch_Change_withExceptionProcessor() {
             fail(e.getMessage());
         }
     }
+
+    static class FuzzyApplyTestDataGenerator {
+        private static String createList(List values) {
+            return values.stream()
+                    .map(x -> '"' + x + '"')
+                    .collect(Collectors.joining(", ", "Arrays.asList(", ")"));
+        }
+
+        public static void main(String[] args) {
+            String[] deltaFrom = new String[] { "aaa", "bbb", "ccc", "ddd", "eee", "fff" };
+            String[] deltaTo = new String[] { "aaa", "bbb", "cxc", "dxd", "eee", "fff" };
+
+            List pairs = new ArrayList<>();
+
+            // create test data.
+            // Brute-force search
+            String[] changedValue = new String[]{"axa", "bxb", "czc", "dzd", "exe", "fxf"};
+            for (int i = 0; i < 1 << 6; i++) {
+                if ((i & 0b001100) != 0 && (i & 0b001100) != 0b001100) {
+                    continue;
+                }
+
+                String[] from = deltaFrom.clone();
+                String[] to = deltaTo.clone();
+                for (int j = 0; j < 6; j++) {
+                    if ((i & (1 << j)) != 0) {
+                        from[j] = changedValue[j];
+                        to[j] = changedValue[j];
+                    }
+                }
+
+                int requiredFuzz;
+                if ((i & 0b001100) != 0) {
+                    requiredFuzz = 3;
+                } else if ((i & 0b010010) != 0) {
+                    requiredFuzz = 2;
+                } else if ((i & 0b100001) != 0) {
+                    requiredFuzz = 1;
+                } else {
+                    requiredFuzz = 0;
+                }
+
+                pairs.add(new FuzzyApplyTestPair(Arrays.asList(from), Arrays.asList(to), requiredFuzz));
+            }
+            pairs.sort(Comparator.comparingInt(a -> a.requiredFuzz));
+            System.out.println("FuzzyApplyTestPair[] pairs = new FuzzyApplyTestPair[] {");
+            for (FuzzyApplyTestPair pair : pairs) {
+                System.out.println("        new FuzzyApplyTestPair(");
+                System.out.println("                " + createList(pair.from) + ",");
+                System.out.println("                " + createList(pair.to) + ",");
+                System.out.println("                " + pair.requiredFuzz + "),");
+            }
+            System.out.println("};");
+        }
+    }
+
+    private static final FuzzyApplyTestPair[] FUZZY_APPLY_TEST_PAIRS = new FuzzyApplyTestPair[] {
+            new FuzzyApplyTestPair(
+                    Arrays.asList("aaa", "bbb", "ccc", "ddd", "eee", "fff"),
+                    Arrays.asList("aaa", "bbb", "cxc", "dxd", "eee", "fff"),
+                    0),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("axa", "bbb", "ccc", "ddd", "eee", "fff"),
+                    Arrays.asList("axa", "bbb", "cxc", "dxd", "eee", "fff"),
+                    1),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("aaa", "bbb", "ccc", "ddd", "eee", "fxf"),
+                    Arrays.asList("aaa", "bbb", "cxc", "dxd", "eee", "fxf"),
+                    1),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("axa", "bbb", "ccc", "ddd", "eee", "fxf"),
+                    Arrays.asList("axa", "bbb", "cxc", "dxd", "eee", "fxf"),
+                    1),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("aaa", "bxb", "ccc", "ddd", "eee", "fff"),
+                    Arrays.asList("aaa", "bxb", "cxc", "dxd", "eee", "fff"),
+                    2),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("axa", "bxb", "ccc", "ddd", "eee", "fff"),
+                    Arrays.asList("axa", "bxb", "cxc", "dxd", "eee", "fff"),
+                    2),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("aaa", "bbb", "ccc", "ddd", "exe", "fff"),
+                    Arrays.asList("aaa", "bbb", "cxc", "dxd", "exe", "fff"),
+                    2),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("axa", "bbb", "ccc", "ddd", "exe", "fff"),
+                    Arrays.asList("axa", "bbb", "cxc", "dxd", "exe", "fff"),
+                    2),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("aaa", "bxb", "ccc", "ddd", "exe", "fff"),
+                    Arrays.asList("aaa", "bxb", "cxc", "dxd", "exe", "fff"),
+                    2),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("axa", "bxb", "ccc", "ddd", "exe", "fff"),
+                    Arrays.asList("axa", "bxb", "cxc", "dxd", "exe", "fff"),
+                    2),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("aaa", "bxb", "ccc", "ddd", "eee", "fxf"),
+                    Arrays.asList("aaa", "bxb", "cxc", "dxd", "eee", "fxf"),
+                    2),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("axa", "bxb", "ccc", "ddd", "eee", "fxf"),
+                    Arrays.asList("axa", "bxb", "cxc", "dxd", "eee", "fxf"),
+                    2),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("aaa", "bbb", "ccc", "ddd", "exe", "fxf"),
+                    Arrays.asList("aaa", "bbb", "cxc", "dxd", "exe", "fxf"),
+                    2),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("axa", "bbb", "ccc", "ddd", "exe", "fxf"),
+                    Arrays.asList("axa", "bbb", "cxc", "dxd", "exe", "fxf"),
+                    2),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("aaa", "bxb", "ccc", "ddd", "exe", "fxf"),
+                    Arrays.asList("aaa", "bxb", "cxc", "dxd", "exe", "fxf"),
+                    2),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("axa", "bxb", "ccc", "ddd", "exe", "fxf"),
+                    Arrays.asList("axa", "bxb", "cxc", "dxd", "exe", "fxf"),
+                    2),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("aaa", "bbb", "czc", "dzd", "eee", "fff"),
+                    Arrays.asList("aaa", "bbb", "czc", "dzd", "eee", "fff"),
+                    3),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("axa", "bbb", "czc", "dzd", "eee", "fff"),
+                    Arrays.asList("axa", "bbb", "czc", "dzd", "eee", "fff"),
+                    3),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("aaa", "bxb", "czc", "dzd", "eee", "fff"),
+                    Arrays.asList("aaa", "bxb", "czc", "dzd", "eee", "fff"),
+                    3),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("axa", "bxb", "czc", "dzd", "eee", "fff"),
+                    Arrays.asList("axa", "bxb", "czc", "dzd", "eee", "fff"),
+                    3),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("aaa", "bbb", "czc", "dzd", "exe", "fff"),
+                    Arrays.asList("aaa", "bbb", "czc", "dzd", "exe", "fff"),
+                    3),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("axa", "bbb", "czc", "dzd", "exe", "fff"),
+                    Arrays.asList("axa", "bbb", "czc", "dzd", "exe", "fff"),
+                    3),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("aaa", "bxb", "czc", "dzd", "exe", "fff"),
+                    Arrays.asList("aaa", "bxb", "czc", "dzd", "exe", "fff"),
+                    3),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("axa", "bxb", "czc", "dzd", "exe", "fff"),
+                    Arrays.asList("axa", "bxb", "czc", "dzd", "exe", "fff"),
+                    3),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("aaa", "bbb", "czc", "dzd", "eee", "fxf"),
+                    Arrays.asList("aaa", "bbb", "czc", "dzd", "eee", "fxf"),
+                    3),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("axa", "bbb", "czc", "dzd", "eee", "fxf"),
+                    Arrays.asList("axa", "bbb", "czc", "dzd", "eee", "fxf"),
+                    3),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("aaa", "bxb", "czc", "dzd", "eee", "fxf"),
+                    Arrays.asList("aaa", "bxb", "czc", "dzd", "eee", "fxf"),
+                    3),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("axa", "bxb", "czc", "dzd", "eee", "fxf"),
+                    Arrays.asList("axa", "bxb", "czc", "dzd", "eee", "fxf"),
+                    3),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("aaa", "bbb", "czc", "dzd", "exe", "fxf"),
+                    Arrays.asList("aaa", "bbb", "czc", "dzd", "exe", "fxf"),
+                    3),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("axa", "bbb", "czc", "dzd", "exe", "fxf"),
+                    Arrays.asList("axa", "bbb", "czc", "dzd", "exe", "fxf"),
+                    3),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("aaa", "bxb", "czc", "dzd", "exe", "fxf"),
+                    Arrays.asList("aaa", "bxb", "czc", "dzd", "exe", "fxf"),
+                    3),
+            new FuzzyApplyTestPair(
+                    Arrays.asList("axa", "bxb", "czc", "dzd", "exe", "fxf"),
+                    Arrays.asList("axa", "bxb", "czc", "dzd", "exe", "fxf"),
+                    3),
+    };
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/patch/ChunkTest.java b/java-diff-utils/src/test/java/com/github/difflib/patch/ChunkTest.java
new file mode 100644
index 00000000..4816f221
--- /dev/null
+++ b/java-diff-utils/src/test/java/com/github/difflib/patch/ChunkTest.java
@@ -0,0 +1,43 @@
+package com.github.difflib.patch;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class ChunkTest {
+    @Test
+    void verifyChunk() throws PatchFailedException {
+        Chunk chunk = new Chunk<>(7, toCharList("test"));
+
+        // normal check
+        assertEquals(VerifyChunk.OK,
+                chunk.verifyChunk(toCharList("prefix test suffix")));
+        assertEquals(VerifyChunk.CONTENT_DOES_NOT_MATCH_TARGET,
+                chunk.verifyChunk(toCharList("prefix  es  suffix"), 0, 7));
+
+        // position
+        assertEquals(VerifyChunk.OK,
+                chunk.verifyChunk(toCharList("short test suffix"), 0, 6));
+        assertEquals(VerifyChunk.OK,
+                chunk.verifyChunk(toCharList("loonger test suffix"), 0, 8));
+        assertEquals(VerifyChunk.CONTENT_DOES_NOT_MATCH_TARGET,
+                chunk.verifyChunk(toCharList("prefix test suffix"), 0, 6));
+        assertEquals(VerifyChunk.CONTENT_DOES_NOT_MATCH_TARGET,
+                chunk.verifyChunk(toCharList("prefix test suffix"), 0, 8));
+
+        // fuzz
+        assertEquals(VerifyChunk.OK,
+                chunk.verifyChunk(toCharList("prefix test suffix"), 1, 7));
+        assertEquals(VerifyChunk.OK,
+                chunk.verifyChunk(toCharList("prefix  es  suffix"), 1, 7));
+        assertEquals(VerifyChunk.CONTENT_DOES_NOT_MATCH_TARGET,
+                chunk.verifyChunk(toCharList("prefix      suffix"), 1, 7));
+    }
+
+    private List toCharList(String str) {
+        return str.chars().mapToObj(x -> (char) x).collect(Collectors.toList());
+    }
+}

From 8fdd2399616109402617e5b2efd3f5d2fcb8fcb6 Mon Sep 17 00:00:00 2001
From: Sebastian 
Date: Mon, 21 Feb 2022 09:00:27 +0100
Subject: [PATCH 199/266] Fix a typo in ComputeDifference.java (#140)

---
 .../java/com/github/difflib/examples/ComputeDifference.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java-diff-utils/src/test/java/com/github/difflib/examples/ComputeDifference.java b/java-diff-utils/src/test/java/com/github/difflib/examples/ComputeDifference.java
index f665e662..e8b25437 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/examples/ComputeDifference.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/examples/ComputeDifference.java
@@ -12,11 +12,11 @@
 public class ComputeDifference {
 
     private static final String ORIGINAL = TestConstants.MOCK_FOLDER + "original.txt";
-    private static final String RIVISED = TestConstants.MOCK_FOLDER + "revised.txt";
+    private static final String REVISED = TestConstants.MOCK_FOLDER + "revised.txt";
 
     public static void main(String[] args) throws IOException {
         List original = Files.readAllLines(new File(ORIGINAL).toPath());
-        List revised = Files.readAllLines(new File(RIVISED).toPath());
+        List revised = Files.readAllLines(new File(REVISED).toPath());
 
         // Compute diff. Get the Patch object. Patch is the container for computed deltas.
         Patch patch = DiffUtils.diff(original, revised);

From ea9942da129dfc102d52172f59d21acae79bdafd Mon Sep 17 00:00:00 2001
From: Hussein Kasem 
Date: Sun, 10 Apr 2022 00:20:37 +0200
Subject: [PATCH 200/266] Fix for #141 (#144)

* Add test to reproduce issue #141

* Fix assumption on test to match expected behaviour expressed on #141

* Make "/" after "virtual" directories mandatory

Now the regex only matches with "a/", "b/", "new/" and "old/", previously the slash was taken as optional.
fixes #141
---
 .../difflib/unifieddiff/UnifiedDiffReader.java       |  2 +-
 .../difflib/unifieddiff/UnifiedDiffReaderTest.java   | 12 +++++++++++-
 .../difflib/unifieddiff/problem_diff_issue141.diff   | 11 +++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue141.diff

diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
index 181b41ae..0ac22ce8 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
@@ -353,7 +353,7 @@ private String extractFileName(String _line) {
             line = line.substring(0, matcher.start());
         }
         line = line.split("\t")[0];
-        return line.substring(4).replaceFirst("^(a|b|old|new)(\\/)?", "")
+        return line.substring(4).replaceFirst("^(a|b|old|new)/", "")
                 .trim();
     }
 
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
index 912b72fd..dcf32182 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -122,7 +122,7 @@ public void testParseIssue46() throws IOException {
         assertThat(diff.getFiles().size()).isEqualTo(1);
 
         UnifiedDiffFile file1 = diff.getFiles().get(0);
-        assertThat(file1.getFromFile()).isEqualTo(".vhd");
+        assertThat(file1.getFromFile()).isEqualTo("a.vhd");
         assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
 
         assertThat(diff.getTail()).isNull();
@@ -384,4 +384,14 @@ public void testParseIssue123() throws IOException {
 
         assertThat(diff.getFiles()).extracting(f -> f.getFromFile()).contains("src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java");
     }
+
+    @Test
+    public void testParseIssue141() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue141.diff"));
+        UnifiedDiffFile file1 = diff.getFiles().get(0);
+
+        assertThat(file1.getFromFile()).isEqualTo("a.txt");
+        assertThat(file1.getToFile()).isEqualTo("a1.txt");
+    }
 }
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue141.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue141.diff
new file mode 100644
index 00000000..ab33c250
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue141.diff
@@ -0,0 +1,11 @@
+--- a.txt
++++ a1.txt
+@@ -8,7 +8,7 @@
+     
+         
+             
+-                23
++                24
+             
+             
+                 1

From bc65f9703c137b3a7d2906eeaf064588dd36c125 Mon Sep 17 00:00:00 2001
From: Okue 
Date: Sun, 10 Apr 2022 07:25:45 +0900
Subject: [PATCH 201/266] Update version in gradle example of README (#145)

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b4d066d6..cfe763bf 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,7 @@ Just add the code below to your maven dependencies:
 
     io.github.java-diff-utils
     java-diff-utils
-    4.9
+    4.11
 
 ```
 
@@ -97,5 +97,5 @@ or using gradle:
 
 ```groovy
 // https://mvnrepository.com/artifact/io.github.java-diff-utils/java-diff-utils
-implementation "io.github.java-diff-utils:java-diff-utils:4.5"
+implementation "io.github.java-diff-utils:java-diff-utils:4.11"
 ```

From 0545519fc3e79b9a7c7f6407c87f8f53cde50141 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 15 May 2022 00:17:49 +0200
Subject: [PATCH 202/266] included some more tests

---
 .../difflib/patch/PatchWithMeyerDiffTest.java | 17 +++++++++++++
 .../difflib/text/DiffRowGeneratorTest.java    | 24 +++++++++++++++++++
 .../com/github/difflib/text/issue129_1.txt    | 12 ++++++++++
 .../com/github/difflib/text/issue129_2.txt    | 13 ++++++++++
 4 files changed, 66 insertions(+)
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/text/issue129_1.txt
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/text/issue129_2.txt

diff --git a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMeyerDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMeyerDiffTest.java
index d7bf2798..98f4f6eb 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMeyerDiffTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMeyerDiffTest.java
@@ -16,8 +16,10 @@
 package com.github.difflib.patch;
 
 import com.github.difflib.DiffUtils;
+import static com.github.difflib.patch.Patch.CONFLICT_PRODUCES_MERGE_CONFLICT;
 import java.util.Arrays;
 import java.util.List;
+import static java.util.stream.Collectors.joining;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 import org.junit.jupiter.api.Test;
@@ -27,6 +29,7 @@
  * @author tw
  */
 public class PatchWithMeyerDiffTest {
+
     @Test
     public void testPatch_Change_withExceptionProcessor() {
         final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
@@ -48,4 +51,18 @@ public void testPatch_Change_withExceptionProcessor() {
             fail(e.getMessage());
         }
     }
+
+    @Test
+    public void testPatchThreeWayIssue138() throws PatchFailedException {
+        List base = Arrays.asList("Imagine there's no heaven".split("\\s+"));
+        List left = Arrays.asList("Imagine there's no HEAVEN".split("\\s+"));
+        List right = Arrays.asList("IMAGINE there's no heaven".split("\\s+"));
+
+        Patch rightPatch = DiffUtils.diff(base, right)
+                .withConflictOutput(CONFLICT_PRODUCES_MERGE_CONFLICT);
+
+        List applied = rightPatch.applyTo(left);
+
+        assertEquals("IMAGINE there's no HEAVEN", applied.stream().collect(joining(" ")));
+    }
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
index 08172d81..897a37f9 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
@@ -761,4 +761,28 @@ public void testIssue129SkipDeltaDecompression() {
 
         assertThat(txt).isEqualTo("EQUAL EQUAL EQUAL CHANGE CHANGE CHANGE EQUAL EQUAL EQUAL");
     }
+    
+    @Test
+    public void testIssue129SkipWhitespaceChanges() throws IOException {
+        String original = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue129_1.txt")).collect(joining("\n"));
+        String revised = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue129_2.txt")).collect(joining("\n"));
+
+        DiffRowGenerator generator = DiffRowGenerator.create()
+                .showInlineDiffs(true)
+                .mergeOriginalRevised(true)
+                .inlineDiffByWord(true)
+                .ignoreWhiteSpaces(true)
+                .oldTag((tag, isOpening) -> isOpening ? "==old" + tag + "==>" : "<==old==")
+                .newTag((tag, isOpening) -> isOpening ? "==new" + tag + "==>" : "<==new==")
+                .build();
+        List rows = generator.generateDiffRows(
+                Arrays.asList(original.split("\n")),
+                Arrays.asList(revised.split("\n")));
+
+        assertThat(rows).hasSize(13);
+        
+        rows.stream()
+                .filter(item -> item.getTag() != DiffRow.Tag.EQUAL)
+                .forEach(System.out::println);
+    }
 }
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/text/issue129_1.txt b/java-diff-utils/src/test/resources/com/github/difflib/text/issue129_1.txt
new file mode 100644
index 00000000..42887fa5
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/text/issue129_1.txt
@@ -0,0 +1,12 @@
+Four score and seven years ago our fathers brought forth on this continent, a new nation, conceived in Liberty, and dedicated
+to the proposition that all men are created equal. Now we are engaged in a great civil war, testing whether that nation, or
+any nation so conceived and so dedicated, can long endure. We are met on a great battle-field of that war. We have come to
+dedicate a portion of that field, as a final resting place for those who here gave their lives that that nation might live.
+It is altogether fitting and proper that we should do this.  But, in a larger sense, we can not dedicate -- we can not
+consecrate -- we can not hallow -- this ground. The brave men, living and dead, who struggled here, have consecrated it,
+far above our poor power to add or detract. The world will little note, nor long remember what we say here, but it can never
+forget what they did here. It is for us the living, rather, to be dedicated here to the unfinished work which they who fought
+here have thus far so nobly advanced. It is rather for us to be here dedicated to the great task remaining before us -- that
+from these honored dead we take increased devotion to that cause for which they gave the last full measure of devotion -- that
+we here highly resolve that these dead shall not have died in vain -- that this nation, under God, shall have a new birth of
+freedom -- and that government of the people, by the people, for the people, shall not perish from the earth.
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/text/issue129_2.txt b/java-diff-utils/src/test/resources/com/github/difflib/text/issue129_2.txt
new file mode 100644
index 00000000..50a051e3
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/text/issue129_2.txt
@@ -0,0 +1,13 @@
+Four score and seven years ago our fathers brought forth on this continent, a new nation, conceived in Liberty, and
+dedicated to the proposition that all men are created equal. Now we are engaged in a great civil war, testing whether
+that nation, or any nation so conceived and so dedicated, can long endure. We are met on a great battle-field of that
+war. We have come to dedicate a portion of that field, as a final resting place for those who here gave their lives
+that that nation might live. It is altogether fitting and proper that we should do this.  But, in a larger sense, we
+can not dedicate -- we can not consecrate -- we can not hallow -- this ground. The brave men, living and dead, who
+struggled here, have consecrated it, far above our poor power to add or detract. The world will little note, nor long
+remember what we say here, but it can never forget what they did here. It is for us the living, rather, to be dedicated
+here to the unfinished work which they who fought here have thus far so nobly advanced. It is rather for us to be here
+dedicated to the great task remaining before us -- that from these honored dead we take increased devotion to that cause
+for which they gave the last full measure of devotion -- that we here highly resolve that these dead shall not have died
+in vain -- that this nation, under God, shall have a new birth of freedom -- and that government of the people, by the
+people, for the people, shall not perish from the earth.

From e73742c4fcb46308a69e64f91dd871132b39d22e Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 23 Jul 2022 01:29:37 +0200
Subject: [PATCH 203/266]

---
 .github/release.yml                           |  8 ++++
 .../UnifiedDiffRoundTripNewLineTest.java      | 46 +++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 .github/release.yml
 create mode 100644 java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripNewLineTest.java

diff --git a/.github/release.yml b/.github/release.yml
new file mode 100644
index 00000000..b9134ea9
--- /dev/null
+++ b/.github/release.yml
@@ -0,0 +1,8 @@
+changelog:
+  categories:
+    - title: Bugs solved
+      labels:
+        - "bug"  
+    - title: Changes and new Features
+      labels:
+        - "*"
\ No newline at end of file
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripNewLineTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripNewLineTest.java
new file mode 100644
index 00000000..725e0e2a
--- /dev/null
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripNewLineTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2022 java-diff-utils.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.difflib.unifieddiff;
+
+import com.github.difflib.patch.PatchFailedException;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import static java.util.stream.Collectors.joining;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+@Disabled("for next release")
+public class UnifiedDiffRoundTripNewLineTest {
+    @Test
+    public void testIssue135MissingNoNewLineInPatched() throws IOException, PatchFailedException {
+        String beforeContent = "rootProject.name = \"sample-repo\"";
+        String afterContent = "rootProject.name = \"sample-repo\"\n";
+        String patch = "diff --git a/settings.gradle b/settings.gradle\n" +
+        "index ef3b8e2..ab30124 100644\n" +
+        "--- a/settings.gradle\n" +
+        "+++ b/settings.gradle\n" +
+        "@@ -1 +1 @@\n" +
+        "-rootProject.name = \"sample-repo\"\n" +
+        "\\ No newline at end of file\n" +
+        "+rootProject.name = \"sample-repo\"\n";
+        UnifiedDiff unifiedDiff = UnifiedDiffReader.parseUnifiedDiff(new ByteArrayInputStream(patch.getBytes()));
+        String unifiedAfterContent = unifiedDiff.getFiles().get(0).getPatch()
+                .applyTo(Arrays.asList(beforeContent.split("\n"))).stream().collect(joining("\n"));
+        assertEquals(afterContent, unifiedAfterContent);
+    }
+}

From 0fd3bd8e061eed09dbb937c8ab9ba0969ba12264 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 23 Jul 2022 01:33:40 +0200
Subject: [PATCH 204/266] [maven-release-plugin] prepare release
 java-diff-utils-parent-4.12

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index eadc1cfb..5a62171e 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.12-SNAPSHOT
+        4.12
     
     java-diff-utils-jgit
     java-diff-utils-jgit
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index e9e78f76..921f62cb 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -7,7 +7,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.12-SNAPSHOT
+        4.12
     
     
         UTF-8
diff --git a/pom.xml b/pom.xml
index 40cdd391..45e903cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.12-SNAPSHOT
+    4.12
     java-diff-utils-parent
     pom
     
@@ -29,7 +29,7 @@
         scm:git:https://github.com/java-diff-utils/java-diff-utils.git
         scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
         https://github.com/java-diff-utils/java-diff-utils.git
-        HEAD
+        java-diff-utils-parent-4.12
     
     
         GitHub Issues

From a1f170eaa0d957211cb5acffc2691c2cca14d253 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 23 Jul 2022 01:33:41 +0200
Subject: [PATCH 205/266] [maven-release-plugin] prepare for next development
 iteration

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index 5a62171e..78b35257 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.12
+        4.13-SNAPSHOT
     
     java-diff-utils-jgit
     java-diff-utils-jgit
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index 921f62cb..c18e88b0 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -7,7 +7,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.12
+        4.13-SNAPSHOT
     
     
         UTF-8
diff --git a/pom.xml b/pom.xml
index 45e903cc..52b653da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.12
+    4.13-SNAPSHOT
     java-diff-utils-parent
     pom
     
@@ -29,7 +29,7 @@
         scm:git:https://github.com/java-diff-utils/java-diff-utils.git
         scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
         https://github.com/java-diff-utils/java-diff-utils.git
-        java-diff-utils-parent-4.12
+        HEAD
     
     
         GitHub Issues

From 912be299daad21b03919e6847ff42d6b8b03ceb2 Mon Sep 17 00:00:00 2001
From: Michael Lesniak 
Date: Tue, 16 Aug 2022 18:52:41 +0200
Subject: [PATCH 206/266] Update README.md (#153)

Update minor version in example.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cfe763bf..c3ad16ee 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,7 @@ Just add the code below to your maven dependencies:
 
     io.github.java-diff-utils
     java-diff-utils
-    4.11
+    4.12
 
 ```
 

From 5aac378e9f42c7f764a78998d2719c3ad87390ca Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Thu, 1 Sep 2022 22:27:09 +0200
Subject: [PATCH 207/266]

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index cfe763bf..f13ad58f 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,7 @@ Just add the code below to your maven dependencies:
 
     io.github.java-diff-utils
     java-diff-utils
-    4.11
+    4.12
 
 ```
 
@@ -97,5 +97,5 @@ or using gradle:
 
 ```groovy
 // https://mvnrepository.com/artifact/io.github.java-diff-utils/java-diff-utils
-implementation "io.github.java-diff-utils:java-diff-utils:4.11"
+implementation "io.github.java-diff-utils:java-diff-utils:4.12"
 ```

From 7d0fd54f665e6d5489f54174402be518ba2fd401 Mon Sep 17 00:00:00 2001
From: andre161292 
Date: Thu, 1 Sep 2022 23:08:39 +0200
Subject: [PATCH 208/266] Added ability to apply patch to existing list inplace
 (#152)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Added ability to apply patch to existing list inplace

* Corrected typo 'verifyAntApplyTo'

* Added restoreToExisting method as opposite to applyToExisting

Co-authored-by: André Dörscheln 
---
 .../github/difflib/patch/AbstractDelta.java   |  2 +-
 .../java/com/github/difflib/patch/Patch.java  | 49 ++++++++++++++-----
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
index a315e010..f74f62ca 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
@@ -58,7 +58,7 @@ protected VerifyChunk verifyChunkToFitTarget(List target) throws PatchFailedE
         return getSource().verifyChunk(target);
     }
    
-    protected VerifyChunk verifyAntApplyTo(List target) throws PatchFailedException {
+    protected VerifyChunk verifyAndApplyTo(List target) throws PatchFailedException {
         final VerifyChunk verify = verifyChunkToFitTarget(target);
         if (verify == VerifyChunk.OK) {
             applyTo(target);
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
index 5e3e51f8..aaff7d94 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
@@ -48,22 +48,35 @@ public Patch(int estimatedPatchSize) {
     }
 
     /**
-     * Apply this patch to the given target
+     * Creates a new list, the patch is being applied to.
      *
-     * @return the patched text
-     * @throws PatchFailedException if can't apply patch
+     * @param target The list to apply the changes to.
+     * @return A new list containing the applied patch.
+     * @throws PatchFailedException if the patch cannot be applied
      */
     public List applyTo(List target) throws PatchFailedException {
         List result = new ArrayList<>(target);
+        applyToExisting(result);
+        return result;
+    }
+
+    /**
+     * Applies the patch to the supplied list.
+     *
+     * @param target The list to apply the changes to. This list has to be modifiable,
+     *               otherwise exceptions may be thrown, depending on the used type of list.
+     * @throws PatchFailedException if the patch cannot be applied
+     * @throws RuntimeException (or similar) if the list is not modifiable.
+     */
+    public void applyToExisting(List target) throws PatchFailedException {
         ListIterator> it = getDeltas().listIterator(deltas.size());
         while (it.hasPrevious()) {
             AbstractDelta delta = it.previous();
-            VerifyChunk valid = delta.verifyAntApplyTo(result);
+            VerifyChunk valid = delta.verifyAndApplyTo(target);
             if (valid != VerifyChunk.OK) {
-                conflictOutput.processConflict(valid, delta, result);
+                conflictOutput.processConflict(valid, delta, target);
             }
         }
-        return result;
     }
 
     private static class PatchApplyingContext {
@@ -220,19 +233,33 @@ public Patch withConflictOutput(ConflictOutput conflictOutput) {
     }
 
     /**
-     * Restore the text to original. Opposite to applyTo() method.
+     * Creates a new list, containing the restored state of the given list.
+     * Opposite to {@link #applyTo(List)} method.
      *
-     * @param target the given target
-     * @return the restored text
+     * @param target The list to copy and apply changes to.
+     * @return A new list, containing the restored state.
      */
     public List restore(List target) {
         List result = new ArrayList<>(target);
+        restoreToExisting(result);
+        return result;
+    }
+
+
+    /**
+     * Restores all changes within the given list.
+     * Opposite to {@link #applyToExisting(List)} method.
+     *
+     * @param target The list to restore changes in. This list has to be modifiable,
+     *               otherwise exceptions may be thrown, depending on the used type of list.
+     * @throws RuntimeException (or similar) if the list is not modifiable.
+     */
+    public void restoreToExisting(List target) {
         ListIterator> it = getDeltas().listIterator(deltas.size());
         while (it.hasPrevious()) {
             AbstractDelta delta = it.previous();
-            delta.restore(result);
+            delta.restore(target);
         }
-        return result;
     }
 
     /**

From 2224a15ecfc3bbfd15b9f2d90a23964b27813944 Mon Sep 17 00:00:00 2001
From: Tobias 
Date: Sat, 10 Sep 2022 22:01:24 +0200
Subject: [PATCH 209/266] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f13ad58f..ca25196b 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Main reason to build this library was the lack of easy-to-use libraries with all
 
 ## API
 
-Javadocs of the actual release version: [JavaDocs java-diff-utils](https://java-diff-utils.github.io/java-diff-utils/4.7/docs/api/)
+Javadocs of the actual release version: [JavaDocs java-diff-utils](https://java-diff-utils.github.io/java-diff-utils/4.10/docs/api/)
 
 ## Examples
 

From 5aed9f2d9a298347cbd2735e6f0e32bf5555528a Mon Sep 17 00:00:00 2001
From: Tobias 
Date: Sat, 10 Sep 2022 22:03:10 +0200
Subject: [PATCH 210/266] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ca25196b..5999e79d 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Main reason to build this library was the lack of easy-to-use libraries with all
 
 ## API
 
-Javadocs of the actual release version: [JavaDocs java-diff-utils](https://java-diff-utils.github.io/java-diff-utils/4.10/docs/api/)
+Javadocs of the actual release version: [JavaDocs java-diff-utils](https://java-diff-utils.github.io/java-diff-utils/4.10/docs/apidocs/)
 
 ## Examples
 

From 4cad0ea2b9c67e3e44847fb3d929141330a71634 Mon Sep 17 00:00:00 2001
From: Goooler 
Date: Sun, 11 Sep 2022 04:29:30 +0800
Subject: [PATCH 211/266] Optimize CI a bit (#155)

---
 .github/workflows/maven.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index f8d96999..e57857f3 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -14,13 +14,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix: 
-        java: [8, 11]
+        java: [8, 11, 17]
     name: Java ${{ matrix.java }} building ... 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Java ${{ matrix.java }} 
-      uses: actions/setup-java@v1
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v3
       with:
-        java-version: ${{ matrix.java }} 
+        distribution: 'zulu'
+        java-version: ${{ matrix.java }}
+        cache: 'maven'
     - name: Build with Maven
       run: mvn -B package --file pom.xml
\ No newline at end of file

From dc5ecb8dedbcaa8d72789b46a53e155c9ae87284 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 20 Nov 2022 12:04:13 +0100
Subject: [PATCH 212/266] fixes #159

---
 CHANGELOG.md                                         |  4 +++-
 .../src/main/java/com/github/difflib/DiffUtils.java  |  6 +++---
 .../myers/{MeyersDiff.java => MyersDiff.java}        | 12 ++++++------
 ...inearSpace.java => MyersDiffWithLinearSpace.java} | 10 +++++-----
 .../test/java/com/github/difflib/DiffUtilsTest.java  |  2 +-
 .../difflib/algorithm/myers/MyersDiffTest.java       |  4 ++--
 ...ceTest.java => MyersDiffWithLinearSpaceTest.java} |  8 ++++----
 ...va => WithMyersDiffWithLinearSpacePatchTest.java} | 12 ++++++------
 .../patch/PatchWithAllDiffAlgorithmsTest.java        | 11 +++++------
 ...MeyerDiffTest.java => PatchWithMyerDiffTest.java} |  2 +-
 ...ava => PatchWithMyerDiffWithLinearSpaceTest.java} | 10 +++++-----
 11 files changed, 41 insertions(+), 40 deletions(-)
 rename java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/{MeyersDiff.java => MyersDiff.java} (95%)
 rename java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/{MeyersDiffWithLinearSpace.java => MyersDiffWithLinearSpace.java} (96%)
 rename java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/{MeyersDiffWithLinearSpaceTest.java => MyersDiffWithLinearSpaceTest.java} (90%)
 rename java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/{WithMeyersDiffWithLinearSpacePatchTest.java => WithMyersDiffWithLinearSpacePatchTest.java} (97%)
 rename java-diff-utils/src/test/java/com/github/difflib/patch/{PatchWithMeyerDiffTest.java => PatchWithMyerDiffTest.java} (98%)
 rename java-diff-utils/src/test/java/com/github/difflib/patch/{PatchWithMeyerDiffWithLinearSpaceTest.java => PatchWithMyerDiffWithLinearSpaceTest.java} (85%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f5dab30..1c817822 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 This project uses a custom versioning scheme (and not [Semantic Versioning](https://semver.org/spec/v2.0.0.html)).
 
-## [unreleased]
+## [4.13]
+
+* API change: due to Issue #159: the author of the algorithm is Eugene Myers, therefore classes and methods were renamed accordingly
 
 ### Changed
 
diff --git a/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
index 44a8cff6..493d905b 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
@@ -18,7 +18,7 @@
 import com.github.difflib.algorithm.DiffAlgorithmFactory;
 import com.github.difflib.algorithm.DiffAlgorithmI;
 import com.github.difflib.algorithm.DiffAlgorithmListener;
-import com.github.difflib.algorithm.myers.MeyersDiff;
+import com.github.difflib.algorithm.myers.MyersDiff;
 import com.github.difflib.patch.AbstractDelta;
 import com.github.difflib.patch.Patch;
 import com.github.difflib.patch.PatchFailedException;
@@ -37,7 +37,7 @@ public final class DiffUtils {
     /**
      * This factory generates the DEFAULT_DIFF algorithm for all these routines.
      */
-    static DiffAlgorithmFactory DEFAULT_DIFF = MeyersDiff.factory();
+    static DiffAlgorithmFactory DEFAULT_DIFF = MyersDiff.factory();
 
     public static void withDefaultDiffAlgorithmFactory(DiffAlgorithmFactory factory) {
         DEFAULT_DIFF = factory;
@@ -95,7 +95,7 @@ public static  Patch diff(List source, List target,
             return DiffUtils.diff(source, target,
                     DEFAULT_DIFF.create(equalizer));
         }
-        return DiffUtils.diff(source, target, new MeyersDiff<>());
+        return DiffUtils.diff(source, target, new MyersDiff<>());
     }
 
     public static  Patch diff(List original, List revised,
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiff.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java
similarity index 95%
rename from java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiff.java
rename to java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java
index 7daa91d2..54ffed91 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiff.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java
@@ -27,17 +27,17 @@
 import java.util.function.BiPredicate;
 
 /**
- * A clean-room implementation of Eugene Meyers greedy differencing algorithm.
+ * A clean-room implementation of Eugene Myers greedy differencing algorithm.
  */
-public final class MeyersDiff implements DiffAlgorithmI {
+public final class MyersDiff implements DiffAlgorithmI {
 
     private final BiPredicate equalizer;
 
-    public MeyersDiff() {
+    public MyersDiff() {
         equalizer = Object::equals;
     }
 
-    public MeyersDiff(final BiPredicate equalizer) {
+    public MyersDiff(final BiPredicate equalizer) {
         Objects.requireNonNull(equalizer, "equalizer must not be null");
         this.equalizer = equalizer;
     }
@@ -187,13 +187,13 @@ public static DiffAlgorithmFactory factory() {
             @Override
             public  DiffAlgorithmI 
             create() {
-                return new MeyersDiff();
+                return new MyersDiff();
             }
 
             @Override
             public  DiffAlgorithmI 
             create(BiPredicate < T, T > equalizer) {
-                return new MeyersDiff(equalizer);
+                return new MyersDiff(equalizer);
             }
         };
     }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiffWithLinearSpace.java
similarity index 96%
rename from java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java
rename to java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiffWithLinearSpace.java
index bb3577f8..6d4451b0 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiffWithLinearSpace.java
@@ -30,15 +30,15 @@
  *
  * @author tw
  */
-public class MeyersDiffWithLinearSpace implements DiffAlgorithmI {
+public class MyersDiffWithLinearSpace implements DiffAlgorithmI {
 
     private final BiPredicate equalizer;
 
-    public MeyersDiffWithLinearSpace() {
+    public MyersDiffWithLinearSpace() {
         equalizer = Object::equals;
     }
 
-    public MeyersDiffWithLinearSpace(final BiPredicate equalizer) {
+    public MyersDiffWithLinearSpace(final BiPredicate equalizer) {
         Objects.requireNonNull(equalizer, "equalizer must not be null");
         this.equalizer = equalizer;
     }
@@ -231,13 +231,13 @@ public static DiffAlgorithmFactory factory() {
             @Override
             public  DiffAlgorithmI 
             create() {
-                return new MeyersDiffWithLinearSpace();
+                return new MyersDiffWithLinearSpace();
             }
 
             @Override
             public  DiffAlgorithmI 
             create(BiPredicate < T, T > equalizer) {
-                return new MeyersDiffWithLinearSpace(equalizer);
+                return new MyersDiffWithLinearSpace(equalizer);
             }
         };
     }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java b/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
index 000b095a..a753a513 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
@@ -132,7 +132,7 @@ public void testDiffMissesChangeForkDnaumenkoIssue31() {
     }
 
     /**
-     * To test this, the greedy meyer algorithm is not suitable.
+     * To test this, the greedy Myer algorithm is not suitable.
      */
     @Test
     @Disabled
diff --git a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java
index 10db0e43..1e233a8c 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java
@@ -34,7 +34,7 @@ public class MyersDiffTest {
     public void testDiffMyersExample1Forward() {
         List original = Arrays.asList("A", "B", "C", "A", "B", "B", "A");
         List revised = Arrays.asList("C", "B", "A", "B", "A", "C");
-        final Patch patch = Patch.generate(original, revised, new MeyersDiff().computeDiff(original, revised, null));
+        final Patch patch = Patch.generate(original, revised, new MyersDiff().computeDiff(original, revised, null));
         assertNotNull(patch);
         assertEquals(4, patch.getDeltas().size());
         assertEquals("Patch{deltas=[[DeleteDelta, position: 0, lines: [A, B]], [InsertDelta, position: 3, lines: [B]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]}", patch.toString());
@@ -47,7 +47,7 @@ public void testDiffMyersExample1ForwardWithListener() {
         
         List logdata = new ArrayList<>();
         final Patch patch = Patch.generate(original, revised, 
-                new MeyersDiff().computeDiff(original, revised, new DiffAlgorithmListener() {
+                new MyersDiff().computeDiff(original, revised, new DiffAlgorithmListener() {
             @Override
             public void diffStart() {
                 logdata.add("start");
diff --git a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpaceTest.java b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffWithLinearSpaceTest.java
similarity index 90%
rename from java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpaceTest.java
rename to java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffWithLinearSpaceTest.java
index 7a10f1f1..b63876ac 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpaceTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffWithLinearSpaceTest.java
@@ -30,13 +30,13 @@
  *
  * @author tw
  */
-public class MeyersDiffWithLinearSpaceTest {
+public class MyersDiffWithLinearSpaceTest {
     
     @Test
     public void testDiffMyersExample1Forward() {
         List original = Arrays.asList("A", "B", "C", "A", "B", "B", "A");
         List revised = Arrays.asList("C", "B", "A", "B", "A", "C");
-        final Patch patch = Patch.generate(original, revised, new MeyersDiffWithLinearSpace().computeDiff(original, revised, null));
+        final Patch patch = Patch.generate(original, revised, new MyersDiffWithLinearSpace().computeDiff(original, revised, null));
         assertNotNull(patch);
         System.out.println(patch);
         assertEquals(5, patch.getDeltas().size());
@@ -50,7 +50,7 @@ public void testDiffMyersExample1ForwardWithListener() {
         
         List logdata = new ArrayList<>();
         final Patch patch = Patch.generate(original, revised, 
-                new MeyersDiffWithLinearSpace().computeDiff(original, revised, new DiffAlgorithmListener() {
+                new MyersDiffWithLinearSpace().computeDiff(original, revised, new DiffAlgorithmListener() {
             @Override
             public void diffStart() {
                 logdata.add("start");
@@ -84,7 +84,7 @@ public void testPerformanceProblemsIssue124() {
                     .collect(toList());
          
         long start = System.currentTimeMillis();
-        Patch diff = DiffUtils.diff(old, newl, new MeyersDiffWithLinearSpace());
+        Patch diff = DiffUtils.diff(old, newl, new MyersDiffWithLinearSpace());
         long end = System.currentTimeMillis();
         System.out.println("Finished in " + (end - start) + "ms and resulted " + diff.getDeltas().size() + " deltas");
     }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMeyersDiffWithLinearSpacePatchTest.java b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMyersDiffWithLinearSpacePatchTest.java
similarity index 97%
rename from java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMeyersDiffWithLinearSpacePatchTest.java
rename to java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMyersDiffWithLinearSpacePatchTest.java
index 65ea1839..522eff58 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMeyersDiffWithLinearSpacePatchTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMyersDiffWithLinearSpacePatchTest.java
@@ -22,14 +22,14 @@
 
 import com.github.difflib.DiffUtils;
 
-public class WithMeyersDiffWithLinearSpacePatchTest {
+public class WithMyersDiffWithLinearSpacePatchTest {
 
     @Test
     public void testPatch_Insert() {
         final List insertTest_from = Arrays.asList("hhh");
         final List insertTest_to = Arrays.asList("hhh", "jjj", "kkk", "lll");
 
-        final Patch patch = DiffUtils.diff(insertTest_from, insertTest_to, new MeyersDiffWithLinearSpace());
+        final Patch patch = DiffUtils.diff(insertTest_from, insertTest_to, new MyersDiffWithLinearSpace());
         try {
             assertEquals(insertTest_to, DiffUtils.patch(insertTest_from, patch));
         } catch (PatchFailedException e) {
@@ -42,7 +42,7 @@ public void testPatch_Delete() {
         final List deleteTest_from = Arrays.asList("ddd", "fff", "ggg", "hhh");
         final List deleteTest_to = Arrays.asList("ggg");
 
-        final Patch patch = DiffUtils.diff(deleteTest_from, deleteTest_to, new MeyersDiffWithLinearSpace());
+        final Patch patch = DiffUtils.diff(deleteTest_from, deleteTest_to, new MyersDiffWithLinearSpace());
         try {
             assertEquals(deleteTest_to, DiffUtils.patch(deleteTest_from, patch));
         } catch (PatchFailedException e) {
@@ -55,7 +55,7 @@ public void testPatch_Change() {
         final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
         final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
 
-        final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to, new MeyersDiffWithLinearSpace());
+        final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to, new MyersDiffWithLinearSpace());
         try {
             assertEquals(changeTest_to, DiffUtils.patch(changeTest_from, patch));
         } catch (PatchFailedException e) {
@@ -166,7 +166,7 @@ public void testPatch_Serializable() throws IOException, ClassNotFoundException
         final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
         final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
 
-        final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to, new MeyersDiffWithLinearSpace());
+        final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to, new MyersDiffWithLinearSpace());
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ObjectOutputStream out = new ObjectOutputStream(baos);
         out.writeObject(patch);
@@ -189,7 +189,7 @@ public void testPatch_Change_withExceptionProcessor() {
         final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
         final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
 
-        final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to, new MeyersDiffWithLinearSpace());
+        final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to, new MyersDiffWithLinearSpace());
 
         changeTest_from.set(2, "CDC");
 
diff --git a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithAllDiffAlgorithmsTest.java b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithAllDiffAlgorithmsTest.java
index 82e72294..a9731514 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithAllDiffAlgorithmsTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithAllDiffAlgorithmsTest.java
@@ -14,8 +14,8 @@
 
 import com.github.difflib.DiffUtils;
 import com.github.difflib.algorithm.DiffAlgorithmFactory;
-import com.github.difflib.algorithm.myers.MeyersDiff;
-import com.github.difflib.algorithm.myers.MeyersDiffWithLinearSpace;
+import com.github.difflib.algorithm.myers.MyersDiff;
+import com.github.difflib.algorithm.myers.MyersDiffWithLinearSpace;
 import java.util.stream.Stream;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -25,14 +25,13 @@
 public class PatchWithAllDiffAlgorithmsTest {
 
     private static Stream provideAlgorithms() {
-        return Stream.of(
-                Arguments.of(MeyersDiff.factory()), 
-                Arguments.of(MeyersDiffWithLinearSpace.factory()));
+        return Stream.of(Arguments.of(MyersDiff.factory()), 
+                Arguments.of(MyersDiffWithLinearSpace.factory()));
     }
     
     @AfterAll
     public static void afterAll() {
-        DiffUtils.withDefaultDiffAlgorithmFactory(MeyersDiff.factory());
+        DiffUtils.withDefaultDiffAlgorithmFactory(MyersDiff.factory());
     }
 
     @ParameterizedTest
diff --git a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMeyerDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMyerDiffTest.java
similarity index 98%
rename from java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMeyerDiffTest.java
rename to java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMyerDiffTest.java
index 98f4f6eb..97dc20fb 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMeyerDiffTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMyerDiffTest.java
@@ -28,7 +28,7 @@
  *
  * @author tw
  */
-public class PatchWithMeyerDiffTest {
+public class PatchWithMyerDiffTest {
 
     @Test
     public void testPatch_Change_withExceptionProcessor() {
diff --git a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMeyerDiffWithLinearSpaceTest.java b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMyerDiffWithLinearSpaceTest.java
similarity index 85%
rename from java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMeyerDiffWithLinearSpaceTest.java
rename to java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMyerDiffWithLinearSpaceTest.java
index 8a62992e..2cc334ad 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMeyerDiffWithLinearSpaceTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMyerDiffWithLinearSpaceTest.java
@@ -16,8 +16,8 @@
 package com.github.difflib.patch;
 
 import com.github.difflib.DiffUtils;
-import com.github.difflib.algorithm.myers.MeyersDiff;
-import com.github.difflib.algorithm.myers.MeyersDiffWithLinearSpace;
+import com.github.difflib.algorithm.myers.MyersDiff;
+import com.github.difflib.algorithm.myers.MyersDiffWithLinearSpace;
 import java.util.Arrays;
 import java.util.List;
 import org.junit.jupiter.api.AfterAll;
@@ -30,16 +30,16 @@
  *
  * @author tw
  */
-public class PatchWithMeyerDiffWithLinearSpaceTest {
+public class PatchWithMyerDiffWithLinearSpaceTest {
 
     @BeforeAll
     public static void setupClass() {
-        DiffUtils.withDefaultDiffAlgorithmFactory(MeyersDiffWithLinearSpace.factory());
+        DiffUtils.withDefaultDiffAlgorithmFactory(MyersDiffWithLinearSpace.factory());
     }
 
     @AfterAll
     public static void resetClass() {
-        DiffUtils.withDefaultDiffAlgorithmFactory(MeyersDiff.factory());
+        DiffUtils.withDefaultDiffAlgorithmFactory(MyersDiff.factory());
     }
 
     @Test

From 9f88cf91fba746da96f66ed110745e3deec10121 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Wed, 4 Jan 2023 21:53:00 +0100
Subject: [PATCH 213/266] added some example code into the readme examples

---
 README.md | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/README.md b/README.md
index 5999e79d..5dd7d5d4 100644
--- a/README.md
+++ b/README.md
@@ -30,10 +30,46 @@ These two outputs are generated using this java-diff-utils. The source code can
 
 **Producing a one liner including all difference information.**
 
+```Java
+//create a configured DiffRowGenerator
+DiffRowGenerator generator = DiffRowGenerator.create()
+                .showInlineDiffs(true)
+                .mergeOriginalRevised(true)
+                .inlineDiffByWord(true)
+                .oldTag(f -> "~")      //introduce markdown style for strikethrough
+                .newTag(f -> "**")     //introduce markdown style for bold
+                .build();
+
+//compute the differences for two test texts.
+List rows = generator.generateDiffRows(
+                Arrays.asList("This is a test senctence."),
+                Arrays.asList("This is a test for diffutils."));
+        
+System.out.println(rows.get(0).getOldLine());
+```
+
 This is a test ~senctence~**for diffutils**.
 
 **Producing a side by side view of computed differences.**
 
+```Java
+DiffRowGenerator generator = DiffRowGenerator.create()
+                .showInlineDiffs(true)
+                .inlineDiffByWord(true)
+                .oldTag(f -> "~")
+                .newTag(f -> "**")
+                .build();
+List rows = generator.generateDiffRows(
+                Arrays.asList("This is a test senctence.", "This is the second line.", "And here is the finish."),
+                Arrays.asList("This is a test for diffutils.", "This is the second line."));
+        
+System.out.println("|original|new|");
+System.out.println("|--------|---|");
+for (DiffRow row : rows) {
+    System.out.println("|" + row.getOldLine() + "|" + row.getNewLine() + "|");
+}
+```
+
 |original|new|
 |--------|---|
 |This is a test ~senctence~.|This is a test **for diffutils**.|

From 02532a9720a9560e8f3ae039837cf960a6338e3e Mon Sep 17 00:00:00 2001
From: Mohammad Ali Al Salti <48101123+mhamadli@users.noreply.github.com>
Date: Tue, 21 Mar 2023 23:54:11 +0300
Subject: [PATCH 214/266] Update JavaDoc for DiffUtils class (#163)

---
 .../java/com/github/difflib/DiffUtils.java    | 119 +++++++++++-------
 1 file changed, 73 insertions(+), 46 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
index 493d905b..8917772b 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
@@ -30,7 +30,7 @@
 import java.util.function.BiPredicate;
 
 /**
- * Implements the difference and patching engine
+ * Utility class to implement the difference and patching engine.
  */
 public final class DiffUtils {
 
@@ -39,38 +39,63 @@ public final class DiffUtils {
      */
     static DiffAlgorithmFactory DEFAULT_DIFF = MyersDiff.factory();
 
+    /**
+     * Sets the default diff algorithm factory to be used by all diff routines.
+     *
+     * @param factory a {@link DiffAlgorithmFactory} represnting the new default diff algorithm factory.
+     */
     public static void withDefaultDiffAlgorithmFactory(DiffAlgorithmFactory factory) {
         DEFAULT_DIFF = factory;
     }
 
     /**
-     * Computes the difference between the original and revised list of elements
-     * with default diff algorithm
+     * Computes the difference between two sequences of elements using the default diff algorithm.
      *
-     * @param  types to be diffed
-     * @param original The original text. Must not be {@code null}.
-     * @param revised The revised text. Must not be {@code null}.
-     * @param progress progress listener
-     * @return The patch describing the difference between the original and
-     * revised sequences. Never {@code null}.
+     * @param  a generic representing the type of the elements to be compared.
+     * @param original a {@link List} represnting the original sequence of elements. Must not be {@code null}.
+     * @param revised a {@link List} represnting the revised sequence of elements. Must not be {@code null}.
+     * @param progress a {@link DiffAlgorithmListener} represnting the progress listener. Can be {@code null}.
+     * @return The patch describing the difference between the original and revised sequences. Never {@code null}.
      */
     public static  Patch diff(List original, List revised, DiffAlgorithmListener progress) {
         return DiffUtils.diff(original, revised, DEFAULT_DIFF.create(), progress);
     }
 
+    /**
+     * Computes the difference between two sequences of elements using the default diff algorithm.
+     *
+     * @param  a generic representing the type of the elements to be compared.
+     * @param original a {@link List} represnting the original sequence of elements. Must not be {@code null}.
+     * @param revised a {@link List} represnting the revised sequence of elements. Must not be {@code null}.
+     * @return The patch describing the difference between the original and revised sequences. Never {@code null}.
+     */
     public static  Patch diff(List original, List revised) {
         return DiffUtils.diff(original, revised, DEFAULT_DIFF.create(), null);
     }
 
+    /**
+     * Computes the difference between two sequences of elements using the default diff algorithm.
+     *
+     * @param  a generic representing the type of the elements to be compared.
+     * @param original a {@link List} represnting the original sequence of elements. Must not be {@code null}.
+     * @param revised a {@link List} represnting the revised sequence of elements. Must not be {@code null}.
+     * @param includeEqualParts a {@link boolean} represnting whether to include equal parts in the resulting patch.
+     * @return The patch describing the difference between the original and revised sequences. Never {@code null}.
+     */
     public static  Patch diff(List original, List revised, boolean includeEqualParts) {
         return DiffUtils.diff(original, revised, DEFAULT_DIFF.create(), null, includeEqualParts);
     }
 
     /**
-     * Computes the difference between the original and revised text.
+     * Computes the difference between two strings using the default diff algorithm.
+     *
+     * @param sourceText a {@link String} represnting the original string. Must not be {@code null}.
+     * @param targetText a {@link String} represnting the revised string. Must not be {@code null}.
+     * @param progress a {@link DiffAlgorithmListener} represnting the progress listener. Can be {@code null}.
+     * @return The patch describing the difference between the original and revised strings. Never {@code null}.
      */
     public static Patch diff(String sourceText, String targetText,
-            DiffAlgorithmListener progress) {
+                                     DiffAlgorithmListener progress) {
         return DiffUtils.diff(
                 Arrays.asList(sourceText.split("\n")),
                 Arrays.asList(targetText.split("\n")), progress);
@@ -80,17 +105,16 @@ public static Patch diff(String sourceText, String targetText,
      * Computes the difference between the original and revised list of elements
      * with default diff algorithm
      *
-     * @param source The original text. Must not be {@code null}.
-     * @param target The revised text. Must not be {@code null}.
-     *
-     * @param equalizer the equalizer object to replace the default compare
+     * @param source a {@link List} represnting the original text. Must not be {@code null}.
+     * @param target a {@link List} represnting the revised text. Must not be {@code null}.
+     * @param equalizer a {@link BiPredicate} represnting the equalizer object to replace the default compare
      * algorithm (Object.equals). If {@code null} the default equalizer of the
-     * default algorithm is used..
+     * default algorithm is used.
      * @return The patch describing the difference between the original and
      * revised sequences. Never {@code null}.
      */
     public static  Patch diff(List source, List target,
-            BiPredicate equalizer) {
+                                    BiPredicate equalizer) {
         if (equalizer != null) {
             return DiffUtils.diff(source, target,
                     DEFAULT_DIFF.create(equalizer));
@@ -99,7 +123,7 @@ public static  Patch diff(List source, List target,
     }
 
     public static  Patch diff(List original, List revised,
-            DiffAlgorithmI algorithm, DiffAlgorithmListener progress) {
+                                    DiffAlgorithmI algorithm, DiffAlgorithmListener progress) {
         return diff(original, revised, algorithm, progress, false);
     }
 
@@ -107,17 +131,17 @@ public static  Patch diff(List original, List revised,
      * Computes the difference between the original and revised list of elements
      * with default diff algorithm
      *
-     * @param original The original text. Must not be {@code null}.
-     * @param revised The revised text. Must not be {@code null}.
-     * @param algorithm The diff algorithm. Must not be {@code null}.
-     * @param progress The diff algorithm listener.
+     * @param original a {@link List} represnting the original text. Must not be {@code null}.
+     * @param revised a {@link List} represnting the revised text. Must not be {@code null}.
+     * @param algorithm a {@link DiffAlgorithmI} represnting the diff algorithm. Must not be {@code null}.
+     * @param progress a {@link DiffAlgorithmListener} represnting the diff algorithm listener.
      * @param includeEqualParts Include equal data parts into the patch.
      * @return The patch describing the difference between the original and
      * revised sequences. Never {@code null}.
      */
     public static  Patch diff(List original, List revised,
-            DiffAlgorithmI algorithm, DiffAlgorithmListener progress,
-            boolean includeEqualParts) {
+                                    DiffAlgorithmI algorithm, DiffAlgorithmListener progress,
+                                    boolean includeEqualParts) {
         Objects.requireNonNull(original, "original must not be null");
         Objects.requireNonNull(revised, "revised must not be null");
         Objects.requireNonNull(algorithm, "algorithm must not be null");
@@ -125,13 +149,14 @@ public static  Patch diff(List original, List revised,
         return Patch.generate(original, revised, algorithm.computeDiff(original, revised, progress), includeEqualParts);
     }
 
+
     /**
      * Computes the difference between the original and revised list of elements
      * with default diff algorithm
      *
-     * @param original The original text. Must not be {@code null}.
-     * @param revised The revised text. Must not be {@code null}.
-     * @param algorithm The diff algorithm. Must not be {@code null}.
+     * @param original a {@link List} represnting the original text. Must not be {@code null}.
+     * @param revised a {@link List} represnting the revised text. Must not be {@code null}.
+     * @param algorithm a {@link DiffAlgorithmI} represnting the diff algorithm. Must not be {@code null}.
      * @return The patch describing the difference between the original and
      * revised sequences. Never {@code null}.
      */
@@ -144,9 +169,10 @@ public static  Patch diff(List original, List revised, DiffAlgorithm
      * "trick" to make out of texts lists of characters, like DiffRowGenerator
      * does and merges those changes at the end together again.
      *
-     * @param original
-     * @param revised
-     * @return
+     * @param original a {@link String} represnting the original text. Must not be {@code null}.
+     * @param revised a {@link String} represnting the revised text. Must not be {@code null}.
+     * @return The patch describing the difference between the original and
+     * revised sequences. Never {@code null}.
      */
     public static Patch diffInline(String original, String revised) {
         List origList = new ArrayList<>();
@@ -165,20 +191,13 @@ public static Patch diffInline(String original, String revised) {
         return patch;
     }
 
-    private static List compressLines(List lines, String delimiter) {
-        if (lines.isEmpty()) {
-            return Collections.emptyList();
-        }
-        return Collections.singletonList(String.join(delimiter, lines));
-    }
-
     /**
-     * Patch the original text with given patch
+     * Applies the given patch to the original list and returns the revised list.
      *
-     * @param original the original text
-     * @param patch the given patch
-     * @return the revised text
-     * @throws PatchFailedException if can't apply patch
+     * @param original a {@link List} represnting the original list.
+     * @param patch a {@link List} represnting the patch to apply.
+     * @return the revised list.
+     * @throws PatchFailedException if the patch cannot be applied.
      */
     public static  List patch(List original, Patch patch)
             throws PatchFailedException {
@@ -186,16 +205,24 @@ public static  List patch(List original, Patch patch)
     }
 
     /**
-     * Unpatch the revised text for a given patch
+     * Applies the given patch to the revised list and returns the original list.
      *
-     * @param revised the revised text
-     * @param patch the given patch
-     * @return the original text
+     * @param revised a {@link List} represnting the revised list.
+     * @param patch a {@link Patch} represnting the patch to apply.
+     * @return the original list.
+     * @throws PatchFailedException if the patch cannot be applied.
      */
     public static  List unpatch(List revised, Patch patch) {
         return patch.restore(revised);
     }
 
+    private static List compressLines(List lines, String delimiter) {
+        if (lines.isEmpty()) {
+            return Collections.emptyList();
+        }
+        return Collections.singletonList(String.join(delimiter, lines));
+    }
+
     private DiffUtils() {
     }
 }

From 1664490a9fb1f5d896bafb83e38d0795aecefbfd Mon Sep 17 00:00:00 2001
From: xiaohaitang <39946319+1506085843@users.noreply.github.com>
Date: Fri, 28 Apr 2023 04:54:38 +0800
Subject: [PATCH 215/266] Add generateOriginalAndDiff method and test class
 (#164)

* Add generateOriginalAndDiff method and test class

* Add generateOriginalAndDiff method and test class.I split long code into short methods, changed ambiguous variable names to explicit variable names

* fixes #164

* fix build issues
---
 .../com/github/difflib/UnifiedDiffUtils.java  | 151 ++++++++++++++++++
 .../difflib/examples/OriginalAndDiffTest.java |  44 +++++
 2 files changed, 195 insertions(+)
 create mode 100644 java-diff-utils/src/test/java/com/github/difflib/examples/OriginalAndDiffTest.java

diff --git a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
index 06a61073..e926560d 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
@@ -19,11 +19,15 @@
 import com.github.difflib.patch.Chunk;
 import com.github.difflib.patch.AbstractDelta;
 import com.github.difflib.patch.Patch;
+
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  *
@@ -313,4 +317,151 @@ private static List getDeltaText(AbstractDelta delta) {
 
     private UnifiedDiffUtils() {
     }
+
+    /**
+     * Compare the differences between two files and return to the original file and diff format
+     *
+     * (This method compares the original file with the comparison file to obtain a diff, and inserts the diff into the corresponding position of the original file.
+     * You can see all the differences and unmodified places from the original file.
+     * Also, this will be very easy and useful for making side-by-side comparison display applications,
+     * for example, if you use diff2html (https://github.com/rtfpessoa/diff2html#usage)
+     * Wait for tools to display your differences on html pages, you only need to insert the return value into your js code)
+     *
+     * @param original Original file content
+     * @param revised  revised file content
+     *
+     */
+    public static List generateOriginalAndDiff(List original, List revised) {
+        return generateOriginalAndDiff(original, revised, null, null);
+    }
+
+
+    /**
+     * Compare the differences between two files and return to the original file and diff format
+     *
+     * (This method compares the original file with the comparison file to obtain a diff, and inserts the diff into the corresponding position of the original file.
+     * You can see all the differences and unmodified places from the original file.
+     * Also, this will be very easy and useful for making side-by-side comparison display applications,
+     * for example, if you use diff2html (https://github.com/rtfpessoa/diff2html#usage)
+     * Wait for tools to display your differences on html pages, you only need to insert the return value into your js code)
+     *
+     * @param original         Original file content
+     * @param revised          revised file content
+     * @param originalFileName Original file name
+     * @param revisedFileName  revised file name
+     */
+    public static List generateOriginalAndDiff(List original, List revised, String originalFileName, String revisedFileName) {
+        String originalFileNameTemp = originalFileName;
+        String revisedFileNameTemp = originalFileName;
+        if (originalFileNameTemp == null) {
+            originalFileNameTemp = "original";
+        }
+        if (revisedFileNameTemp == null) {
+            revisedFileNameTemp = "revised";
+        }
+        Patch patch = DiffUtils.diff(original, revised);
+        List unifiedDiff = generateUnifiedDiff(originalFileNameTemp, revisedFileNameTemp, original, patch, 0);
+        if (unifiedDiff.isEmpty()) {
+            unifiedDiff.add("--- " + originalFileNameTemp);
+            unifiedDiff.add("+++ " + revisedFileNameTemp);
+            unifiedDiff.add("@@ -0,0 +0,0 @@");
+        } else if (unifiedDiff.size() >= 3 && !unifiedDiff.get(2).contains("@@ -1,")) {
+            unifiedDiff.set(1, unifiedDiff.get(1));
+            unifiedDiff.add(2, "@@ -0,0 +0,0 @@");
+        }
+        List originalWithPrefix = original.stream().map(v -> " " + v).collect(Collectors.toList());
+        return insertOrig(originalWithPrefix, unifiedDiff);
+    }
+
+    //Insert the diff format to the original file
+    private static List insertOrig(List original, List unifiedDiff) {
+        List result = new ArrayList<>();
+        List> diffList = new ArrayList<>();
+        List diff = new ArrayList<>();
+        for (int i = 0; i < unifiedDiff.size(); i++) {
+            String u = unifiedDiff.get(i);
+            if (u.startsWith("@@") && !"@@ -0,0 +0,0 @@".equals(u) && !u.contains("@@ -1,")) {
+                List twoList = new ArrayList<>();
+                twoList.addAll(diff);
+                diffList.add(twoList);
+                diff.clear();
+                diff.add(u);
+                continue;
+            }
+            if (i == unifiedDiff.size() - 1) {
+                diff.add(u);
+                List twoList = new ArrayList<>();
+                twoList.addAll(diff);
+                diffList.add(twoList);
+                diff.clear();
+                break;
+            }
+            diff.add(u);
+        }
+        insertOrig(diffList, result, original);
+        return result;
+    }
+
+    //Insert the diff format to the original file
+    private static void insertOrig(List> diffList, List result, List original) {
+        for (int i = 0; i < diffList.size(); i++) {
+            List diff = diffList.get(i);
+            List nexDiff = i == diffList.size() - 1 ? null : diffList.get(i + 1);
+            String simb = i == 0 ? diff.get(2) : diff.get(0);
+            String nexSimb = nexDiff == null ? null : nexDiff.get(0);
+            insert(result, diff);
+            Map map = getRowMap(simb);
+            if (null != nexSimb) {
+                Map nexMap = getRowMap(nexSimb);
+                int start = 0;
+                if (map.get("orgRow") != 0) {
+                    start = map.get("orgRow") + map.get("orgDel") - 1;
+                }
+                int end = nexMap.get("revRow") - 2;
+                insert(result, getOrigList(original, start, end));
+            }
+            if (simb.contains("@@ -1,") && null == nexSimb && map.get("orgDel") != original.size()) {
+                insert(result, getOrigList(original, 0, original.size() - 1));
+            } else if (null == nexSimb && (map.get("orgRow") + map.get("orgDel") - 1) < original.size()) {
+                int start = map.get("orgRow") + map.get("orgDel") - 1;
+                start = start == -1 ? 0 : start;
+                insert(result, getOrigList(original, start, original.size() - 1));
+            }
+        }
+    }
+
+    //Insert the unchanged content in the source file into result
+    private static void insert(List result, List noChangeContent) {
+        for (String ins : noChangeContent) {
+            result.add(ins);
+        }
+    }
+
+    //Parse the line containing @@ to get the modified line number to delete or add a few lines
+    private static Map getRowMap(String str) {
+        Map map = new HashMap<>();
+        if (str.startsWith("@@")) {
+            String[] sp = str.split(" ");
+            String org = sp[1];
+            String[] orgSp = org.split(",");
+            map.put("orgRow", Integer.valueOf(orgSp[0].substring(1)));
+            map.put("orgDel", Integer.valueOf(orgSp[1]));
+            String[] revSp = org.split(",");
+            map.put("revRow", Integer.valueOf(revSp[0].substring(1)));
+            map.put("revAdd", Integer.valueOf(revSp[1]));
+        }
+        return map;
+    }
+
+    //Get the specified part of the line from the original file
+    private static List getOrigList(List originalWithPrefix, int start, int end) {
+        List list = new ArrayList<>();
+        if (originalWithPrefix.size() >= 1 && start <= end && end < originalWithPrefix.size()) {
+            int startTemp = start;
+            for (; startTemp <= end; startTemp++) {
+                list.add(originalWithPrefix.get(startTemp));
+            }
+        }
+        return list;
+    }
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/examples/OriginalAndDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/examples/OriginalAndDiffTest.java
new file mode 100644
index 00000000..7f2d3b29
--- /dev/null
+++ b/java-diff-utils/src/test/java/com/github/difflib/examples/OriginalAndDiffTest.java
@@ -0,0 +1,44 @@
+package com.github.difflib.examples;
+
+import com.github.difflib.TestConstants;
+import com.github.difflib.UnifiedDiffUtils;
+import org.junit.jupiter.api.Test;
+
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.util.stream.Collectors.joining;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class OriginalAndDiffTest {
+
+    @Test
+    public void testGenerateOriginalAndDiff()  {
+        List origLines = null;
+        List revLines = null;
+        try {
+            origLines = fileToLines(TestConstants.MOCK_FOLDER + "original.txt");
+            revLines = fileToLines(TestConstants.MOCK_FOLDER + "revised.txt");
+        } catch (IOException e) {
+            fail(e.getMessage());
+        }
+
+        List originalAndDiff = UnifiedDiffUtils.generateOriginalAndDiff(origLines, revLines);
+        System.out.println(originalAndDiff.stream().collect(joining("\n")));
+    }
+
+    public static List fileToLines(String filename) throws FileNotFoundException, IOException {
+        List lines = new ArrayList<>();
+        String line = "";
+        try (BufferedReader in = new BufferedReader(new FileReader(filename))) {
+            while ((line = in.readLine()) != null) {
+                lines.add(line);
+            }
+        }
+        return lines;
+    }
+}

From 281c073c56a0cd0052963562e007c51ce2994983 Mon Sep 17 00:00:00 2001
From: xiaohaitang <39946319+1506085843@users.noreply.github.com>
Date: Mon, 14 Aug 2023 03:55:34 +0800
Subject: [PATCH 216/266] A problem was found and fixed about #164 (#170)

* Add generateOriginalAndDiff method and test class

* Add generateOriginalAndDiff method and test class.I split long code into short methods, changed ambiguous variable names to explicit variable names

* fixes #164

* fix build issues

* fix issues about (#164),detail:
When deleting the first line of comparison text and adding several lines of text, the first diff of the result returned by the generateOriginalAndDiff method is inserted incorrectly

* add a test for #170

---------

Co-authored-by: xutao 
---
 .../com/github/difflib/UnifiedDiffUtils.java  |   6 +-
 .../difflib/examples/OriginalAndDiffTest.java |  15 +++
 .../resources/mocks/issue_170_original.txt    |  95 +++++++++++++++
 .../resources/mocks/issue_170_revised.txt     | 114 ++++++++++++++++++
 4 files changed, 227 insertions(+), 3 deletions(-)
 create mode 100644 java-diff-utils/src/test/resources/mocks/issue_170_original.txt
 create mode 100644 java-diff-utils/src/test/resources/mocks/issue_170_revised.txt

diff --git a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
index e926560d..727008db 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
@@ -420,11 +420,11 @@ private static void insertOrig(List> diffList, List result,
                 int end = nexMap.get("revRow") - 2;
                 insert(result, getOrigList(original, start, end));
             }
+            int start = map.get("orgRow") + map.get("orgDel") - 1;
+            start = start == -1 ? 0 : start;
             if (simb.contains("@@ -1,") && null == nexSimb && map.get("orgDel") != original.size()) {
-                insert(result, getOrigList(original, 0, original.size() - 1));
+                insert(result, getOrigList(original, start, original.size() - 1));
             } else if (null == nexSimb && (map.get("orgRow") + map.get("orgDel") - 1) < original.size()) {
-                int start = map.get("orgRow") + map.get("orgDel") - 1;
-                start = start == -1 ? 0 : start;
                 insert(result, getOrigList(original, start, original.size() - 1));
             }
         }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/examples/OriginalAndDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/examples/OriginalAndDiffTest.java
index 7f2d3b29..17283b4d 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/examples/OriginalAndDiffTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/examples/OriginalAndDiffTest.java
@@ -31,6 +31,21 @@ public void testGenerateOriginalAndDiff()  {
         System.out.println(originalAndDiff.stream().collect(joining("\n")));
     }
 
+    @Test
+    public void testGenerateOriginalAndDiffFirstLineChange()  {
+        List origLines = null;
+        List revLines = null;
+        try {
+            origLines = fileToLines(TestConstants.MOCK_FOLDER + "issue_170_original.txt");
+            revLines = fileToLines(TestConstants.MOCK_FOLDER + "issue_170_revised.txt");
+        } catch (IOException e) {
+            fail(e.getMessage());
+        }
+
+        List originalAndDiff = UnifiedDiffUtils.generateOriginalAndDiff(origLines, revLines);
+        System.out.println(originalAndDiff.stream().collect(joining("\n")));
+    }
+
     public static List fileToLines(String filename) throws FileNotFoundException, IOException {
         List lines = new ArrayList<>();
         String line = "";
diff --git a/java-diff-utils/src/test/resources/mocks/issue_170_original.txt b/java-diff-utils/src/test/resources/mocks/issue_170_original.txt
new file mode 100644
index 00000000..8aa703f0
--- /dev/null
+++ b/java-diff-utils/src/test/resources/mocks/issue_170_original.txt
@@ -0,0 +1,95 @@
+//According to the original text, an html will be generated by comparing the text
+public class generateDiffHtmlTest {
+    /**
+     * Here's a simple example of getting a nice html page based on the original text and the contrasted text,Read n1.txt and n2.txt of D disk, and finally generate an html file
+     *
+     */
+    @Test
+    public static void generateOriginalAndDiffDemo(){
+        List origLines = getFileContent("D:\\n1.txt");
+        List revLines =getFileContent("D:\\n2.txt");
+        List originalAndDiff =UnifiedDiffUtils.generateOriginalAndDiff(origLines, revLines);
+        //System.out.println(originalAndDiff.size());
+        generateDiffHtml(originalAndDiff,"D:\\diff.html");
+    }
+
+    /**
+     * get file content
+     * @param filePath file path
+     */
+    public static List getFileContent(String filePath) {
+        //origin
+        List fileContent =null;
+        File file = new File(filePath);
+        try {
+            fileContent = Files.readAllLines(file.toPath());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return fileContent;
+    }
+
+    /**
+     * The html file is generated by the difference diff between the two files, and the detailed content of the file comparison can be seen by opening the html file
+     *
+     */
+    public static void generateDiffHtml(List diffString, String htmlPath) {
+        StringBuilder builder = new StringBuilder();
+        for (String line : diffString) {
+            builder.append(line);
+            builder.append("\n");
+        }
+        String githubCss = "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.1/styles/github.min.css";
+        String diff2htmlCss = "https://cdn.jsdelivr.net/npm/diff2html/bundles/css/diff2html.min.css";
+        String diff2htmlJs = "https://cdn.jsdelivr.net/npm/diff2html/bundles/js/diff2html-ui.min.js";
+
+        String template = "\n" +
+                "\n" +
+                "  \n" +
+                "    \n" +
+                "    \n" +
+                "     \n" +
+                "    \n" +
+                "  \n" +
+                "  \n" +
+                "  \n" +
+                "    
\n" +
+                "  \n" +
+                "";
+        template = template.replace("temp", builder.toString());
+        FileWriter fileWriter = null;
+        try {
+            fileWriter = new FileWriter(htmlPath);
+            BufferedWriter buf = new BufferedWriter(fileWriter);
+            buf.write(template);
+            buf.close();
+            fileWriter.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+}
diff --git a/java-diff-utils/src/test/resources/mocks/issue_170_revised.txt b/java-diff-utils/src/test/resources/mocks/issue_170_revised.txt
new file mode 100644
index 00000000..7aa91dc2
--- /dev/null
+++ b/java-diff-utils/src/test/resources/mocks/issue_170_revised.txt
@@ -0,0 +1,114 @@
+package com.github.difflib.examples;
+
+import com.github.difflib.UnifiedDiffUtils;
+import org.junit.jupiter.api.Test;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.List;
+
+// According to the original text, an html will be generated by comparing the text.
+public class generateDiffHtmlTest {
+
+    /**
+     * Here's a simple example of getting a nice html page based on the original text and the contrasted text,
+     * Read n1.txt and n2.txt of D disk, and finally generate an html file
+     *
+     */
+    @Test
+    public static void generateOriginalAndDiffDemo(){
+        List origLines = getFileContent("D:\\n1.txt");
+        List revLines = getFileContent("D:\\n2.txt");
+        List originalAndDiff =  UnifiedDiffUtils.generateOriginalAndDiff(origLines, revLines);
+
+        //generateDiffHtml
+        generateDiffHtml(originalAndDiff,"D:\\diff.html");
+    }
+
+    /**
+     * get file content
+     *
+     * @param filePath file path
+     */
+    public static List getFileContent(String filePath) {
+        //原始文件
+        List fileContent = null;
+        File file = new File(filePath);
+        try {
+            fileContent = Files.readAllLines(file.toPath());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return fileContent;
+    }
+
+    /**
+     * The html file is generated by the difference diff between the two files,
+     * and the detailed content of the file comparison can be seen by opening the html file
+     *
+     * @param diffString The comparison result obtained by calling the above diffString method
+     * @param htmlPath   Generated html path，e.g:/user/var/mbos/ent/21231/diff.html
+     */
+    public static void generateDiffHtml(List diffString, String htmlPath) {
+        StringBuilder builder = new StringBuilder();
+        for (String line : diffString) {
+            builder.append(line);
+            builder.append("\n");
+        }
+        String githubCss = "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.1/styles/github.min.css";
+        String diff2htmlCss = "https://cdn.jsdelivr.net/npm/diff2html/bundles/css/diff2html.min.css";
+        String diff2htmlJs = "https://cdn.jsdelivr.net/npm/diff2html/bundles/js/diff2html-ui.min.js";
+
+        String template = "\n" +
+                "\n" +
+                "  \n" +
+                "    \n" +
+                "    \n" +
+                "     \n" +
+                "    \n" +
+                "  \n" +
+                "  \n" +
+                "  \n" +
+                "    
\n" +
+                "  \n" +
+                "";
+        template = template.replace("temp", builder.toString());
+        FileWriter fileWriter = null;
+        try {
+            fileWriter = new FileWriter(htmlPath);
+            BufferedWriter buf = new BufferedWriter(fileWriter);
+            buf.write(template);
+            buf.close();
+            fileWriter.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}
+

From 8df690fdd20d6c89e86ac36299bf678002ae14ad Mon Sep 17 00:00:00 2001
From: "Pierre Baillet (Oct)"
 <88319985+pierrebailletsonos@users.noreply.github.com>
Date: Wed, 22 Nov 2023 08:44:30 +0100
Subject: [PATCH 217/266] Typo on diff author's name (#176)

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 5dd7d5d4..70dfa521 100644
--- a/README.md
+++ b/README.md
@@ -85,13 +85,13 @@ for (DiffRow row : rows) {
 * producing human-readable differences
 * inline difference construction
 * Algorithms:
-  * Meyers Standard Algorithm
-  * Meyers with linear space improvement
+  * Myers Standard Algorithm
+  * Myers with linear space improvement
   * HistogramDiff using JGit Library
 
 ### Algorithms
 
-* Meyer's diff
+* Myer's diff
 * HistogramDiff
 
 But it can easily replaced by any other which is better for handing your texts. I have plan to add implementation of some in future.

From 54324fb792dd0163bf6d7a4f255cfc08b702dc41 Mon Sep 17 00:00:00 2001
From: Joao Machado <13315199+machadoit@users.noreply.github.com>
Date: Wed, 28 Feb 2024 21:07:49 +0000
Subject: [PATCH 218/266] Fixes #182 by parsing diffs with 'Binary files'
 (#183)

---
 .../difflib/unifieddiff/UnifiedDiffFile.java  | 45 +++++++++++++++++++
 .../unifieddiff/UnifiedDiffReader.java        | 37 +++++++++++++--
 .../unifieddiff/UnifiedDiffReaderTest.java    | 41 +++++++++++++++++
 .../problem_diff_issue182_add.diff            |  4 ++
 .../problem_diff_issue182_delete.diff         |  4 ++
 .../problem_diff_issue182_edit.diff           |  3 ++
 .../problem_diff_issue182_mode.diff           |  3 ++
 7 files changed, 133 insertions(+), 4 deletions(-)
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue182_add.diff
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue182_delete.diff
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue182_edit.diff
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue182_mode.diff

diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java
index 099f4142..3a9723c6 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java
@@ -33,7 +33,12 @@ public final class UnifiedDiffFile {
     private String toTimestamp;
     private String index;
     private String newFileMode;
+    private String oldMode;
+    private String newMode;
     private String deletedFileMode;
+    private String binaryAdded;
+    private String binaryDeleted;
+    private String binaryEdited;
     private Patch patch = new Patch<>();
     private boolean noNewLineAtTheEndOfTheFile = false;
     private Integer similarityIndex;
@@ -138,6 +143,46 @@ public void setDeletedFileMode(String deletedFileMode) {
         this.deletedFileMode = deletedFileMode;
     }
 
+    public String getOldMode() {
+        return oldMode;
+    }
+
+    public void setOldMode(String oldMode) {
+        this.oldMode = oldMode;
+    }
+
+    public String getNewMode() {
+        return newMode;
+    }
+
+    public void setNewMode(String newMode) {
+        this.newMode = newMode;
+    }
+
+    public String getBinaryAdded() {
+        return binaryAdded;
+    }
+
+    public void setBinaryAdded(String binaryAdded) {
+        this.binaryAdded = binaryAdded;
+    }
+
+    public String getBinaryDeleted() {
+        return binaryDeleted;
+    }
+
+    public void setBinaryDeleted(String binaryDeleted) {
+        this.binaryDeleted = binaryDeleted;
+    }
+
+    public String getBinaryEdited() {
+        return binaryEdited;
+    }
+
+    public void setBinaryEdited(String binaryEdited) {
+        this.binaryEdited = binaryEdited;
+    }
+
     public boolean isNoNewLineAtTheEndOfTheFile() {
         return noNewLineAtTheEndOfTheFile;
     }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
index 0ac22ce8..7306904c 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
@@ -55,7 +55,11 @@ public final class UnifiedDiffReader {
     private final UnifiedDiffLine NEW_FILE_MODE = new UnifiedDiffLine(true, "^new\\sfile\\smode\\s(\\d+)", this::processNewFileMode);
 
     private final UnifiedDiffLine DELETED_FILE_MODE = new UnifiedDiffLine(true, "^deleted\\sfile\\smode\\s(\\d+)", this::processDeletedFileMode);
-
+    private final UnifiedDiffLine OLD_MODE = new UnifiedDiffLine(true, "^old\\smode\\s(\\d+)", this::processOldMode);
+    private final UnifiedDiffLine NEW_MODE = new UnifiedDiffLine(true, "^new\\smode\\s(\\d+)", this::processNewMode);
+    private final UnifiedDiffLine BINARY_ADDED = new UnifiedDiffLine(true, "^Binary\\sfiles\\s/dev/null\\sand\\sb/(.+)\\sdiffer", this::processBinaryAdded);
+    private final UnifiedDiffLine BINARY_DELETED = new UnifiedDiffLine(true, "^Binary\\sfiles\\sa/(.+)\\sand\\s/dev/null\\sdiffer", this::processBinaryDeleted);
+    private final UnifiedDiffLine BINARY_EDITED = new UnifiedDiffLine(true, "^Binary\\sfiles\\sa/(.+)\\sand\\sb/(.+)\\sdiffer", this::processBinaryEdited);
     private final UnifiedDiffLine CHUNK = new UnifiedDiffLine(false, UNIFIED_DIFF_CHUNK_REGEXP, this::processChunk);
     private final UnifiedDiffLine LINE_NORMAL = new UnifiedDiffLine("^\\s", this::processNormalLine);
     private final UnifiedDiffLine LINE_DEL = new UnifiedDiffLine("^-", this::processDelLine);
@@ -99,8 +103,10 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
                 if (validLine(line, DIFF_COMMAND, SIMILARITY_INDEX, INDEX,
                             FROM_FILE, TO_FILE,
                             RENAME_FROM, RENAME_TO,
-                            NEW_FILE_MODE, DELETED_FILE_MODE, 
-                            CHUNK)) {
+                            NEW_FILE_MODE, DELETED_FILE_MODE,
+                            OLD_MODE, NEW_MODE,
+                            BINARY_ADDED, BINARY_DELETED,
+                            BINARY_EDITED, CHUNK)) {
                     break;
                 } else {
                     headerTxt += line + "\n";
@@ -116,7 +122,10 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
                     if (!processLine(line, DIFF_COMMAND, SIMILARITY_INDEX, INDEX,
                             FROM_FILE, TO_FILE,
                             RENAME_FROM, RENAME_TO,
-                            NEW_FILE_MODE, DELETED_FILE_MODE)) {
+                            NEW_FILE_MODE, DELETED_FILE_MODE,
+                            OLD_MODE, NEW_MODE,
+                            BINARY_ADDED , BINARY_DELETED,
+                            BINARY_EDITED)) {
                         throw new UnifiedDiffParserException("expected file start line not found");
                     }
                     line = READER.readLine();
@@ -346,6 +355,26 @@ private void processDeletedFileMode(MatchResult match, String line) {
         actualFile.setDeletedFileMode(match.group(1));
     }
 
+    private void processOldMode(MatchResult match, String line) {
+        actualFile.setOldMode(match.group(1));
+    }
+
+    private void processNewMode(MatchResult match, String line) {
+        actualFile.setNewMode(match.group(1));
+    }
+
+    private void processBinaryAdded(MatchResult match, String line) {
+        actualFile.setBinaryAdded(match.group(1));
+    }
+
+    private void processBinaryDeleted(MatchResult match, String line) {
+        actualFile.setBinaryDeleted(match.group(1));
+    }
+
+    private void processBinaryEdited(MatchResult match, String line) {
+        actualFile.setBinaryEdited(match.group(1));
+    }
+
     private String extractFileName(String _line) {
         Matcher matcher = TIMESTAMP_REGEXP.matcher(_line);
         String line = _line;
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
index dcf32182..1c0552a2 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -394,4 +394,45 @@ public void testParseIssue141() throws IOException {
         assertThat(file1.getFromFile()).isEqualTo("a.txt");
         assertThat(file1.getToFile()).isEqualTo("a1.txt");
     }
+
+    @Test
+    public void testParseIssue182_add() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue182_add.diff"));
+
+        UnifiedDiffFile file1 = diff.getFiles().get(0);
+
+        assertThat(file1.getBinaryAdded()).isEqualTo("some-image.png");
+    }
+
+    @Test
+    public void testParseIssue182_delete() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue182_delete.diff"));
+
+        UnifiedDiffFile file1 = diff.getFiles().get(0);
+
+        assertThat(file1.getBinaryDeleted()).isEqualTo("some-image.png");
+    }
+
+    @Test
+    public void testParseIssue182_edit() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue182_edit.diff"));
+
+        UnifiedDiffFile file1 = diff.getFiles().get(0);
+
+        assertThat(file1.getBinaryEdited()).isEqualTo("some-image.png");
+    }
+
+    @Test
+    public void testParseIssue182_mode() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue182_mode.diff"));
+
+        UnifiedDiffFile file1 = diff.getFiles().get(0);
+
+        assertThat(file1.getOldMode()).isEqualTo("100644");
+        assertThat(file1.getNewMode()).isEqualTo("100755");
+    }
 }
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue182_add.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue182_add.diff
new file mode 100644
index 00000000..0c165456
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue182_add.diff
@@ -0,0 +1,4 @@
+diff --git a/some-image.png b/some-image.png
+new file mode 100644
+index 0000000..bc3b5b4
+Binary files /dev/null and b/some-image.png differ
\ No newline at end of file
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue182_delete.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue182_delete.diff
new file mode 100644
index 00000000..6543eed7
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue182_delete.diff
@@ -0,0 +1,4 @@
+diff --git a/some-image.png b/some-image.png
+deleted file mode 100644
+index 0e68078..0000000
+Binary files a/some-image.png and /dev/null differ
\ No newline at end of file
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue182_edit.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue182_edit.diff
new file mode 100644
index 00000000..7df4fc60
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue182_edit.diff
@@ -0,0 +1,3 @@
+diff --git a/some-image.png b/some-image.png
+index bc3b5b4..0e68078 100644
+Binary files a/some-image.png and b/some-image.png differ
\ No newline at end of file
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue182_mode.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue182_mode.diff
new file mode 100644
index 00000000..8f0e6e7d
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue182_mode.diff
@@ -0,0 +1,3 @@
+diff --git a/some-image.png b/some-image.png
+old mode 100644
+new mode 100755
\ No newline at end of file

From 50da99fed0ff93bd7ef00bd3ed57c87833617127 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Wed, 28 Feb 2024 22:09:46 +0100
Subject: [PATCH 219/266] corrected some naming problems

---
 .../github/difflib/unifieddiff/UnifiedDiffReaderTest.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
index 1c0552a2..431f7b06 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -396,7 +396,7 @@ public void testParseIssue141() throws IOException {
     }
 
     @Test
-    public void testParseIssue182_add() throws IOException {
+    public void testParseIssue182add() throws IOException {
         UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
                 UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue182_add.diff"));
 
@@ -406,7 +406,7 @@ public void testParseIssue182_add() throws IOException {
     }
 
     @Test
-    public void testParseIssue182_delete() throws IOException {
+    public void testParseIssue182delete() throws IOException {
         UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
                 UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue182_delete.diff"));
 
@@ -416,7 +416,7 @@ public void testParseIssue182_delete() throws IOException {
     }
 
     @Test
-    public void testParseIssue182_edit() throws IOException {
+    public void testParseIssue182edit() throws IOException {
         UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
                 UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue182_edit.diff"));
 
@@ -426,7 +426,7 @@ public void testParseIssue182_edit() throws IOException {
     }
 
     @Test
-    public void testParseIssue182_mode() throws IOException {
+    public void testParseIssue182mode() throws IOException {
         UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
                 UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue182_mode.diff"));
 

From 6279142d0acdc679a2ccc4ca006ce44766ea85c4 Mon Sep 17 00:00:00 2001
From: Sophiah Ho 
Date: Wed, 3 Apr 2024 01:35:40 -0400
Subject: [PATCH 220/266] Clarify what this parameter does without reference to
 internal logic, which also fixes the typo (#186)

---
 .../main/java/com/github/difflib/text/DiffRowGenerator.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
index 9dbf052b..3ff34774 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
@@ -492,11 +492,10 @@ public Builder ignoreWhiteSpaces(boolean val) {
         }
 
         /**
-         * Give the originial old and new text lines to Diffrow without any
-         * additional processing and without any tags to highlight the change.
+         * Report all lines without markup on the old or new text.
          *
          * @param val the value to set. Default: false.
-         * @return builder with configured reportLinesUnWrapped parameter
+         * @return builder with configured reportLinesUnchanged parameter
          */
         public Builder reportLinesUnchanged(final boolean val) {
             reportLinesUnchanged = val;

From ba60ae8ca471193fd99ed00247b9533d903008a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 Apr 2024 07:18:35 +0200
Subject: [PATCH 221/266] Bump org.eclipse.jgit:org.eclipse.jgit in
 /java-diff-utils-jgit (#187)

Bumps org.eclipse.jgit:org.eclipse.jgit from 5.8.1.202007141445-r to 5.13.3.202401111512-r.

---
updated-dependencies:
- dependency-name: org.eclipse.jgit:org.eclipse.jgit
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 java-diff-utils-jgit/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index 78b35257..6d0fbdd2 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -20,7 +20,7 @@
         
             org.eclipse.jgit
             org.eclipse.jgit
-            5.8.1.202007141445-r
+            5.13.3.202401111512-r
             
                 
                     com.googlecode.javaewah

From 903982517a747d012639c85bdbe05721f88b86d9 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sun, 7 Jul 2024 02:20:31 +0200
Subject: [PATCH 222/266] added a testcase

---
 .../com/github/difflib/DiffUtilsTest.java     | 12 +++++++++
 .../text/issue_189_delete_original.txt        | 19 ++++++++++++++
 .../difflib/text/issue_189_delete_revised.txt | 13 ++++++++++
 .../text/issue_189_insert_original.txt        | 19 ++++++++++++++
 .../difflib/text/issue_189_insert_revised.txt | 25 +++++++++++++++++++
 5 files changed, 88 insertions(+)
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/text/issue_189_delete_original.txt
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/text/issue_189_delete_revised.txt
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/text/issue_189_insert_original.txt
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/text/issue_189_insert_revised.txt

diff --git a/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java b/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
index a753a513..3a4a6995 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
@@ -13,6 +13,8 @@
 import java.io.InputStreamReader;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -227,4 +229,14 @@ public void testDiff_ProblemIssue42() {
         assertEquals(new Chunk<>(3, Arrays.asList("brown")), delta.getSource());
         assertEquals(new Chunk<>(3, Arrays.asList("down")), delta.getTarget());
     }
+    
+    @Test
+    public void testDiffPatchIssue189Problem() throws IOException {
+        String original = new String(Files.readAllBytes(Paths.get("target/test-classes/com/github/difflib/text/issue_189_insert_original.txt")));
+        String revised = new String(Files.readAllBytes(Paths.get("target/test-classes/com/github/difflib/text/issue_189_insert_revised.txt")));
+        
+        Patch patch = DiffUtils.diff(Arrays.asList(original.split("\n")), Arrays.asList(revised.split("\n")));
+        
+        assertEquals(1, patch.getDeltas().size());
+    }
 }
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/text/issue_189_delete_original.txt b/java-diff-utils/src/test/resources/com/github/difflib/text/issue_189_delete_original.txt
new file mode 100644
index 00000000..a8dcff9b
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/text/issue_189_delete_original.txt
@@ -0,0 +1,19 @@
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut nec mattis ipsum. Aliquam faucibus, augue quis faucibus scelerisque, sapien eros consequat erat, in semper quam nisi id ex. In viverra pulvinar tortor, non mollis eros ornare a. Praesent sagittis tincidunt ante, sed vulputate tellus faucibus quis. Sed efficitur, mi eu fringilla lobortis, lacus nisl aliquet ante, nec fermentum felis dui vel nunc. Fusce luctus rutrum ligula, sit amet suscipit est sollicitudin at. Suspendisse convallis ac dui a porttitor. Ut eget efficitur odio. In a facilisis quam, in imperdiet libero. Cras a orci in mi accumsan elementum. Duis at venenatis neque. Sed vel tellus ex.
+
+Nam non velit at nunc tempus cursus ut vel ipsum. Nam nec nisi a nisl pellentesque faucibus ut et purus. Nulla in felis efficitur, facilisis turpis volutpat, consequat nisi. Vivamus ullamcorper euismod ex, et lobortis erat tristique id. Etiam rhoncus ante non eros lacinia, in porttitor lorem blandit. Duis porta malesuada blandit. Suspendisse tincidunt id dolor non semper. Morbi et enim sem. Proin vitae elit purus. Phasellus vel enim eget nisl tristique fringilla ac sit amet leo. In malesuada commodo condimentum. Aliquam erat volutpat. Curabitur et nibh nulla. In accumsan odio vel tortor semper euismod. Vivamus ex orci, elementum id pellentesque nec, blandit imperdiet magna.
+
+Fusce congue lectus pulvinar odio finibus semper. Donec id quam dignissim, suscipit elit pharetra, scelerisque enim. Cras sit amet consectetur nisl. Fusce ornare velit lectus, a volutpat est finibus quis. Vestibulum dui odio, facilisis vel neque eu, blandit placerat purus. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Praesent quis nunc fermentum, rutrum velit nec, feugiat odio. Quisque euismod nunc eu orci pharetra, eu egestas lectus hendrerit. Vivamus interdum, felis ac fringilla volutpat, elit purus rhoncus dui, ac vulputate turpis elit a nunc. Integer et nisl quis sapien euismod tempus. Duis feugiat leo a ipsum aliquam elementum nec non sapien. Mauris egestas lorem fermentum nisi mollis consequat. Donec velit elit, ornare vel erat at, placerat consequat ex.
+
+Sed gravida fermentum sapien, nec finibus odio imperdiet eu. Phasellus ornare non dui ac blandit. Fusce eu tristique dolor. Vivamus non interdum nisl. Mauris feugiat euismod purus sit amet bibendum. Nullam sit amet libero nec dui viverra lobortis. Phasellus quis velit in risus maximus fringilla.
+
+Nullam sed ipsum mollis ante lacinia ornare sed quis massa. Pellentesque finibus accumsan odio commodo fermentum. Morbi malesuada tincidunt tellus sit amet interdum. Cras consequat posuere maximus. In mauris metus, ornare vel augue id, ornare aliquam leo. Sed sapien mauris, laoreet rhoncus pharetra eget, placerat vel quam. Curabitur congue varius tellus vel porttitor. Ut ornare semper sem, et maximus dolor eleifend quis. Ut fringilla est diam, eget euismod justo tempus at. Nulla egestas, dolor a mollis imperdiet, velit ligula porta urna, nec laoreet nisl neque convallis turpis. Nulla non blandit lectus.
+
+Nunc gravida est ipsum, in mattis purus ultrices ac. Cras ultrices nulla interdum, pulvinar urna imperdiet, egestas dui. Morbi vitae euismod ex. In gravida id elit in ullamcorper. Sed nisl lacus, tristique ut dapibus in, mattis tristique quam. Nam pulvinar in purus id lacinia. Nulla faucibus orci elementum neque feugiat cursus. Fusce quis faucibus turpis. Phasellus eleifend rutrum elit, at viverra erat consequat id. Suspendisse vehicula, dui et dapibus tincidunt, metus metus sagittis sapien, ut sagittis neque urna ac lectus. Phasellus eleifend, augue ut facilisis elementum, quam nisi ornare diam, sit amet accumsan leo justo id augue. Aenean feugiat, leo vitae semper rutrum, velit odio vulputate enim, eget finibus dui eros in dui. Aenean aliquet metus sed est malesuada, sit amet posuere purus rutrum. Ut sed iaculis mauris. Proin at arcu congue, auctor diam pulvinar, iaculis magna.
+
+Suspendisse faucibus dapibus nisl, imperdiet tristique nibh lobortis sodales. Integer pretium laoreet dui non molestie. Morbi dignissim sit amet ex at semper. Proin venenatis augue quis magna aliquam, molestie ultricies sem auctor. Nulla ullamcorper eros dolor, at efficitur nunc egestas id. Integer leo eros, suscipit pharetra pharetra fringilla, tempus sed quam. Nam eu fringilla metus. Quisque in dolor turpis.
+
+Integer faucibus ligula at vulputate mattis. Donec in fringilla metus, vel consequat dui. Pellentesque et maximus massa. Aenean iaculis, neque in vestibulum gravida, ligula lorem interdum libero, ut luctus justo purus a neque. Fusce luctus placerat hendrerit. Integer tempor, nibh eget viverra bibendum, massa est lobortis lectus, et pretium mi odio eu justo. Suspendisse et commodo eros. Quisque consectetur quam libero, nec pulvinar nunc lacinia eget. Nunc vulputate blandit risus, vitae viverra ante pharetra id.
+
+Mauris convallis neque id hendrerit elementum. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Curabitur sodales orci felis, rutrum dapibus velit sodales vitae. Donec rhoncus fringilla neque sit amet blandit. Donec vel nisl volutpat, porta ligula a, dignissim massa. Praesent varius, orci a congue lobortis, nisi odio finibus felis, finibus gravida ligula ipsum maximus eros. Vestibulum id diam ac augue lobortis molestie. In hac habitasse platea dictumst. Quisque vulputate maximus gravida. Donec lobortis, velit in tempus cursus, sapien libero cursus ante, at ornare arcu massa id risus. Etiam metus erat, commodo vitae sodales sed, dignissim a metus. Aliquam eros ligula, dictum sit amet quam ullamcorper, iaculis congue quam. Vestibulum sollicitudin interdum enim vel aliquam. Fusce et leo sit amet nibh consectetur fringilla.
+
+Nullam ultrices est tincidunt turpis pellentesque, eget dapibus quam laoreet. Maecenas convallis suscipit nunc sed dignissim. Aliquam ex turpis, congue quis porttitor quis, efficitur nec sapien. Vivamus mattis elementum posuere. Aenean quis eros vitae sapien rhoncus posuere. Donec ultricies elit sed arcu ultrices imperdiet ut quis sem. Nullam sit amet mauris suscipit, porta massa at, porttitor leo. Duis tempor purus nec mollis pretium. Ut bibendum posuere mollis. Nulla vehicula, sapien id bibendum eleifend, ipsum est rhoncus ante, eget pulvinar justo magna a ante. Sed luctus arcu hendrerit, auctor sem ac, rhoncus tellus. Integer eu quam scelerisque, eleifend massa eu, congue sem.
\ No newline at end of file
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/text/issue_189_delete_revised.txt b/java-diff-utils/src/test/resources/com/github/difflib/text/issue_189_delete_revised.txt
new file mode 100644
index 00000000..eb861768
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/text/issue_189_delete_revised.txt
@@ -0,0 +1,13 @@
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut nec mattis ipsum. Aliquam faucibus, augue quis faucibus scelerisque, sapien eros consequat erat, in semper quam nisi id ex. In viverra pulvinar tortor, non mollis eros ornare a. Praesent sagittis tincidunt ante, sed vulputate tellus faucibus quis. Sed efficitur, mi eu fringilla lobortis, lacus nisl aliquet ante, nec fermentum felis dui vel nunc. Fusce luctus rutrum ligula, sit amet suscipit est sollicitudin at. Suspendisse convallis ac dui a porttitor. Ut eget efficitur odio. In a facilisis quam, in imperdiet libero. Cras a orci in mi accumsan elementum. Duis at venenatis neque. Sed vel tellus ex.
+
+Nam non velit at nunc tempus cursus ut vel ipsum. Nam nec nisi a nisl pellentesque faucibus ut et purus. Nulla in felis efficitur, facilisis turpis volutpat, consequat nisi. Vivamus ullamcorper euismod ex, et lobortis erat tristique id. Etiam rhoncus ante non eros lacinia, in porttitor lorem blandit. Duis porta malesuada blandit. Suspendisse tincidunt id dolor non semper. Morbi et enim sem. Proin vitae elit purus. Phasellus vel enim eget nisl tristique fringilla ac sit amet leo. In malesuada commodo condimentum. Aliquam erat volutpat. Curabitur et nibh nulla. In accumsan odio vel tortor semper euismod. Vivamus ex orci, elementum id pellentesque nec, blandit imperdiet magna.
+
+Fusce congue lectus pulvinar odio finibus semper. Donec id quam dignissim, suscipit elit pharetra, scelerisque enim. Cras sit amet consectetur nisl. Fusce ornare velit lectus, a volutpat est finibus quis. Vestibulum dui odio, facilisis vel neque eu, blandit placerat purus. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Praesent quis nunc fermentum, rutrum velit nec, feugiat odio. Quisque euismod nunc eu orci pharetra, eu egestas lectus hendrerit. Vivamus interdum, felis ac fringilla volutpat, elit purus rhoncus dui, ac vulputate turpis elit a nunc. Integer et nisl quis sapien euismod tempus. Duis feugiat leo a ipsum aliquam elementum nec non sapien. Mauris egestas lorem fermentum nisi mollis consequat. Donec velit elit, ornare vel erat at, placerat consequat ex.
+
+Sed gravida fermentum sapien, nec finibus odio imperdiet eu. Phasellus ornare non dui ac blandit. Fusce eu tristique dolor. Vivamus non interdum nisl. Mauris feugiat euismod purus sit amet bibendum. Nullam sit amet libero nec dui viverra lobortis. Phasellus quis velit in risus maximus fringilla.
+
+Nullam sed ipsum mollis ante lacinia ornare sed quis massa. Pellentesque finibus accumsan odio commodo fermentum. Morbi malesuada tincidunt tellus sit amet interdum. Cras consequat posuere maximus. In mauris metus, ornare vel augue id, ornare aliquam leo. Sed sapien mauris, laoreet rhoncus pharetra eget, placerat vel quam. Curabitur congue varius tellus vel porttitor. Ut ornare semper sem, et maximus dolor eleifend quis. Ut fringilla est diam, eget euismod justo tempus at. Nulla egestas, dolor a mollis imperdiet, velit ligula porta urna, nec laoreet nisl neque convallis turpis. Nulla non blandit lectus.
+
+Mauris convallis neque id hendrerit elementum. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Curabitur sodales orci felis, rutrum dapibus velit sodales vitae. Donec rhoncus fringilla neque sit amet blandit. Donec vel nisl volutpat, porta ligula a, dignissim massa. Praesent varius, orci a congue lobortis, nisi odio finibus felis, finibus gravida ligula ipsum maximus eros. Vestibulum id diam ac augue lobortis molestie. In hac habitasse platea dictumst. Quisque vulputate maximus gravida. Donec lobortis, velit in tempus cursus, sapien libero cursus ante, at ornare arcu massa id risus. Etiam metus erat, commodo vitae sodales sed, dignissim a metus. Aliquam eros ligula, dictum sit amet quam ullamcorper, iaculis congue quam. Vestibulum sollicitudin interdum enim vel aliquam. Fusce et leo sit amet nibh consectetur fringilla.
+
+Nullam ultrices est tincidunt turpis pellentesque, eget dapibus quam laoreet. Maecenas convallis suscipit nunc sed dignissim. Aliquam ex turpis, congue quis porttitor quis, efficitur nec sapien. Vivamus mattis elementum posuere. Aenean quis eros vitae sapien rhoncus posuere. Donec ultricies elit sed arcu ultrices imperdiet ut quis sem. Nulla vehicula, sapien id bibendum eleifend, ipsum est rhoncus ante, eget pulvinar justo magna a ante. Sed luctus arcu hendrerit, auctor sem ac, rhoncus tellus. Integer eu quam scelerisque, eleifend massa eu, congue sem.
\ No newline at end of file
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/text/issue_189_insert_original.txt b/java-diff-utils/src/test/resources/com/github/difflib/text/issue_189_insert_original.txt
new file mode 100644
index 00000000..a8dcff9b
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/text/issue_189_insert_original.txt
@@ -0,0 +1,19 @@
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut nec mattis ipsum. Aliquam faucibus, augue quis faucibus scelerisque, sapien eros consequat erat, in semper quam nisi id ex. In viverra pulvinar tortor, non mollis eros ornare a. Praesent sagittis tincidunt ante, sed vulputate tellus faucibus quis. Sed efficitur, mi eu fringilla lobortis, lacus nisl aliquet ante, nec fermentum felis dui vel nunc. Fusce luctus rutrum ligula, sit amet suscipit est sollicitudin at. Suspendisse convallis ac dui a porttitor. Ut eget efficitur odio. In a facilisis quam, in imperdiet libero. Cras a orci in mi accumsan elementum. Duis at venenatis neque. Sed vel tellus ex.
+
+Nam non velit at nunc tempus cursus ut vel ipsum. Nam nec nisi a nisl pellentesque faucibus ut et purus. Nulla in felis efficitur, facilisis turpis volutpat, consequat nisi. Vivamus ullamcorper euismod ex, et lobortis erat tristique id. Etiam rhoncus ante non eros lacinia, in porttitor lorem blandit. Duis porta malesuada blandit. Suspendisse tincidunt id dolor non semper. Morbi et enim sem. Proin vitae elit purus. Phasellus vel enim eget nisl tristique fringilla ac sit amet leo. In malesuada commodo condimentum. Aliquam erat volutpat. Curabitur et nibh nulla. In accumsan odio vel tortor semper euismod. Vivamus ex orci, elementum id pellentesque nec, blandit imperdiet magna.
+
+Fusce congue lectus pulvinar odio finibus semper. Donec id quam dignissim, suscipit elit pharetra, scelerisque enim. Cras sit amet consectetur nisl. Fusce ornare velit lectus, a volutpat est finibus quis. Vestibulum dui odio, facilisis vel neque eu, blandit placerat purus. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Praesent quis nunc fermentum, rutrum velit nec, feugiat odio. Quisque euismod nunc eu orci pharetra, eu egestas lectus hendrerit. Vivamus interdum, felis ac fringilla volutpat, elit purus rhoncus dui, ac vulputate turpis elit a nunc. Integer et nisl quis sapien euismod tempus. Duis feugiat leo a ipsum aliquam elementum nec non sapien. Mauris egestas lorem fermentum nisi mollis consequat. Donec velit elit, ornare vel erat at, placerat consequat ex.
+
+Sed gravida fermentum sapien, nec finibus odio imperdiet eu. Phasellus ornare non dui ac blandit. Fusce eu tristique dolor. Vivamus non interdum nisl. Mauris feugiat euismod purus sit amet bibendum. Nullam sit amet libero nec dui viverra lobortis. Phasellus quis velit in risus maximus fringilla.
+
+Nullam sed ipsum mollis ante lacinia ornare sed quis massa. Pellentesque finibus accumsan odio commodo fermentum. Morbi malesuada tincidunt tellus sit amet interdum. Cras consequat posuere maximus. In mauris metus, ornare vel augue id, ornare aliquam leo. Sed sapien mauris, laoreet rhoncus pharetra eget, placerat vel quam. Curabitur congue varius tellus vel porttitor. Ut ornare semper sem, et maximus dolor eleifend quis. Ut fringilla est diam, eget euismod justo tempus at. Nulla egestas, dolor a mollis imperdiet, velit ligula porta urna, nec laoreet nisl neque convallis turpis. Nulla non blandit lectus.
+
+Nunc gravida est ipsum, in mattis purus ultrices ac. Cras ultrices nulla interdum, pulvinar urna imperdiet, egestas dui. Morbi vitae euismod ex. In gravida id elit in ullamcorper. Sed nisl lacus, tristique ut dapibus in, mattis tristique quam. Nam pulvinar in purus id lacinia. Nulla faucibus orci elementum neque feugiat cursus. Fusce quis faucibus turpis. Phasellus eleifend rutrum elit, at viverra erat consequat id. Suspendisse vehicula, dui et dapibus tincidunt, metus metus sagittis sapien, ut sagittis neque urna ac lectus. Phasellus eleifend, augue ut facilisis elementum, quam nisi ornare diam, sit amet accumsan leo justo id augue. Aenean feugiat, leo vitae semper rutrum, velit odio vulputate enim, eget finibus dui eros in dui. Aenean aliquet metus sed est malesuada, sit amet posuere purus rutrum. Ut sed iaculis mauris. Proin at arcu congue, auctor diam pulvinar, iaculis magna.
+
+Suspendisse faucibus dapibus nisl, imperdiet tristique nibh lobortis sodales. Integer pretium laoreet dui non molestie. Morbi dignissim sit amet ex at semper. Proin venenatis augue quis magna aliquam, molestie ultricies sem auctor. Nulla ullamcorper eros dolor, at efficitur nunc egestas id. Integer leo eros, suscipit pharetra pharetra fringilla, tempus sed quam. Nam eu fringilla metus. Quisque in dolor turpis.
+
+Integer faucibus ligula at vulputate mattis. Donec in fringilla metus, vel consequat dui. Pellentesque et maximus massa. Aenean iaculis, neque in vestibulum gravida, ligula lorem interdum libero, ut luctus justo purus a neque. Fusce luctus placerat hendrerit. Integer tempor, nibh eget viverra bibendum, massa est lobortis lectus, et pretium mi odio eu justo. Suspendisse et commodo eros. Quisque consectetur quam libero, nec pulvinar nunc lacinia eget. Nunc vulputate blandit risus, vitae viverra ante pharetra id.
+
+Mauris convallis neque id hendrerit elementum. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Curabitur sodales orci felis, rutrum dapibus velit sodales vitae. Donec rhoncus fringilla neque sit amet blandit. Donec vel nisl volutpat, porta ligula a, dignissim massa. Praesent varius, orci a congue lobortis, nisi odio finibus felis, finibus gravida ligula ipsum maximus eros. Vestibulum id diam ac augue lobortis molestie. In hac habitasse platea dictumst. Quisque vulputate maximus gravida. Donec lobortis, velit in tempus cursus, sapien libero cursus ante, at ornare arcu massa id risus. Etiam metus erat, commodo vitae sodales sed, dignissim a metus. Aliquam eros ligula, dictum sit amet quam ullamcorper, iaculis congue quam. Vestibulum sollicitudin interdum enim vel aliquam. Fusce et leo sit amet nibh consectetur fringilla.
+
+Nullam ultrices est tincidunt turpis pellentesque, eget dapibus quam laoreet. Maecenas convallis suscipit nunc sed dignissim. Aliquam ex turpis, congue quis porttitor quis, efficitur nec sapien. Vivamus mattis elementum posuere. Aenean quis eros vitae sapien rhoncus posuere. Donec ultricies elit sed arcu ultrices imperdiet ut quis sem. Nullam sit amet mauris suscipit, porta massa at, porttitor leo. Duis tempor purus nec mollis pretium. Ut bibendum posuere mollis. Nulla vehicula, sapien id bibendum eleifend, ipsum est rhoncus ante, eget pulvinar justo magna a ante. Sed luctus arcu hendrerit, auctor sem ac, rhoncus tellus. Integer eu quam scelerisque, eleifend massa eu, congue sem.
\ No newline at end of file
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/text/issue_189_insert_revised.txt b/java-diff-utils/src/test/resources/com/github/difflib/text/issue_189_insert_revised.txt
new file mode 100644
index 00000000..de883ed4
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/text/issue_189_insert_revised.txt
@@ -0,0 +1,25 @@
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut nec mattis ipsum. Aliquam faucibus, augue quis faucibus scelerisque, sapien eros consequat erat, in semper quam nisi id ex. In viverra pulvinar tortor, non mollis eros ornare a. Praesent sagittis tincidunt ante, sed vulputate tellus faucibus quis. Sed efficitur, mi eu fringilla lobortis, lacus nisl aliquet ante, nec fermentum felis dui vel nunc. Fusce luctus rutrum ligula, sit amet suscipit est sollicitudin at. Suspendisse convallis ac dui a porttitor. Ut eget efficitur odio. In a facilisis quam, in imperdiet libero. Cras a orci in mi accumsan elementum. Duis at venenatis neque. Sed vel tellus ex.
+
+Nam non velit at nunc tempus cursus ut vel ipsum. Nam nec nisi a nisl pellentesque faucibus ut et purus. Nulla in felis efficitur, facilisis turpis volutpat, consequat nisi. Vivamus ullamcorper euismod ex, et lobortis erat tristique id. Etiam rhoncus ante non eros lacinia, in porttitor lorem blandit. Duis porta malesuada blandit. Suspendisse tincidunt id dolor non semper. Morbi et enim sem. Proin vitae elit purus. Phasellus vel enim eget nisl tristique fringilla ac sit amet leo. In malesuada commodo condimentum. Aliquam erat volutpat. Curabitur et nibh nulla. In accumsan odio vel tortor semper euismod. Vivamus ex orci, elementum id pellentesque nec, blandit imperdiet magna.
+
+Fusce congue lectus pulvinar odio finibus semper. Donec id quam dignissim, suscipit elit pharetra, scelerisque enim. Cras sit amet consectetur nisl. Fusce ornare velit lectus, a volutpat est finibus quis. Vestibulum dui odio, facilisis vel neque eu, blandit placerat purus. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Praesent quis nunc fermentum, rutrum velit nec, feugiat odio. Quisque euismod nunc eu orci pharetra, eu egestas lectus hendrerit. Vivamus interdum, felis ac fringilla volutpat, elit purus rhoncus dui, ac vulputate turpis elit a nunc. Integer et nisl quis sapien euismod tempus. Duis feugiat leo a ipsum aliquam elementum nec non sapien. Mauris egestas lorem fermentum nisi mollis consequat. Donec velit elit, ornare vel erat at, placerat consequat ex.
+
+Sed gravida fermentum sapien, nec finibus odio imperdiet eu. Phasellus ornare non dui ac blandit. Fusce eu tristique dolor. Vivamus non interdum nisl. Mauris feugiat euismod purus sit amet bibendum. Nullam sit amet libero nec dui viverra lobortis. Phasellus quis velit in risus maximus fringilla.
+
+Nullam sed ipsum mollis ante lacinia ornare sed quis massa. Pellentesque finibus accumsan odio commodo fermentum. Morbi malesuada tincidunt tellus sit amet interdum. Cras consequat posuere maximus. In mauris metus, ornare vel augue id, ornare aliquam leo. Sed sapien mauris, laoreet rhoncus pharetra eget, placerat vel quam. Curabitur congue varius tellus vel porttitor. Ut ornare semper sem, et maximus dolor eleifend quis. Ut fringilla est diam, eget euismod justo tempus at. Nulla egestas, dolor a mollis imperdiet, velit ligula porta urna, nec laoreet nisl neque convallis turpis. Nulla non blandit lectus.
+
+Nunc gravida est ipsum, in mattis purus ultrices ac. Cras ultrices nulla interdum, pulvinar urna imperdiet, egestas dui. Morbi vitae euismod ex. In gravida id elit in ullamcorper. Sed nisl lacus, tristique ut dapibus in, mattis tristique quam. Nam pulvinar in purus id lacinia. Nulla faucibus orci elementum neque feugiat cursus. Fusce quis faucibus turpis. Phasellus eleifend rutrum elit, at viverra erat consequat id. Suspendisse vehicula, dui et dapibus tincidunt, metus metus sagittis sapien, ut sagittis neque urna ac lectus. Phasellus eleifend, augue ut facilisis elementum, quam nisi ornare diam, sit amet accumsan leo justo id augue. Aenean feugiat, leo vitae semper rutrum, velit odio vulputate enim, eget finibus dui eros in dui. Aenean aliquet metus sed est malesuada, sit amet posuere purus rutrum. Ut sed iaculis mauris. Proin at arcu congue, auctor diam pulvinar, iaculis magna.
+
+Sed gravida fermentum sapien, nec finibus odio imperdiet eu. Phasellus ornare non dui ac blandit. Fusce eu tristique dolor. Vivamus non interdum nisl. Mauris feugiat euismod purus sit amet bibendum. Nullam sit amet libero nec dui viverra lobortis. Phasellus quis velit in risus maximus fringilla.
+
+Nullam sed ipsum mollis ante lacinia ornare sed quis massa. Pellentesque finibus accumsan odio commodo fermentum. Morbi malesuada tincidunt tellus sit amet interdum. Cras consequat posuere maximus. In mauris metus, ornare vel augue id, ornare aliquam leo. Sed sapien mauris, laoreet rhoncus pharetra eget, placerat vel quam. Curabitur congue varius tellus vel porttitor. Ut ornare semper sem, et maximus dolor eleifend quis. Ut fringilla est diam, eget euismod justo tempus at. Nulla egestas, dolor a mollis imperdiet, velit ligula porta urna, nec laoreet nisl neque convallis turpis. Nulla non blandit lectus.
+
+Mauris convallis neque id hendrerit elementum. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Curabitur sodales orci felis, rutrum dapibus velit sodales vitae. Donec rhoncus fringilla neque sit amet blandit. Donec vel nisl volutpat, porta ligula a, dignissim massa. Praesent varius, orci a congue lobortis, nisi odio finibus felis, finibus gravida ligula ipsum maximus eros. Vestibulum id diam ac augue lobortis molestie. In hac habitasse platea dictumst. Quisque vulputate maximus gravida. Donec lobortis, velit in tempus cursus, sapien libero cursus ante, at ornare arcu massa id risus. Etiam metus erat, commodo vitae sodales sed, dignissim a metus. Aliquam eros ligula, dictum sit amet quam ullamcorper, iaculis congue quam. Vestibulum sollicitudin interdum enim vel aliquam. Fusce et leo sit amet nibh consectetur fringilla.
+
+Suspendisse faucibus dapibus nisl, imperdiet tristique nibh lobortis sodales. Integer pretium laoreet dui non molestie. Morbi dignissim sit amet ex at semper. Proin venenatis augue quis magna aliquam, molestie ultricies sem auctor. Nulla ullamcorper eros dolor, at efficitur nunc egestas id. Integer leo eros, suscipit pharetra pharetra fringilla, tempus sed quam. Nam eu fringilla metus. Quisque in dolor turpis.
+
+Integer faucibus ligula at vulputate mattis. Donec in fringilla metus, vel consequat dui. Pellentesque et maximus massa. Aenean iaculis, neque in vestibulum gravida, ligula lorem interdum libero, ut luctus justo purus a neque. Fusce luctus placerat hendrerit. Integer tempor, nibh eget viverra bibendum, massa est lobortis lectus, et pretium mi odio eu justo. Suspendisse et commodo eros. Quisque consectetur quam libero, nec pulvinar nunc lacinia eget. Nunc vulputate blandit risus, vitae viverra ante pharetra id.
+
+Mauris convallis neque id hendrerit elementum. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Curabitur sodales orci felis, rutrum dapibus velit sodales vitae. Donec rhoncus fringilla neque sit amet blandit. Donec vel nisl volutpat, porta ligula a, dignissim massa. Praesent varius, orci a congue lobortis, nisi odio finibus felis, finibus gravida ligula ipsum maximus eros. Vestibulum id diam ac augue lobortis molestie. In hac habitasse platea dictumst. Quisque vulputate maximus gravida. Donec lobortis, velit in tempus cursus, sapien libero cursus ante, at ornare arcu massa id risus. Etiam metus erat, commodo vitae sodales sed, dignissim a metus. Aliquam eros ligula, dictum sit amet quam ullamcorper, iaculis congue quam. Vestibulum sollicitudin interdum enim vel aliquam. Fusce et leo sit amet nibh consectetur fringilla.
+
+Nullam ultrices est tincidunt turpis pellentesque, eget dapibus quam laoreet. Maecenas convallis suscipit nunc sed dignissim. Aliquam ex turpis, congue quis porttitor quis, efficitur nec sapien. Vivamus mattis elementum posuere. Aenean quis eros vitae sapien rhoncus posuere. Donec ultricies elit sed arcu ultrices imperdiet ut quis sem. Nullam sit amet mauris suscipit, porta massa at, porttitor leo. Duis tempor purus nec mollis pretium. Ut bibendum posuere mollis. Nulla vehicula, sapien id bibendum eleifend, ipsum est rhoncus ante, eget pulvinar justo magna a ante. Sed luctus arcu hendrerit, auctor sem ac, rhoncus tellus. Integer eu quam scelerisque, eleifend massa eu, congue sem.
\ No newline at end of file

From 5cc2cf4021b2d5dd51394383e86b858ba7662b81 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Tue, 24 Sep 2024 21:20:24 +0200
Subject: [PATCH 223/266] corrected word splitter in DiffRowGenerator

---
 .../src/main/java/com/github/difflib/text/DiffRowGenerator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
index 3ff34774..3711bfb6 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
@@ -67,7 +67,7 @@ public final class DiffRowGenerator {
         return list;
     };
 
-    public static final Pattern SPLIT_BY_WORD_PATTERN = Pattern.compile("\\s+|[,.\\[\\](){}/\\\\*+\\-#]");
+    public static final Pattern SPLIT_BY_WORD_PATTERN = Pattern.compile("\\s+|[,.\\[\\](){}/\\\\*+\\-#<>;:&\\']+");
 
     /**
      * Splitting lines by word to achieve word by word diff checking.

From aff6bfed2953298d031c0b2a5601c6b3da72bfb0 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Tue, 24 Sep 2024 21:46:04 +0200
Subject: [PATCH 224/266] fixes #193 - allow to parse copy commands from a diff

---
 .../difflib/unifieddiff/UnifiedDiffFile.java  | 18 +++++++++++++
 .../unifieddiff/UnifiedDiffReader.java        | 13 ++++++++++
 .../unifieddiff/UnifiedDiffReaderTest.java    | 11 ++++++++
 .../problem_diff_parsing_issue193.diff        | 26 +++++++++++++++++++
 4 files changed, 68 insertions(+)
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_parsing_issue193.diff

diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java
index 3a9723c6..1ae3b7ca 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java
@@ -30,6 +30,8 @@ public final class UnifiedDiffFile {
     private String toFile;
     private String renameFrom;
     private String renameTo;
+    private String copyFrom;
+    private String copyTo;
     private String toTimestamp;
     private String index;
     private String newFileMode;
@@ -119,6 +121,22 @@ public void setRenameTo(String renameTo) {
         this.renameTo = renameTo;
     }
 
+    public String getCopyFrom() {
+        return copyFrom;
+    }
+
+    public void setCopyFrom(String copyFrom) {
+        this.copyFrom = copyFrom;
+    }
+
+    public String getCopyTo() {
+        return copyTo;
+    }
+
+    public void setCopyTo(String copyTo) {
+        this.copyTo = copyTo;
+    }
+
     public static UnifiedDiffFile from(String fromFile, String toFile, Patch patch) {
         UnifiedDiffFile file = new UnifiedDiffFile();
         file.setFromFile(fromFile);
diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
index 7306904c..b3a66ab2 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
@@ -51,6 +51,9 @@ public final class UnifiedDiffReader {
     private final UnifiedDiffLine TO_FILE = new UnifiedDiffLine(true, "^\\+\\+\\+\\s", this::processToFile);
     private final UnifiedDiffLine RENAME_FROM = new UnifiedDiffLine(true, "^rename\\sfrom\\s(.+)$", this::processRenameFrom);
     private final UnifiedDiffLine RENAME_TO = new UnifiedDiffLine(true, "^rename\\sto\\s(.+)$", this::processRenameTo);
+    
+    private final UnifiedDiffLine COPY_FROM = new UnifiedDiffLine(true, "^copy\\sfrom\\s(.+)$", this::processCopyFrom);
+    private final UnifiedDiffLine COPY_TO = new UnifiedDiffLine(true, "^copy\\sto\\s(.+)$", this::processCopyTo);
 
     private final UnifiedDiffLine NEW_FILE_MODE = new UnifiedDiffLine(true, "^new\\sfile\\smode\\s(\\d+)", this::processNewFileMode);
 
@@ -103,6 +106,7 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
                 if (validLine(line, DIFF_COMMAND, SIMILARITY_INDEX, INDEX,
                             FROM_FILE, TO_FILE,
                             RENAME_FROM, RENAME_TO,
+                                  COPY_FROM, COPY_TO,
                             NEW_FILE_MODE, DELETED_FILE_MODE,
                             OLD_MODE, NEW_MODE,
                             BINARY_ADDED, BINARY_DELETED,
@@ -122,6 +126,7 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
                     if (!processLine(line, DIFF_COMMAND, SIMILARITY_INDEX, INDEX,
                             FROM_FILE, TO_FILE,
                             RENAME_FROM, RENAME_TO,
+                            COPY_FROM, COPY_TO,
                             NEW_FILE_MODE, DELETED_FILE_MODE,
                             OLD_MODE, NEW_MODE,
                             BINARY_ADDED , BINARY_DELETED,
@@ -344,6 +349,14 @@ private void processRenameFrom(MatchResult match, String line) {
     private void processRenameTo(MatchResult match, String line) {
         actualFile.setRenameTo(match.group(1));
     }
+    
+    private void processCopyFrom(MatchResult match, String line) {
+        actualFile.setCopyFrom(match.group(1));
+    }
+
+    private void processCopyTo(MatchResult match, String line) {
+        actualFile.setCopyTo(match.group(1));
+    }
 
     private void processNewFileMode(MatchResult match, String line) {
         //initFileIfNecessary();
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
index 431f7b06..3d851561 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -435,4 +435,15 @@ public void testParseIssue182mode() throws IOException {
         assertThat(file1.getOldMode()).isEqualTo("100644");
         assertThat(file1.getNewMode()).isEqualTo("100755");
     }
+    
+    @Test
+    public void testParseIssue193Copy() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_parsing_issue193.diff"));
+
+        UnifiedDiffFile file1 = diff.getFiles().get(0);
+
+        assertThat(file1.getCopyFrom()).isEqualTo("modules/configuration/config/web/pcf/account/AccountContactCV.pcf");
+        assertThat(file1.getCopyTo()).isEqualTo("modules/configuration/config/web/pcf/account/AccountContactCV.default.pcf");
+    }
 }
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_parsing_issue193.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_parsing_issue193.diff
new file mode 100644
index 00000000..15cd6e13
--- /dev/null
+++ b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_parsing_issue193.diff
@@ -0,0 +1,26 @@
+diff --git src://modules/configuration/config/web/pcf/account/AccountContactCV.pcf dst://modules/configuration/config/web/pcf/account/AccountContactCV.default.pcf
+similarity index 99%
+copy from modules/configuration/config/web/pcf/account/AccountContactCV.pcf
+copy to modules/configuration/config/web/pcf/account/AccountContactCV.default.pcf
+index 13efef5778..1a08b0befc 100644
+--- src://modules/configuration/config/web/pcf/account/AccountContactCV.pcf
++++ dst://modules/configuration/config/web/pcf/account/AccountContactCV.default.pcf
+@@ -1,16 +1,17 @@
+ 
+ 
+   
++    id="AccountContactCV"
++    mode="default">
+     
+     
+     
+     
Date: Fri, 27 Sep 2024 23:31:24 +0200
Subject: [PATCH 225/266] introduced a more complicated test which can only be
 solved using the linear space version

---
 .../difflib/algorithm/myers/MyersDiff.java    |   4 +-
 .../myers/MyersDiffWithLinearSpace.java       |   4 +-
 .../difflib/text/DiffRowGeneratorTest.java    |  57 +++++++++++++-----
 .../com/github/difflib/text/test.zip          | Bin 0 -> 110173 bytes
 4 files changed, 47 insertions(+), 18 deletions(-)
 create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/text/test.zip

diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java
index 54ffed91..2517de46 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java
@@ -187,13 +187,13 @@ public static DiffAlgorithmFactory factory() {
             @Override
             public  DiffAlgorithmI 
             create() {
-                return new MyersDiff();
+                return new MyersDiff<>();
             }
 
             @Override
             public  DiffAlgorithmI 
             create(BiPredicate < T, T > equalizer) {
-                return new MyersDiff(equalizer);
+                return new MyersDiff<>(equalizer);
             }
         };
     }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiffWithLinearSpace.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiffWithLinearSpace.java
index 6d4451b0..ca4114c4 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiffWithLinearSpace.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiffWithLinearSpace.java
@@ -231,13 +231,13 @@ public static DiffAlgorithmFactory factory() {
             @Override
             public  DiffAlgorithmI 
             create() {
-                return new MyersDiffWithLinearSpace();
+                return new MyersDiffWithLinearSpace<>();
             }
 
             @Override
             public  DiffAlgorithmI 
             create(BiPredicate < T, T > equalizer) {
-                return new MyersDiffWithLinearSpace(equalizer);
+                return new MyersDiffWithLinearSpace<>(equalizer);
             }
         };
     }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
index 897a37f9..f881c474 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
@@ -1,7 +1,12 @@
 package com.github.difflib.text;
 
+import com.github.difflib.DiffUtils;
+import com.github.difflib.algorithm.myers.MyersDiffWithLinearSpace;
 import java.io.File;
 import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Arrays;
@@ -721,7 +726,7 @@ public void testIssue129WithDeltaDecompression() {
 
         assertThat(txt).isEqualTo("EQUAL EQUAL EQUAL CHANGE INSERT INSERT EQUAL EQUAL EQUAL");
     }
-    
+
     @Test
     public void testIssue129SkipDeltaDecompression() {
         List lines1 = Arrays.asList(
@@ -743,17 +748,17 @@ public void testIssue129SkipDeltaDecompression() {
                 "banana2",
                 "banana3");
         int[] entry = {1};
-        String txt = 
-                DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .decompressDeltas(false)
-                .oldTag((tag, isOpening) -> isOpening ? "==old" + tag + "==>" : "<==old==")
-                .newTag((tag, isOpening) -> isOpening ? "==new" + tag + "==>" : "<==new==")
-                .build()
-                .generateDiffRows(lines1, lines2)
-                .stream()
-                .map(row -> row.getTag().toString())
-                .collect(joining(" "));
+        String txt
+                = DiffRowGenerator.create()
+                        .showInlineDiffs(true)
+                        .decompressDeltas(false)
+                        .oldTag((tag, isOpening) -> isOpening ? "==old" + tag + "==>" : "<==old==")
+                        .newTag((tag, isOpening) -> isOpening ? "==new" + tag + "==>" : "<==new==")
+                        .build()
+                        .generateDiffRows(lines1, lines2)
+                        .stream()
+                        .map(row -> row.getTag().toString())
+                        .collect(joining(" "));
 //                .forEachOrdered(row -> {
 //                    System.out.printf("%4d %-8s %-80s %-80s\n", entry[0]++,
 //                            row.getTag(), row.getOldLine(), row.getNewLine());
@@ -761,7 +766,7 @@ public void testIssue129SkipDeltaDecompression() {
 
         assertThat(txt).isEqualTo("EQUAL EQUAL EQUAL CHANGE CHANGE CHANGE EQUAL EQUAL EQUAL");
     }
-    
+
     @Test
     public void testIssue129SkipWhitespaceChanges() throws IOException {
         String original = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue129_1.txt")).collect(joining("\n"));
@@ -780,9 +785,33 @@ public void testIssue129SkipWhitespaceChanges() throws IOException {
                 Arrays.asList(revised.split("\n")));
 
         assertThat(rows).hasSize(13);
-        
+
         rows.stream()
                 .filter(item -> item.getTag() != DiffRow.Tag.EQUAL)
                 .forEach(System.out::println);
     }
+
+    @Test
+    public void testIssue188HangOnExamples() throws IOException, URISyntaxException {        
+        try (FileSystem zipFs = FileSystems.newFileSystem(Paths.get("target/test-classes/com/github/difflib/text/test.zip"), null);) {
+            List original = Files.readAllLines(zipFs.getPath("old.html"));
+            List revised = Files.readAllLines(zipFs.getPath("new.html"));
+
+            DiffRowGenerator generator = DiffRowGenerator.create()
+                    .lineNormalizer(line -> line)
+                    .showInlineDiffs(true)
+                    .mergeOriginalRevised(true)
+                    .inlineDiffByWord(true)
+                    .decompressDeltas(true)
+                    .oldTag(f -> f ? "" : "")
+                    .newTag(f -> f ? "" : "")
+                    .build();
+
+            //List rows = generator.generateDiffRows(original, revised);
+            List rows = generator.generateDiffRows(original, DiffUtils.diff(original, revised, new MyersDiffWithLinearSpace<>() ));
+        
+            System.out.println(rows);
+        }
+    }
 }
+
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/text/test.zip b/java-diff-utils/src/test/resources/com/github/difflib/text/test.zip
new file mode 100644
index 0000000000000000000000000000000000000000..7b071fcda15a824af0fe38c29196582251aeae10
GIT binary patch
literal 110173
zcmYIv2UL?=)3xO)R}ruvDAj`WA|Sowq5@VxklsXkjnojT1w}fD)PRT}sPx_fD7}h^
z)R-VG^aKb5LJI#$@csU*bs;&NGiPSco;~x#b@lEZ{)hd*fdl^@U=zwWIsX2_*s9)v
z1L`PtuyWvlhdoTv$;aJo#lk(2yC#8#`$A@$>E|@%fHC2pA|IpE%NN>o3eAf$cPvCk
z#gz&^_FowlFfM=76WZL-d%}wA4R7WO8|;qw=k-3>7_FRx*RHlIQPBG^p|)w;zsi`Zewar2nop#RV!p&
z4%ubj#PofaOt09gx8CkAG%rCAXnqYU*Njn?6$>1Q*cHemCa5{E>T=dLQvl_$r*FVC
zG)~K{9zh!%j56H&i9!4#dsV4gK+K3zMo}Tt$Jx?{9ehoEm%Bp-i^$q-s9B#PV+229
z*)nu%p-bL%Z*A7D>^IL|sWowVI10U<2gz{rfa*xrpjv6A%N~0MJQXuUySfQ}9S(9Z
z@<~v|1kYiwUn{#?IXTp+;rdDIZR%8)k=QHe)F-S5aBHD&`>@p9l;cG#PGGc=MzHYVaRTHe_8DIUhkfF
zP#vo2_jW@GGz(vE&%fNb!U0jAbjQp0hWGPxM74i{msvt#PpjO`(>F>lc7AAfe!XY#
zi#?q*(07wf=T$ZG(B&gC8|m#09`(GnlMRQ5Jr^Fm)hg!ZXG7p{rS9q$=&|fy?yT(+
zy-fX6${6p3Q1yHDTT3LYO~q5IWmwnLGHvOPXy={F$3D#N`W9v{EzcATdxU;6=F{5x
zq-{V2b=2e24U@yXUEajS?vt(gLN*<$Rnm5Q)F(0|58vTJwtjwyYu}`V
zk4j%H`~>g)W;8|)T@1w$|3u`W#>&c29`AH(VBz+#g_P<`OxLDHX0VI(_(yITe(gbX
z$41ess|B{H5xTK?u!|3^-SK{{)O;ayi}_Qhax2DA9cMHGa3>
z%Xe$LyDj+wu|ux4GmkrNM9$`(PBI$TiQT9pZ+Ec~=3J1ytScT>i?GCkEwl@q{V1gJ
zqJc`?Z(qdR1E(?mSWHOT0`l0^;KnDJ|Lme4?lEg+T2(BL=T|7b^spad)4`7n4V~Fp
zeqjK4)RNishxYEjy+RKgkByJ6Yl|MWUf$QLw0Qi649+P|S#fr04|P(LqEM@O@Ore$
zL5>>NPpk_w_lJ%f3GX@(XYX@~t`G*^sVb5;9`lc5dJ26Lsp!Xptvq{NSE_|hA6ctu
zWDY|uw)?VOq?V%;{?Yo4c}a9HeKKjWTCH&PJ-NfB&a8+WEyE9G=
z!Z%CWoX#0KQ+qC;)$q`%QY)yn+1AOe<<+TS_fY8GsX{J2HF4Lg6RRgT1Yc}q3Nv7?j?b!0+le87$&6=WyuEY3uY?)7_fewxT+f;#
z@z3M8^K9QS4_=$M3srpDv7MSUD~tkk8a5zEE_o!`@@8d!Afs$4yr=!4;%D2X?5!C+}G8wPUx_$2UJ*
z|0!~N^j4wVa~1*PR9#28H@9v-e&v41Vm&O^zfn2KMZao9`ul6X+tqqPx0B-q0$D_c
z1-8b0VsAZPa!Qo2cyt>2*@fwi*uyV}Rb9MZa@`g?1GakR8TCX5&mVWJHLrX=F8}7e
z-skVr0#_35EQ?F(>-Rs2>U}F9CNQ+&ckTCCQ9gy=rGrn5Q*-nZ{xp^0gAN)CndeR1
zDnG*GQ=a6tSu6GMR@iIlj^Kmb9-fJB?p=9!Af+-!K=@Bng`)0lFq&dc3rMdc3`J6+eW)cGlX
z(fKORc$>(H)mzW6YbMUR@L-#+z6nXJ^xFDh?qkd}mgiPo%DcK97dDP`IY$mEf+Cb@8Ua-1Gmq6U+kL64eEHgBQ9qkyHWF2_ng8wOT6fpsDJ#g
zn`tzQeDP1Ni>u7yoU81Sau(Z5571g~cHq$aZa`CVHbm6NKF}0;`0jolyyTR|P(X9(
zZ4Vcvq2EFGCitZs6P*VywGTDvg$4B;-}3&j2{(Fm;^GlE)!bn+t3;m2XmVwh?#DZ>
z>W-?yw-pp8)jwwSY@5!ibYH3qK!~3nvA7}ZTQ_!rlaT!)?cwDkvlT(FSW9mU&$Ue3
z+`pum_=ThB%$>C7@UhB-#}k(>AAh2saFK8)N->T-zBlp~GwEN?g9hfp8PWF{WZMZ#F3*u}Dj
zg+IiwKRYzks+|3PO;Ez(T;uYrj2~~IZ?02Jqw5~ONSj0bM~N^Q86!LU-%d}{BG_Mb
zRK5U54Lmbn!mm#yX&Fei-#S=lbSgzA`|Ws9_}K_{O_%B?AJ0T~*rw~HRo+UMDe*0x
zUcL1|m={*+k;4%$#(Ux8`@`)$XC?GS&xpkL8wy9phLm}=H|Tqw7D3A79i)GXIb9w6
z!s0uIRnR^6q{<<6=bzJ1_)=V$gQCT17h{X`mK9NR3k^KRO;A(!q&^u11F
zO%{1@UV7-8%oXL!4$3BZZFVUeD49#WsRE7;qyAWxcVtL&GAYdA-n+VIShe`74De1a
z8T=r<20yCk@AiLW1~?@2e=mH2$*;g)$h4=p|1@n)66oOfVeu+UHaS=Q&Fj5MU8=0w
zJ*V80X2a8jRt?EyZnmhfOH1tIT9M)dp{gsRWDWI#u@9PVr@Cr2@5Gl4>U2mPN_}%H
zdrl)dT-!TSRU3P#P&0R7!>#X|4Me(2?zqsPMeNTrY-Dz?__E~#9LF@@j@N`!ySFcl
zf-GU5M~js5?H*p$=m;qTtV)XX5d&5%vY*}vfAmBKcbORxreE;-oO-(JoM`(^i3`?m
z+50~yU$jC-S1Otavh$>J@KL7c(m8C~K)$X^A8YUFk}}h4f4+>g_;~A-i14W`zz?%N
zy{La)O3d9l2tUy`d2!ulyoDU9z!G3EooFe0UbM;%%#&48bmAaEE(aBQ+G
zegzB*7vvkcrhhH-@~G#;n?VjSW4G)|Uia*`rTE7G7R#+|B@>QuN(FN`xaVHYC{Run
zU`KW+r(SuxAuRD#HG6CegX^;`^J3C{>-EZZqD3%!%%JHLyPDZ%>8-w#a|U|{g!nkB
zFnPZOtYm#l(%M|}mgJIsuH4WqJ1lL+}#vrx*24&?e{lQLuf
z7Ha0tgVyP&K2Z23@?m?!fj9{-uc}L#V~gFlK%95NAjyTSgubw<(4>k860<6)*nMSI&=l~=pegg|v_
z&*Gbxa&hc2+axVSaxB)Y?x)jJ)9W_PtII>%hSlc{$72ob&83p?yae)w0m0&KlXai3
z1EMl0ykLXH*62k~wRgMvh~4N0mse(8@``$9m9C@2Pg8E65dC+PDOqpl%{CG@DCaJW
zrnz?Gdk20I3^ogcNon<6E9`0ZrW&(k{E9x`skBIoV9e9#RO95TRTf8{ORhxj?}|6E
z2?`mWulr1)it8uS_$yivI;t3-j*GI;?!GHBt~GrFkPY(2P`t(65cxODeY$tbx$I~M
zgdnCp0}sL5k)~;J!BJALknBoyGb9ZzBqUo(Y3}ciesG;_{8P%-22S3*PW)c0l2&~0
z4YwS-f*VUGXT2gSOOJ^d#`ji@eY@mxu+AdtV4j3A5Xq!SCvIY=hGYdZQ@EvNd~a~w
z%ZSLc&nyaFJDnFXOFsYpr8Bn(d*jzt8;<@Xb@zA=R12BXwRKc_C|07}D@{sCQQ(F~
zv42X<>d6y2#SaCP&NrO0i=5G%PA<@Dy9>x`>n+Exqxd4a;nbsKJ(DZv4j5h1UwP)H8Fi=fQ|(2XyWa_X
z)>G<|ap*?S+TLi?e|sGTkY>Td?0DI)ur~)IYwjNS_};}NDdXOc=aTkfEjLmx+T+yJ$)1XnEIG;<*-|J)ZL%gmGPRs9BWCP)9_maAw1;an#c8Y19ZKueFNVSlHx=qji*n++SajQ~74kk37x|9e0hF*6fX!JmE!JR(pDJf=NP0
zGBiuHl4_IxFT0Sj@WVBYsKhb}t*`&`3md(&mAKv|uP?BhE&Np!sj1$T6v@7w-~Ynm
z^R0-RQKe?s)DJ$n!qmW~LvQDKoiFNoVSE;nEPLV{%I}iao%|L@1;ya$**);Z^&u#K
zb5;_jyD)bg)ptir;}EoRGW(yp-#IFZD|^o^Ja7l(-N%xT)LA(5^2j%8NU{m40`UqM
znXyUI`*G~`%W#_6%}vw&-sS$
zKp)?43rmPc@QA#5Z_Cdl%Ow(>JbyRxoL0-T`|%H=4&)s>VrM65ALLIE>JrWsSKVpv
zecfVaa_qXMl~&AA#UP4J`~#$7st~(R?w?1Rmyb{@f49UFBc46BFVrk6<8HLbx#gmD
zyz5h3YMv_c+ey1$+7@3Ij-Q2}H=G4(*)xd^^nYzB1PcBro6y}VTX_0-fJjG6z&WCo*5$7)&u>Ql$7IUNhg_Z$
z)f77G{9F4#IKMut%*de}*TSxDxyTbGEJx4Rbb(m^WINEuw3&miYH5|3vgeUH5cloR?8fHzZ>{XJb1s_7
zpa10#0)!cAxG?H=41(mHO}9P~SN+st@NwmN5u*;?1BuGqZk{r+oKHK)d}XTJuWBvc
zI(S}z>(8JCVE;j*vP-W9v<`9<@l~1BJ&yXf`3tYzwYvxJ?U*DaJ;?bOd_yw&vXt%d
z_cv(M_I6QWE6yf8jTVE4)J9|3;|IAOO|5m@jdwM>sWS1{epZ>8%``rRUW-p6bA(S#
z$z_32VyZ&+MYIS{b==|h?k*1I#IWmKowz3~Jb(ZJ}O?(h7R
z7@tLvycmH{QFCJk~f;_FJYSQ=s0bM;B5yDYLFE}r(V#)>&je9nCKy~V1v
zl>7-Xyz!-IyYRMhbLNvPcZ#VyEG=d|cRByvjn1Hv
z>x~JrZ#>H;MqSi2ImSK~R>`G=8smp!W8#TQA%l`0MPiqJ3fmq3hu@3$lt-1smnx+N
zP3Op+)LN59-GRvB%aZmzRMA`GTo)f6JMYq?bE(gPs>FgdycYW{ya!>cF41?2XDj+9
z>m_$r>wm+@$GY+12S5Hepg_!F*2F(iJvGL*JYHra!+C`t+4oz}uJmcLt%f%{bLmy<
z+S{@0hX;b;g{4Mp?ygbQo<^d1X4!R7+}HY@B3cq%Bp*1P;k4DO63=6bz`~|6Ba*fc
zTaKHprCz^Zx&FH4WqrGdxzwxXZ>TD(dNBKr?I9@kZT6Z7uA&e8de
zMRMXdn752ma~y?3`$ZcqFTHxI^~H^BN?3MhE9aRT8ln6G;}h*$AN<1ex_P;R`=tJe
zUzr*Th|BkNrTo(}<1BV9yd*ZX(MI}Nk!+9%XRtIh?#bo^@2{-ro#F|2LP
z*j3GAA}lQS<z^Gjiv-I|%N6cZJH|L&RAAa)vG~&IUT!!qsH~#3n
zYg)g>tmF`3w{QD89#2v<5T?ZUPkruuDPqk@sJ%xOSRXY}(>W7&BYWxIZOuF7i+CZ^
zvguQ|?E`e-?CO6$N3cTEli4)-ImDaFqG
zcV-Kw-52`bO3GGWPfqdO(K+$wLhs+rRCm5vO?spvC@;t^af&1GpF<~}zSW{_2{Chi
zD6daP-#YXUm%qA6h;o|mK+hLW-v;55fc}CnuZ$IndkG;Qhojn3=6sufF8Pi|ZPYjW
zZ25B+F44G3I#tHL;B<@m)X#fcVyusdu~k?mDNx-v_6Ov4q534TXGk_Vg{+8%1}w1gRr<`Mx_6#;4r)zVonlIDDL(
z92Sd9vQFBLgHCCi4DPAyD#<(ghJH7iyc%SPvHrNVrt4rl=U(!0baf|o_+CJwtI@k(
z4dPI8{%Ln5%%mkci$?2Qkgi$f?`w@4gxA-zQ^4nXcQO;U`aJ&Q1kL7yB|M(|0hxNw
zgV==Y^#3T1H|)uqwEFBM$<-HxkxMdl5+$_0FdYqIebJ$1u%#^CJf~J}ne8w4bp$!??yKU<>_iBi8yF_2U{?2tcRHHm-W3{Rt7R?j8X*Mc#F=Q_Xwi`(D
zb~D;=5*6cTt`*0(4}dUT{*A~{*!sYeW${2BMAA7^zOaf#$H^s4gnX=SF6D$6bL)+>
zJ)KKGU}6;-HND&EbXYWythY00<(?sf=lT&edoQUnVEzwh`V&mS!`OFmmd&YzCGB9}%|#FYhT5ab@;9ZTVGu0^Qxw_Y
z2Cy*UUeXEtkNey#R3(N-*NNg+YteCoEaSxQf9QGsBG@<+0Q~N_0Us*47Ig3@pznV_
zsHu|~R{^EC1qT9JXGt}qqEg?Djf{1N*@TAEpXlF@q+LJj%JBs@GECZaS{20t#$l}7Pj<~0(Q3P|h?C`oHbK|O3zR8|i_
zBf?)0+6(65qOv%t`Nqjfp3L?m6?5I&y@^-b?Mv3yHn*k?@!Q7QQYp~Z_^8C3
z_HM_(y=p~utBla809Vp`H34t!Td+FGSz^7NzcpW>c@4tU
zJnmZHKy-g#Of5i$s^gl5sMV04%^4CQrWxCvTjA}?cpWlotG9ilVeWRxpFQNV+3!&C
zUHkBPd`Qsf+9v@k@fzkB`MlMRB5XFdhhMfsE{-ABpJ6|Cs}dpP+0XC89UsNm_n_$mauv!VNL9$
zQO6hK@*R5rrY}H~aqtv;<1U5gqVN%tf08SM!GWbM7}P!mIqr
z@@CnDoS_Q-WU5)XwvZ!rSjn7c&!>KSc$&-~*J8yfF{T@JwQ;CXO1C+RL-AU>LNARH
zQWvD)R5giIvTBMkZ(U^b)Lsi;BLuD6h8optgtFmHDcmPjL$K=XfBIQx7cj)A(qDRLBN=^d;XRF
zXRvk6`4rFd=*vEyL5oxxb$t;2>lxL?lX7=qbnoOy&-(O-W|d=>osNOlS+8CV^KVEA
zO*s+AjiYk1bXzqpQ)UK9gV2ouV#~iD^7x4*{>D_o^n79tO*MEOw=laIgnx7%cDtE{
zx*;{_;mO7W!jTaWpx%7Dw$Sq
zep5oUvMJ?3^V-%%c;dH%SjECznlLSRJx|5WCvfg@sX{0L=eBN%46~MKsNR7z$el8z
zz&&|Zx2FD(u}<)c3Gx7+Rf_#!x{7+hc-8>qrH6o7W&3tXtd3U4&rtRCf}B08kkEPs
z^Cs#QuI;$yFpiVeBRyQynT?%r`(NH6jVFTd!(@JmkG!fJ#x31G+MeB
zZtw|DX5KJV#49O7f>B$zsgpmpm!u${@X;Eo1GsT`jqeAxTCGW_Fx%arx-HI|3DFTOfzaP
zl9SL2ld^tEh|y?OIfm{XYzUdchgu<7!fCV#YE3)agCvskub7ZvuGr_jdpM~X=Y{y|
zj@;=EV-dT)&B_7X^>23UR%>hyv&Ej6F9}&vUW@c4BHQXK?t$v^~?XP`HV>S{!;a^AD)TP&Os0rJo!^
zz@t^la08)~TRf+q<2yPTNK^$aJSS%c_F$`oQ|iW(6=T}WqSfn1)FV68#Q_@)&{J3)
zPX=1^^ERGfidV2_IEdbzwnwIx!a7lD;$7P%*S%5mNnnfVg+^
zyV8dQh~yMQHQoB
zsosBLP)fNnv}{2qf!x{M48Znl+G!)`mZTVKcVdc)oA*}vo5g=G?+$L)OMc&eDXZPPI2Y%jeFr2;%mG(Ug?`O4N1&F@~O~0vY5XxM>jFU^A(gqycm6-Rs{YOshnB
z+K{peZqziwox(Y%B_k09QWIA7yTs$ZU85DGpeD1uje)jNKFX1e@*S_{I^x)4xyCDO
ze3bFc^4i6IlZuVc=;GSU--Q`|GRWpD>?w)WP480vIP8qa7Ay7^H~oe$dadby?wu|)
zz9NPdW46>OC@5jKhTB=?8C%EH5tqI&x0Cu!o*Q#2vs(vmZuW$4?}nq;kWPXjgQ((0
zKWsJhHqN)ydarYIyw$g4Dpb>eLvyH+gOvBaVc6c}hmog-Y&X*p^argYXaxSlbKG3y
z1C8x;oRx;v!`A1xE2|GQRAQKWaOl^K&pqa2j`tLLFdezCChRoRolMF-$8OikWvVWI
zF8bPlQ0wz4#k^Lop{ZN>t)x`eJpJMITLtCkIV!=g#YZ~y|5_Dio;xU;ioDK0&7~(T
z>~!?SuNQJ0$Mar1_m>SLx#f9k7+_nUKh`^0GUSY5?MSHcy!*~iLGZ-!=_<_Gw=bT5
ziD8bMQjA=DuVu=jW!7O{EY`(zr2i4mQ1>JCJb2~6{blDt*5f^kr5CIyf(0{N{f~lu
zj4xHxKH|dH7;cATetPff`#>Wp$=)K~(a=J#t^XqX32e@B^so09JSGe+@6UKvCf25W
znGnY$6jVo#It#y^&yoCcNpb-<7=3(6&?-5v3w23Sc)IB-dmHLw;KBbYEBh-W8;bOP
zTmvD5I@fRaw;j1JeJ)po=|!by&axGiUFxn}#HjXAV|I|qNtU0lE|%B6kK9J#V>}
z`V?9FV)giRd&$w&O0jbzsjRMTt2tul`o^wdtS3sDSg<)UaV+lJ9B*nb3`A*Y1ifZG
z;wg6Gz9g>t`nUJr!k#}ixq8l7F7pI4fZgS4zM&dVuBphm@7l5%aelSpt54#;;Z7Yt
zN_e2#WAp7%yfSy;`}))q%tr}>Cpri1UUXM)Jvvf#UrGGjh*Ok}MriJos?F(4Q44nV
z7th`Fazwv?L%D`ZJOVEKoJU@Ke)s_Y&_Qf*~jE<#$l==EIjjZ_4|)kM_y>8D;G;=-V{2N{k|*z
z#q-5S@lzRoQ18g&Umjom`R$mia4IWDv&$F%a^Evs-9zFCt&5M+eFqM79%+9RAFuY|
z?Aw>{80_VOa*Y^K*K!+;^PIEmg^s?ab^!C`@QSi;(Jukz^g85Pl#9cU^uNDgm2dg&
znxrtnOHc2_QIQ!A_Sh-U7`>Ca9|LEL`PkdYA&RUc>la?gRu^Bu@m|+ZDtw@Im)k7B
z=gW_?zvfCWm{D*J3(AsCGist?v$cc1pW&xD-zI9r?5Ng>efm=SzFV;MxlK&a)mTBR
zWpp>u4tzI1<23!B_k$m-$3Muv(7S387^wZ4xr2x;Rsa;`q^
zkq*-l&l*Em*7x)54@spLiXYgmCl^Gi#?9vhp1dlWTK#~SI^xT{t)G1XGhhGQMeig(
zwBfn`RJ!7=u;;26>+~lsdcZeA3kY~O9Ve_V{3-l$%y-X*=YCg{#JM?UUnFpN3h^GF
z7Cd`=nwCRm_5@!9AH6I=_?D5}`cb0yn_aJiV%MYcDVUP@CqQG>B;1;kuoIKqMD0BO
z_)$ctFmn|3XBnZ1iGoO2GvE`L#}a0$q4?K+Tyc&~!^
zm;B$gm-Xg9WqMHw32lfAJckRuz{Uctr6$C)75WA5Uuz!1354p;U%nArnC}vl6IQIg
zNpr0>F=E$Dy)L~QXPm=pI&An$uy{geD?8!lU4EU&7Pu``_dIv`s*yH&@9yf-wSwAX
z_Vt_Aw=RwNlKqwljj;^ERBG7|cC%?a}xD;3IJxE=w3?)t!
zH9om?s{V^V%e@BKcyX)plk+H-)2p3mnTPP-uJYsE
zbV`AGwX9yn{`}%4M1o~~ghDXp;nbsF{MP@oDeu0M{GjJW@dsTfL%C{;{)K3}DgG~_+~da({#Rc0Pi#s>qE{S;hRa>t
zLV1*aYDrwlxN7ICc$VAwv->sllgEZeRLH;Rd$zeSs5TMh=f>qJ=86b-qfPj!Ry@{t
z4xZb*!s>#)8%j2&)SqW@{A!cGRMJJfgxQu7Lihc5jgZ339)q8D-hBLne|AVTY<&H)
zc2|4$4OeZyEI*{21=aSNw=q-kaM9>JBUlnmb2=fEC$qnPS$iYz{Oab7lpnzXPiEUb
zf{0!(hgw)J&?dDTl7^@+8zt0(HXHcLo1I&Z`6&wM%*dZ-o#G6h=qfEh)bD9OO)x}5
zec;}MIU#@EW9$l8klk8-UxT(zdIBl#^A_#ov4Nxyq(+A+RoK-Z==moU4-Rt
zo`=!+r^c5f>KC58?kVt^{V_DV&h>9W$rmlJdx>#{&vqy^E3}iwT8(S%QUB!icP&KH
z3d6iBaZnrEnCjQuK`?p4Xt~)zxd$WY<)i@1!LA+ck-hq@fOUyPzsk;kQR)I=gF_Rz
z|I~`=n}5V@PfbNX;?gnfn6Vz?8I?+r!z4aDzAgGtqFDkGWyvGzI_d)iPM@+MZJ+VAbVjrdgxq!+iDFI@E;Y
zm1~q-cvz}Wc{?&wbA)(cS+!po#zr;=C5d8(()jU7I0qu
zS1h7?>A-^@1=p)x5IcoP)cEzEe5NgmHI}g+D<`U)jh2VGi9O;4^{4=?R~fM@GwT73
zUlhuhI&|*k@JeN{DxfEov{-)}cB^m3u;hCv`nEbZe`U${WKqb_nt9UtnOi645O{mU
zLy=c9iW~Hh_V@HZKigktWscMUZ<&q^{;Z$+#ghL3e3$|IJLvn_S9VzPxvj-c(_lN}
zltxFwi`D@Ld??>0?X$Hy9!?y$DWSYK4*4O4A6AZjrCvLndeoLTbLgA@NVG5dhi7K%
zU>RSKyt!;!y}e>|9>>6By|0q`YU=>&JmH1h<#XbXu0=Xs36baTyV;DbHypPE)tl_6SsjAZ+ImA2%^;XB%hhZ3nUurkZujq+jOxtza;;u=otT;O^Y$uGUY-vi
zBwIFbb*ij7js1`=8m~o(x6~gk^%&dA{NYckx0zXoT4^5EzKirLu9*>8sdNxw#i5bbVjj8Erm5Z$z
z$1Zx*7;p7<&cmsSqrTlUC?B*&Fk-c~UpcG9G&uxXR%}@Wc^i}Uw$MCldAqG&t)<>(
z)V*ZO-5DLi=Sv)9mxrcpg-5P`cCWZnqjZz^yE-CfU{IcF_q)UcLtI9Uq*IkvUQ?xG
zYQB<~eh$i$zhN(ryOY~}&254aT$9Quw{QM@@+Fg7`4KY`YmJaymUMI*1Yd-VPlDiS
z-j=81h;!4k;W-t1>(hS-q=i2OE7A&K+=R6AuVWT}bgV#n4d&m`=%4~+rbg$Yf{O1<
zu2^rhYGFaMM?H0}akZ4X;md80fMXmeHI_BY*m>LJ?PM1G2r2+E*H{EqdFM+g^|0LP
ztpVvOLHVKX!O*3sx7(c+_cPrmTIH9Cwo7h99yQK)YupD=zs4OPXop~ris-@8i*liS
z)cg2qwfXv@=6<8vRsZU=8uz83dsLLiH}_;$#0ILm&pjZ{y?Rl8dCInWRK9mCE6bhO
zjnq&hyKneV2m}Rvrkd2fDI)99Hd2Sg!7M
z->!0>=#wWP`vXu8YnG=
z>SVrY@AZ;e_956Q#Myes^dC94yeWAc_gEC+7)*F&_BlbX6s|6>P#>m*
zR{a^qg@|KAFx_@qMlhe|y4P|6kz!A%MyrnZFWV9nPahq(u=O^dM2drZRrymwOY2ts
z6?C1vZ854p8^+ia;;z}K%d>e&&5R+RAY26s%YZ#*`GGNPQ8PRj!F{jAY*KYRET$1I
zO1InM&bNqtc~^KW=mJW08NuC$^>iyvDBVGz7O|}IHs!DfrSN5_Gc0RlzDwxf}Y
z)u}63xUPvK!gw6}yq~!O&f+dP_L#+;$BwXDn_`%HmH!y3+V}~%IWuIhMALgLW*RG%
zzy1$x%bI5Gz<6Q9eeYm09VT_6QnW`0eznS^MOYi68u)d-C0MfjHKx0q`xQ||Fh7cEdinQ)rcj|Hn8z~9m`_RP
z{K-~uxl#GU()(7RK4yRVv1sNG_zP>q#*L9h_oI*Z4e|Nv|H;Hw1pbRugOUt)Bs$vq
z7_Xq2Ty_hEZO?I7=KtAmOgxN7tBy6qs8M?Nch$i3|F{d)P>lvH$6d4bLxHR0|ASF&
zz%vEbl$&S%U29A{gum8M06mLNLKFAT_LUhNf~E!kOff=_6jNjvj(R`-lc~esD$$QJ
z*|BFh7*ecr9BEi4_N)dvm9h_&l9I&QNE|5{>n{HH7{nJuUa#gaJvlk|6$SgZ+53Nc
zKP!o>$#2;P-X&O$qu%X1lNC912%i%|UveMV_oZQF_AB{X$r^FhMT+4FK~hCzt-9U2
zwgpvF(D-)~w(_gFTFqBf&DwtWNM;>oKgzUQud6{^)
zB*p0C*xlk(#tI|}0GFiOSh+N_dc}C(x9!E;ujUT#rW(xyzyF1)IFsE!zfKIf?P&bh
z629g3vzlVIBN*MsfALWo1}kYiwI4}|sQ+P6<9X*#(cPMBkWx$1ehx6RvtO50kZjJA
zg#RtP{fbIX0(5`}x0ksuB-D6B}B{I}-a@A`tulSqM;6br1>H
z-}IwF1$SsI2xqw;0i`eFO<=|CcW`q8ZUV6nCJC;nwjN+fD4r_q96~E3vAuzK13q_3Z^`xu7jMr8nBNwzA5oERJ~gO
zGjIF%6l`cQ0@ft8uFe+Trjp{%hzY)(@y=hZlWeg7OseUM=Dm2Kwt*#xYb9Pc(WZlHMT=pr!|?c1)&}1Dz>$2sz=`
zxSxSh6_ItL@n546J7wby`vRck7cjjA_E-=-92ro?0>`7ee|sY-uUAd?fzY{+9QuhU
z@HhT@8^l=X3MNl@{@u(R@Be(tN*p>3Rq~8UfuW1{eFCK~hyego-u~~HX1)L>NG7wk
zAT8_5UqC4j0Vox!SnVJ2xT^HZ&kI)z?hN>PN9CwSz%d{_Y=WC;T%x|o;t9r
z5`R4nGdK;EcFsR7<(_xY8{@j56p$NV9G4VUh`;wCr~&J0b;MvyVT4;0>-7Is;Z<`+*Y(z_X%?d(-wIT>IFN
z7L_H|lbdwfDF3WRY16NyRAwam7hDHhCib_$w;9ZC>!k$!wdqZ1lCIFhO_5V*ce+sC2quJth8G`cP(uivXNm?&<
zaKQBZ4W3?l=DhVCy?r&6u8d-#I0KGE75c@bq(M6NSx2C%fB@1;&PanE!WqZ7G=v^O
zge$Tyi2rZq@ZWDo)QAg#^!9DL4=_kT=v0zkcL;Cl?Cs0?(X`FTCFr4`@?dhZgcswP
zjDCd71aQlVEFFdxKgMc5f;Q4i6uSj-XNvB#oUzAhJB%_&rsM~(7Ob21Pa{dAycynR
zWcc?2c}at7uP_*eonHdktOiKnKQLH_ou35@qu%rjV^RAT>Y@P*pB<&Jbi^QM0kkO$
z`&sGq+U5dlhWmgq3aJ$Wuc@dT?AyT2@Lho=#c#Xhy0(-AzaLeK%p>
z79&PSBT`AE3FBBgSd0ZwPn4ilRyysmmVhFeI$pphS?dYj?{rGU4FjLV*(_%49jwas
zGZEJv5itt#oTf0wP*ZHU9}q2bYoW&u7|ecVAYmZKNplqpqNb6Etcx&72J)fDfldI&
z9ccdh)ZbnN(hV|?jjP%hDg2Oggu=F(l>=6#nnCWMQBY*PEbN7(_n
z7X!R?!1^*OndGSmN`+K21(^f?#z%TK4+r;E+&HfO_BptjWRsB^#0)J3+ffrJdi9cq
zl%?0@aUS%j}Z9bkuYjv+LJ0KgN_QNbD83Ot=U
z-YacwsP6(G#*j8fNJ?_+)rmJE0M%h_^cF$z_I*5EM8^edSxL_>B?H`R&H%x(rp5})
z;Gj!g!HD-Z)&UvLdSgij0v!?wG6$z8{D0L2iYwK>mjnhtdaSzWi`4JApfzGGed#Qx
z*9O76f{`#-KTzEPL3(zu^KJ~%;h%#*67PaQ`cfEP@)v*w1RbHig8hZWp)>d?hHV}d
z0SqGmQkkOkI+h7ky)1!=A=i+~M9`(yv7*4V`52mBifmIr66p~2IWr7FlE8#TFN!pS
z6?!`dZ47K^paV}?XAA)(b&#@(?mjsH8djx>fi!FtY#OlcBVM5|l09!V%hHocvZb^9
zBc0`aS^M&u4;Y}M1|+hNvbb7DM*s!p!1@9@7YtAgmufs8PrI`+EHN=UFtQt{#Re#6
z2duW;z%EEz99?Na6Qfrcv5+2M6#yi2-_0FHT|%HB*I-fthtTD8Cn*##@zE3MfVsk$
zFb4*J*)+!0`|XU;%p?$WA#vDmXP}vhtm_bhh>yYe2=0YQ{FP7ABHe2SD!*0&=xLS!
z4dF%muP^PB}Qx
zapSL{kGaNlZovYF&VpYaz}N&m7zZ4RJ`;dR^ByvWP8(T*a^L{?1z`nJl}E39Sy`wp
zoi>D4x}uo+F3@QxJNc6?qJ(_Fw;~4LWC@)nV3@#?VFA;bs|<2wEXDgf()lu3VsIKN
zn|6-@7q+3CJ^=?o=$xJd!vuKGPs{@kJ54I!PG=E1GK64ry0JJgAoQnqFoL6qFcRF<
z2(&M7?Jt6a8;XDD3k2W>iax=B%uA2ayF0uQ&=aFWuSSOuH#!{|J#b^cb2Ls9dasODxo$F(C{kNt2+MUganj%aW6l*Xk8PO$JRu=yhoC?9{
z+(wSu>0>K6!^xKzj^PyBCU30M=Ldt!&?(XVwTWS{mro}eT)Dxxk|nCSkK&Wb0l%?8
zf6(WIgGlLpjgrauLk0(&fXuAx0jkkQ$z5Fn^G?&5%g_h>{=xJ_5h}`zt)&Sb%F-J;
z-U{+yMHZslKmrop>6`#lE(*$hO}A%Bwa0d@R(6@&C+%fMTNLp8HA~L}
zRyuq~3!{Zuq_lr)>Y_u^$F_Phl&#I$fe&Uj
zD^YQ0Ka5TX0J|+P>OAs#-?>x?nvA#0Y?09Z1^DQ8YfwCGT?kGlD{IEnfr?W})8h~w
zkQsaLh0B_B+sGN>)MacwuB{6t&$NFKauH-jchEVZru+E7evk%Lj-hGbyO&E)^AXv<
zYqF(a4K^N;05juhN?ncGcOrvl8h?*skGTRuaKM_xfHY;0qUkT#~vzewlqB`-S5+UQtRO`IM>)^^J7hzn(UiVzJSaYg{~1)NKxC0Z
zGPvN}e>03Fmx2`>NO9CpLx%qjO;GSZ8SsNTL+P*vr!a6$gJcJ9r$F()y39jRRM_su
z!p@UwRi!L=3SCElY(zJRuV|VeUnU-UqO_=PDnOvi6UZbg@IAco%w_yFZv=e-?38af
zn@+DT@e&I#a?)wn>1G_Nq_klav#r3`LMR>!e4kZ7=Lqj#lBB_Yc!V(O%RP83Sj>!3
zsh~soy>9ki-xg7k*uW+ZF75{=%;=Q~*Qez@3JHTf+vP0Bga0Z2^t0w4k|R
z1r)@7b@fqJ#Afc=A{JuyT>6(ezJS!HM%_&)PQ9rN$1;|$jHQ8WTi?_`52=p}yj{`y=umnroZ(?Uc;Z_fJeb2&|^y?7@?R7eY>tP&)R+Sm59G|2ahwC`<`WG^5{
zj(@|Eo&0P`ZFB`&jrNgoX!?KbU3pv#`1_YAzEoPRTs3I1u8MRY)3V8uLK0F_Zk^IG
zUDF_hkX>}>7_u5kCpFd7Oe7&mx|^oy&{R{?R8uq6T))qBXG5rs-)sN*`o1ig&wQTG
zbG)DT^L})F@bId~FVsUGKWdK5?)5(k^fdKnq~y+^YT&zS`+pCO>2zNJ{%UIbpG$fT
z(L2Fc%I4&O_iM_MdmTRb3g^4i=>gzMRQo?&mwj0wiT_U?uj%{ZU;C1BSvlaPVIK57
z(Lh%Wn{9@;IoCDlb)RvOi5>K$?x6Xu4!zzE{Adv<@hB2}^*4)!`^@x+=Sk0f%24pb
z!!!pz)p9D4*Rtcl`=|v29|}Sv_xyW-eQ)t~Za#K45`0RNe!B^TFmrN&!?isb6T=T8
zz}#>UQe@1#C3Xrc%6s4b>(`BJ6yaW5ZO`z*4Xn9U9c*4QSy)b(es6g@HHN!vQ^f<-mghYm7P$CDc1&{J-{2zk2+6dbpaI^MOiMS7{|7CX^#9I5
zhlNPFC3c;5{thrU#h4XyNs{ED$}(i=B=THaVi+VT?=4kOd>Q`!?5Q;Xqj^eDeNM3$3gEa&4<4=_$W5
zJvkY8Gj~RH3yKL9{PtYq`&K`
z%=AduQdqt#If;%)*b+kA74hiLQjtuXm@VoHBHu|U8{InKxWUHGtn3Ibg>q}9JKjvq
z_wrH+19zk6MO*Xr8<|FDjI-YDrnbA?k<-|BFSKG;1Uk|rWmUAB(Qb^RR-j&Xq>W=k
z>4^=dtsQ>2_E$gEUiVO26CLTOwO?xMuc3?wdb-PQ7$0WgwzRz30M9gXHN3Y{*Y8*v
zxzy?A8<~TFi8k(r_o%j7^L9rp%Vfnlnn`U9m8ALCKV7w8kzCmyu7zf@h}d;^w(l(Zl#F0iF8kGH6%MeMx#W~-8o?E}3arctyT#YglQjfT$3LPOzFxsjPcHTf8P
zs%m#f7Zk?W0vuCu_VrA{TPs+*4$0f>cvoA!bzX;oWJumNSi9U_yEfiVy>5J4J*xT=
z2eNnlE^(3Fn|`jb|6L{!{PKscOhnkFJQYekD(udsW3kH~%-xo9Vbi-!Ki{>N$lH7=
z=}3Fz4C77N*RyzY)@+b2TzxnB&D~pvAIG}xSKwlf9j9m4Vy*v_
ztozv;$)&vgBQqp;*A1Olf9Mn)%KT;FE^Ks7S=F=_JhK~mms=m7w8rlIvFs;nYr>M=
zplOj)AeVO^cQ-2gEyj7TM`@%f%lzS%o1|S4ZFzA8X)8Ngl05g89|Cu3eQ34o?p?)3
z{JYG3)g8V?wTUX{6ImU;#ptr${bR3~k-ul{Y
zH^YNtZ0~L_4|=OZ*c0`Rv8+IUli&U6b<4qz^IloJrm3y&)k8&UPB}a@M%Fw(v18lK
zMCm|V^_L{$290%hl!9mAVt&$4@>6q%%7qx$-CG?_tE+t)$pBH-vodexUVFo(
zt9Bn%mZCy|fhA1i<$!ck1_brvPd+=Xq4o}9+cdm(xi
za*lO>PCw`8N7^-yxQY6Az0ry`yO`~(4c_RkB(3(WE9Bm`e#GX)J4pw%HgRw#s+jI=
z2i1P_SYLNmXZ>Ho8XI4SJrSz&vCpX|UGl0gmduOU``B!Dt^)o35s#w4ER$xzy4$UL
zk9vf5tv%|841^pJ=9)X{*7>bK`?>BYSnLUtmI3o^n~JxaZF`E0S>*%`_ZH@1x^tUn
z-hu6mxv_rLQYtd~YHDgXHn+pK3i7k;D?*C0a8(vdu#nS!)xOatEN!(9uK_9Ib~XAJ
zX^m#hYFMk5p&0WoJh#dKmfN%xg7;tjhWQuwzR98Mi7RD!TimEDPJT|QYl(I;VF
zzTh>I%k7w+Qq(_{d7jSgO!>C!G+&0NRLDv;1@&~kOESAbr<2!$q!kx8G!UAvCLt-i
zTOuE&<;pqj^)Oul#&9y*-q$xNBcYxc57)iw1#S-K(&@z(HuwNYh$9{1_v`vwFWc#V
za9qu}jodnao||Gpoxc|q>8bjsWZFCy8=LQs-(OisC?-zgwMX(G+Xo~O*WC`^GyQ1L
zq_F)0lhS{c>XAgWvp)2nB;tRPi2q3<{wIm}pCsacl8FCFBK{|d_@5-=f0Bs*Nh1Cy
ziTIx+;(wBe|4AbLCyDr8VsRG+0v67e?}(lEc@h$s`!Xa1Sf336Dd3QL;g_uElCty7$I6a1IIT%Q?dK4Tt@
zVN18#%zJDK_1sfJBZ$o?E;csK4K;m98U)&f-b1Yb4ViY5IwgYwqy;)ckxe)|A5Dd-}vk`k?e-EFI+AlSWh4U|<^D
z;|Le4fX2q6mBv?$qEVV@mQ?z~E<;$L>E3YGg5{9b>f`yIdGI;&*?WXK%yx*R9TtDw
z%$fDpgJeX3vbN^>c1F*n@H8-HP1%d7#t5ywa+hW#al-IBTO+WXuw1{!!}jk8a&D_^
zd<=+GNy#&e!`o>)j<+0~R{(9L#szdTn()8kvy8#-ZoKnkYju`sYciAQuStaaJXOt+
z%=Jt;QGqCxvBH%2t8&V+eRonN)5_r4Pi1l>IXC^5W*(-QzN^eycb^q`N4m8zY?>O&
z{T{6~{@nxSMs5nbslYSO_&B{Yg9i1?V-}RJzLdKnM-nS1&2!wNRQxQzk$mT!|E`id
z;Dd?=9k$jfk`th1BVoUOGo
z@AHHi9#_$hF|iW`r=hz%lD+E60>*T3p5y9F9H*^ZJE(0z
zdd@k!Ny;?dnoCSr`}|{u!FR|$H8m%dB8#+(HBrBp-ClVY&rF$XKnFJzzCF()4^C0?
zMH1?=Aa0*8f6`Mv}zUA4Rub$?14HDqgqkr9sjOWZoR87?bU71
zV%sg=>tXGY>V7^=JUvq7QZya;zrQmv+0}$w3?D6FTL?1Yxi75UcqJRJ$y*$t%ign_
z!YgvauB?!K3~S%L?`O#BGP&;arIoC8_nEDaOn)Z*l?ZD`IABewTlBGXl!T|Z|IKdb
zDO=;rRTmgOXsG5U5~8#i0lP$mBb)0q%`Op{X4-_dS|gT@-94w)5MvgwOegz%@Fm+G
zPm_J71Zz+8w}kkBFDoM^uI0hBvUX2tcb<VlA7M3%7Ds-fM3{Frb5jUNEs*@``^K?_6h#lU}lw71)
zo#}O(Q{9agyG+A1W$#_%6I@8~VIs>?IjJYLLQT7JUN%2fUXIO7kx0NTdeB)==xM+B
zzBQan^G(Z8KD?a=G_`eeHc;BwB&O>#IQWfMewj7loG_aF`p&qS6!*f!6&LNw@S5$J
zENB!-i|Vf6tn)nF*E|R>m(4I$5aH%Kb%76fyZTWzIEIk~$vce`R`=Ah#VOBrFZ)*V
zAD()(%F1$fxHT#o2q!mtR!)N)`X_h#3HpQ1ZhDaS{G^mL7KIVr;9_zrw;8XQ_A8G2
zp4>%kTt;_BC{Xj!aI_
z&W0fG7+V7aZbucPurc4Xw3&j_;qKdjOyV^L+3Cj^7;%YILpD*Ak8JZj}nQ)&8C?Y1bU;ABPGK
zg_di{MIt*+@NzgARAQrK;UTUE9hR^LS**gSjfj83dTtO((nxlrAFg?4aBB;bv@24J
zn5L5EX)4m*P3BfL64p^lbBG&N-$dqT(`YDIoJBRRK
zwH>bYD-su@PTk&s<3z9Zbik~CZKez__F)Khv)hSqrWn(=_zj8%BksBh#k$(lISAD}
zXhj9yvy;q~o7zqw#E{k>HwZp8
zqWxt9S&o^r@opEy&Wy;m?8v(wu6>w8_9)ct@I~Xxi8q2h>11*Tnr!SIT;Pv`>K{>q9l2_&OaGd!t~`L
z4M`dvcx*D~cvCG&)5CX7bcd1{38CaOYHdt0{KajI8!yHc8Eu}foB
zGxsF~>C&0v#@L^Ly76E#gm;4J&tg%+I~nc8ej95;>(KsouQucy^%qj(99=`NQO<>}
zM=7g4$67`E2PrS@WZ{F&lzq7;Q+OWTDgR5x#YE@jHV2_AsmPo2X+bk0lC2k5DS6+&
z%z00Ca=2LlDe@$&PNE-j>8NHgCL`Sy@JY#>#4Zh2UQ0J4@~=Wj&;o`NeRC>@fzz{<
z*0j52MQ=yEbm?Fq?A`MeNpc=>9xS>_?MiIoxZKF-$N5BMv}Gxs|)H
zQ26e1@fcnW_l`9qh^+p|+aIdYW$I8JWVbLT=n9hb)|z%_Qv(`FqtF`K2$67ZyC&bcfDoE<6;9)n_U>^O;@*4bL--X>25DMLkwk
z+tvze_F&d+tMlKI=H;*R;v@pG%#3&wk6j
zzg1GD*|IWrkJG8$mQx?&yP_wT!J_vFP-7ZoPZhcqPc4JJGZVoZCGB@rEZ71&9GKWZ{8!=XnUn2adup((g%<=v!av3
z)wFG>L{ChV)k4XRH3{mnjb5qhwv<36?VN-7iYTkwoOwC_D}h+9@$R4`MW1#;NGfTk
z`7ZwlQmfF
zka!bnN;>zgfM}!WiHELDMIBQKlM~pcS?D!y!PhKfiF~Z>U6QCJmqni9!)U5KY2Mq`*oMi(3pFV-Zs-K%PWPeQ
zeQIJ(6z~hVKm=BzrUMVM-BRm|(MD%Sr$|*yCWyv1I;u9QDT-!olvF87x8DIjewF(`
z(D9N|dYoXBr0MP1aj*i7-C0Jaj*lqv#E1S_qOlQ$iKw?J+RJNWV`LJ2C|=rv4~@YO
zqW2w*F(i-qjkByyISH2(i052pnpT3#3rtK;6jF-Z
zCcFo}Qz^mg)=?L!yh%>}jF@t&x;BClR9A`9Z}2!^b-LU6*r{#G2Mi-@g3S=Sj-BR&
z&)C&QfSj)=PLI>tk)!-Fp`na+OHwg*uj3L*?#nf?gu---VBa&lMSt9VjKuF}RIL1U)+4Q!X()x7E(bpjcUv
zxcRD5<`~Lkr)O?^?QHR8QI^tF*p!E-sBzsD2eBkbqsapSibC;Ztmt;AoyqMv@cZ~b
zkDW3?n2F}-dTkTFuO*qNjp&dnL%RrHFh~Mvg+6Y~rg8O^H?ZjQcgmqcx
zUHEno7G&hz5FY9LsNpejVake-#GK+F+1SQO-YHvIolTRn^q^li@iyx`LhGH^yId!w&v
z>QH`OpPNpMc4^|wHIBNMyv^TdVv?LT!3w*A>^LMq*ijyN1gfhzu=j@Xf^*)TymnImO9HBGh
z<}fp*+=J3s5T?(qbjv)h@fnAm2-bsGakVv48a9IdK#Gorc@acXOzX^Ht(TASA!8)=@lVNE}@
zca;?`1ll~OP}NqkX?I6df~gXzyP2V>{0hfAqw<(1lIXFVo4D8Ew}K+OTU3JYYE9$!
zcj`7nD1|YiShB^gA}d^kYNDj!;h-FQ;+x05b*z-aok}#Vz;@Z&oJi*&r^AKM!@Zv?
z6*}D6QQ(13BXl&Vwg0qNiI-uEX;MAw?RFt&pI9wYg4GaglN)DBa&2;bw_E?Xmi%gF
zj&7VZS~?P!BOI9%?XkGs&^MI8DRHp%MQB?3ONp^EA5_2NI%P5>Wtipu)QwS`d-z&p
ztJOs%)TyA2Mxt$<3<9eSx}5X-?Ik?@?M5^zX%h_I>{aMo?4dy5y+4MNvz2{(Ft=5e
zfvsvqK7666mGlM!-xCbE*#`ZI$@WcK&!lR`t1Wbsu=h6-WIdk87DL`#!Uwz9frt8TyScHDOL&KixiBaIayvH%6I~t5G19
z?cfFR(-c18#GM|-p2aXM@2aZbPxrMyOwtX#c@9#0!v;eQN+!Rw_tek!FN7wRph#Q2
zL$Q?YQgP%5q(tPlM@Lsjn!&;9Q$igrOzsZOop=zhUCP>sIbDDmGRtKiVn-
zg9;f0M+g(1w%z;l!gIE!SJDiJgcWC&GAcH9c
z^4%>w3^GS6k&1!*%xKO(np^ugT8QW=YgtrEUsLsk#C3{WMoYrA%ylR@8D_aB-yHC3?F=7=-$CW1`1NObUixw4Z1Df2
zK*%RURH9CUKfH?nhh<}%CxJiad}<4I$X`(8{{@lP&=X|>+&9R|8~ELScj1phOnIGk
zk&WnFt(5N8Y;-1XS9NhFDn`p~ccsA$_VJ67J8~a1p&`2>3={m1qu-o+;2+-@a5T*b
z<>~0OxaP0(M~yJINcZ+Kn4XNhM~#hW$^SV{*}e3^Voyin;vJjJ<{wr))mYJaR5Ga`
zJVhgQYqnd_%LYi!VG~By{(a^5mU`Bsu$xkomd7XEFln}Ufs!kX5h+3n%v80_m96Fk
zMaTtkRSU{c9nXtR(jHfB^=2Pca(*)1-(z3yV>KB`cBl2+>tdIZUzY`?rE<7iv9D}o
z!)IhmEvfoTK(^KlcecBAYqAr<_ddODORG+i*KViQh<$81|EuqEOG~_QR@)bZy_wsl
z(X@x-C08v*cwKw91i8jk>jF*-`CRI~bC<$y{3?`br$d?oQ_A_lmQ)nI_LhJ2dv1uC
z+kLUpnrneD*xQ{IbNoG=x^@)t?!14eA&2^%G|m5{9JMjtUp9nJiH}ipQSgWS%psn)
zKKVk1Qd+2M%(;BN{CYHGsoN8f*x!y}h_Nt)Y0TXGdeC
zRw}--Fb2h#6Or`uR5=NV1pRTn(+cuC6w0j9^kc)&73#&eE@SL(~Xc
zJv=W~h^?;>rnz0H5aZCji;|yJy?eODgMTIX$JoUPxmwXD*=idPobR-FVU7Ib^(>NT
z>pSmm*Uhi5Ij9{9-MD^tat=HPA6?OasLydd&f1vRa>wcXi3LB=w^lY$cjrycnwi~$~4N42vp%w>wADdTA*s6hix%~cOr1UyE>>cyn
zYwz-t8{ZJ`nQeUYW>zk&EZaLYVR7iZr>-x`&o?o5l6<)M?hXZ1(_$&lmlu=wJX&!J
zd1hX^E~3)7h=L{@6yeV_`z&vgBT7W$JF
zr;A0VoS(k)VJ6neBsW9xjD&7UV^OsP-G%v-ysPgTWgmMO;)4|22P3-39Xl
zznvABO=p-EoSz=vocJW3n7MED8=W<>lh}(CoEAJ+TqynmV}N)fWRo>16(QJsAlR1^j-8Y;J2|Rwna(@9l
zp)loGdd3Q~#00%{h8QOi-MQ0_s0qn$k~Cz7u~!tFaxHNbFq9No!uB|^rP4|8w8a?-
zt5#cL5&guKMVaD^lmwMb4YD#?Kn$(7GoyN;xZdgu^5zFBa6V=7PYQ@idlIpGd@_^o
zXHGo@ITUW2k#t^Wau*{)uH-g#?kS92y6MakQLPV*8%`9jajuqF%_8C9esD6K!@?baIH5qg~wJ|iII*sQ8L
zFT=?(3#QGS{r4Upcw=Iyx7CytS7VE#GFOn-;#DW~MmJXkOEV1!KOJP-AhI7Vjuv)m
zyRW&oc-l^nyfO({%8hj0BlCmjOLmyrB*@NhIdRF~X3h221vaJ`;zDNvuL@kw%PdIy
z75P6!b7>{h^a35PY0%`5pInIA<^hW`_obR(IyCmnY_>m}X1hjzt#4P(abOqM3u0At
zr_7$QWM)7Bh8CuzC+~z2@uSKX9k7?Rv=^up4vZkkM^|0Y#vv#(l#ZzjRZQ{*GDYsZv@N$LsMrBUT
z%Fxgw205HHEN8H}CxX%q8Hu%SPJ(5(+~pN~U!Tf!*&rmOcVR_n)-N(MU8Z2yoT@Ku
zXmcSZhP*F~=-{y5l8wUkXm#{2M7#_Kz1yy6-VJ))WNthviJ$IYP?*=ULZ
z<5*}BW8!1@`k<#1u!&c{D6W1Z{^Z%2X@bkhRP23`*?L49uftfMggwDN`}R-j{Ot%u
z>9Uo|l52LT?lU4~R|Q;H;9Z`gR?e=i5#KJRbTr+xX;EZCQl(3PcZ9pc)f1Npp(Kdy
zY?oIRiTh)0wM`tvj*$PH7dzMBMf$1fYcuHqht3N4nq#KUN>ekHi{2-V3^GQCrgz-d
z4^7Z*od4S;yM0*xJN?q5e)^rNP3Sv)VHP4ALy+b9n1ygtE4vDhBX^*uY+9FJS(0>L
z&MML=513l2wN)T+h>i2F%FlZ3IMe*HY$?lD~
zzCD4?%CMPiP)hJ?EEG9r)%@hO#yY_{HPh$Km0uk0B7Oa`e5H6(;-oNRG@;OlP>auw
z%x`>XD8G-kYIEy0D`S3OkpY3ldVhicCj-mcQ3e*{i481yk@=h|e4#;znHc50s_Wwl
z<7?GHMbRgApk1`}<4m)D9li5;vebsc_)eWqXW{XT8XCJW0%|mc^}n4S`DH)zqsitY
z^A|3V>{vNU=kqe66{9=kHxEQwqFt
z=ADpKe_^>sRz;d@L8%Cq39e48V|o*&gvMjm6h|(2TU729=z2(K_4C>5{Lj2hjv5|7o|w&?5;SAy5A9z6GDZj0^5*dLcFFI{EnDG?
zHk|2kZTk634wsIqZTkOVs=vqRV+cGX`y9s{hEvMgy!IitP
zk}#=Qar)2U1qXEZ2uMNgkaYZekBAK8HNIVi4UC%J*7N;ni$hKp`M}%>mRi>s{^6g2XNQ&dHs_4#er!BKADF2@lwL^d-3J`}o?}Pc}L`#0Q;;70d
zk86YP?mM>3YiVjksEyTtZDJ41TqOTjpwR!9mv=2yjTlWvsY&U*S%EuF{hwsQs=@0M
ze*f_@BKgP2ut8+!9t{(^&i5+-n-NSHczV*;et5SDj8oGrK?4A6f-h7vm7`3n!t|#v
zv<<)h|ED}k^DIjYfrW@Js*~VnW6>f>CIaDAg42l`qQso@#&6N
za^iPfGP4u?{y0KOjINp{_(U&j()0QQ6tf%9^Yi7!f@IApVZWV4iRn*IwOu5yckRHM
ziYS7cG(eSAo|<9ipaZhl6o4h)_``Bfu*{i@Q^ke!UK8Lu7Ay-$AqZtVOIpRLNG2pr
zYViWF`rP6Zzb_(bbxd9GSW2*kA(G@HKzOqJRhG;sqT*1nu3DE-8C#v)gz6cd{|`*#h#;E_enfy2BDi0$2R!{MbTMu!f3h;66N{UIKp
zo0Hof4I4hh-kVtubSHdmhxMAyM80@d{=?#g%%Cp0Cb4A$5rTh*B~#k^E29GmMb&|~
zK+|kE4%#X|*gE`#U~-tXn1PbFdp98WjlQxK!wV(6hfKl{$6f^@S^Qj
z{|Jc=qipxmCbr$%21jorbrJbMVXKjq3BSv`9CUeY_d8xDl9TAp;@uF+ij3Hi)Nm?b~R>FS9MC*uN0A)-s`
zBwz`N{BrOF0AuO^3~FK$g_Z_9A;L%?FKP(L`$=a5pV$Y8SGT$Fn%0x7#q1;SsU#|Z
zHRAwSGf`0tJar^CUv2InW#-cuz52xRNGd{Xm5gnIMtXV$n1n*N1E6D_{UK%?wGWEtS70h`a&Sd}880Ns)kCDI=5EL`Mmw5hu1;&24_X
zVjVah=po@oINr|v86$%g-lGI7nkN>lK*Gyr1p?OskfwjQ7V2D`<$Dte`u}8={vftl
z1#HuaaKsa?b_z6*3d`p3IWd0#h9%&{*Z?L4#Z@KKefr}OXtO`a0lTpI=U=d!M@(BR
zO$$tetJ9LQNk{%cQu{%&mZxxZRu}UlanI+Lx0Q?B=>eed;KRlJK;aMa_T1npd*9$`
zj`AZUotCDKKS`S#vGxMTp=XWROas{ZlN&hJAwUjcmx@g71teQrM?oo}EXr#?^do#2`;9*$;F
zKNbFZ1`MbdRiEmm-M>AYbI(8G-4?<`iPU^Pm9#r
zJsRnF{UZh6xs9?Of6hh|=deBmLY45)A0!5X{8Qp%`DZ`F$4BP%`d=wSP(oWe>j%kT
zz#H_gVY5DMpqUCzl9CB!iw39Fa%e_BM)}|lcPob_*pT5py?Em&8-6c77~r7E_B%*}
zgzTSQ7l_+h*$)|%Q0)9cZV(`6B7c6YeD5E;o1!3cX`jukp@j3gQ4-Ec6H7QhOVbyl
zlS(1{X6^{(ZEr7r?Gd%^`wkL-TdK0y^B_yL(>czkFTXtPag`s1JDumE
N|ojP_1EK$zj?KxBk`1ZC=v@;yA>NGD0b>k^86!^E;|5x&1JF
zR8W1B$WT7h@F&GeO&=(aU(s1BC`I8=_IbZr*!FA>oa@7ygpx#^&5-piU9j$?aLU&Tk6UE7V
zI`(ky`Efe-cMt)oG5eN`G6ME!Ii$CV0Lh>aO_ZyY9s0`%GAk3@p=LBYD)T}(qkMpl
zV3G%KHAROrf`3`#_5J0apv4(Z`)G@Eu=*RK8WUyZ(i{B-i$DH|@mhA(_jf!{J8<~!
zbCmAIab~*dnZ?4(Uwr^ifDuRYjLUzHFbpyAuWuh89^}&`KMD^H)oajxn;AJ%|3~sJ
zd!@<9RXxKVpN;Q*szx+1IsOH@ob4BJf&^FVxMB{DEc!FC?5tU7>cnWq=mTJn5RTcs
z9_Oj?^pDRAa!ouyn21Gx9w6*bK>M}T;F3sD#mYpbkTtc5I0LCZ5?ag3tdVq^CiV)i
zfh(lek>G0lG3tM^U_LA$`gF!PD;#EmL4P%qS2hTg+SBiuK$xmdT)jI8Z8I7i^aFuB
z>$!Yg7$7>yITsj`W8q~(w=aiqP%H~(8=y+ZKxz49Vvgv=)e04Eq`0%b(bfwdo}
z5q@+i&|57NsKc!-`{?~GQ4u+PJ?Eh3#J)kk8eSofd;aPRM?JwH`ssx6Z?cK(~txD0dFgaiRfvwKIKsmO%P&
zUheD(jx6%QP_rZea3hD4Yk2b(e-vmjaR;eXKRm&935467aFoUYXT}eHxW#
z18pZQ=usD=@teJi@fAl``!c6VnY=FM*G|vi&=I$+XfSHFe3pbKzdQOUiHnZ
zeOjYW^^{Lt>5(&pgZY+e;R--McG$)BDN}wI7xxU44?!XxC)=R~zuYRV)d1i|LSJoR
zK3VakQRs}th5=I5KnG*EvOJze5sQJgPtLQ
z`*1Wv-J#y3PbBuc@g|5g-tL0I#FRff&^OrPBh(}ITMK-2¥GN5PUFApm4A@+9BE
z+vZ?mu=?*QK@Wdcx!ChwQh=ED#z(nzT|x^sdq?@pHNOo2)F%*
zo2x_d7TFLwG{YJgKMRENApB=NEK|82nk=NF@p9_?vg
zmzeaQZjNNCZMvz_&Qzgn_!p;>>5=#G2-*4X)t8KMA#kliAIf8Q6bt|PEmqmdnzgg3
z*Hc=x^sXfMq8B$y>(DqI4)580lIQ+4b&hra#p$ngq7`Lp{dFK5C=}TSbH3A-okc2C)Uj!zcGTwn??O*=_{`(l00JqaZxa_XtZ}a~>B|yjRB2bO?Z%!E46ETtX
z4gYZ6U3I$O=tclq(jlYW67XG}Z4oYn`wi*Vu?u}g=>|e&-1Y+P0B@@=GRR5D9evva
z#u(jtM`*yHKw-ldPweH4e@S7JGH@>IxneKCVvg@Aj|8A(4Xuf{@jWg?6o?DjW
zDBM>U+Jp9Z#v)ZnOjW{3@=H%PZduk_l0I+oNs_+sAo&Q$w)D!<0PKr9_MH
z1?jy@pVWJ#BTh&7oS%jSEdwBwIQMy*<{?SNS>&qu-v>Mb@_tUfKMT%4fBVr^R7CmA
zp9a=hU8}wz?^}6@KGE1e#t!K*>zgXkK@|CQ0oIA|HnSk4f6vhbSE78lZjgxjMbJoZ
zf^`NgUduRpLnd3a=f`cy`y0v59D)XCvu!7A!LQKD-D3S?RbC{V#86d>E;FNE@aazS|4F
zi(6~Q?d)(pPB%{Bmv3^YeU
z+HXfv1Rd;>#^1J9PV~j0P|Zl%*Y-08Dw@Iep$fmln`Rq6(d|QAh$rsr5&sbmc6Ko~
zs&9wgsQTHoJ-rJT#~NP+2_&8Vjll6>r@prawf4Re7OHz9-gQ(b8^=yPVQezvL0Zhh
z6_zpBD8tti+Bdua`i3-=ddQ$y$Edj#ALdy7MCU4r1)#DSbbR-OL0
z7c+xbc2)wDP;6STLNJ_3y`jB%;(EP!+?b$PgT66o)8R(c_UG+?u;%RMYgoH*r8f=qjq7Ke34x
zplYE|TAWnmQREjh?0OjpBLp^JmHfrY$g|=&VMmhwbWoyB408nJ$X&(X#6kElNAB76
z-P3;3+4#y`do=#U!=Z1*<=8(uITDRjiW@4S)V~(Vb7{%_BsV3iI6G=%(x`-!y@guI{>TCC?1b2zr4{nFH_yu^I&mM0mVY}*p!Fe>QMClUQ`t>jF*a}Mg&D(!Th=s%De3(?jC627JdZto2ZVd7EBe08)KT6!bfCOloJ|8T#f0+}o0_*5oS#1Y
z<_zvd5agq)F7VmuQW9gwPIm+B^sa0UCM^7$sT?CY7Zlf-A}jP%W9ZAHV(*L0{?|r1
z{bR-}zPIv-gyY*ArwJ|?J=C;n`Iwdx)EM8f;ZBW6EVTp)ckGUg>V@JTol^1$8y}V;
zi0L#Elh$M~M(lv$i5W>h=b&K8F`#KY?O&f%1)L5!6qJa61RY!m^@ZagpPL9&vQ)|3
zC_2iqIhM@WStI~I8?zB(+9T?N(E6HRx=UtG)ch^84zTXW?aDT6xnH%|dz8~jhi8qQ
z|3|8GyvL!<(3_X^G>E2S*O^bmLj$Fq+}JVsKEiZ13pLaLN(RIIqfiD|3brR0lthz;
z76mx-F`nWi0_CD_rEw2y?D1PD12fZ^iW_$PV`v&1XCg@B(UD<35etS*O*eUunM}bf
zl0Ke@`KpoW&q8FqSoQV{@!_L@smX7PB4+|Rd-eW;>dE6azVk0UHbtd}l%Z~ff3j@R
zaX%Rta&+aDf7|d*FSqn#)0>+_vYGR(m!QuAHIO4+vX&VxBL7PI&u{4EqsEf-HrUYH
z7kpr#Gqm7{=wL4L+)(V_P|W}?5`{#3>x|=vM4W#N6_@b*AcG$A_45MdLFomTpF1$Q
zI$j>*feJD0#w+z7B)lcM|NE*EfEI@5rH!Y9i~~Z<^68s$&!I
z?*Mlo6M>R=72_G!_@V^U3|lq(){HeVlDK5RCrYku1kM@j5IUz@q`kPdn5*mcOqbgIMnQDOZXRUh)VQ}+tCE;aXAm>buZ?^AZ^*Wcf2}sq*iZcxoJ?>n
z{e;NBp#sP+uelxL*4H0QjeEgW50)$IbO24T_{0#QJna(PcxXs~dIp9>j(a`R4?z~U
zFgETW2}f5ARi&gA6;Kb2Jsk{4$#L1O4ZhzXN;Y&>dPKbc1EIV-K8EF)isd6eHp~sV
zk};(W<>oR;m&S+u^$(umW$vc+s3k94lL2ej9jy-INk`RlI^ZMJQEheCFi<2ubG)
zt&I!8VuZJ5T5!JAY=eoUi0Q+n`<;dKh~uVgJ9hFPqX}shI3L@&%O3Y=El>9k5inF9
zH)I5ixxi3b2>h7NZ;ptK4Ar$Y+jVSYUE7S#Ga_TAYYTLrJiF|9QTNA%#yqSN9Z-IC
zp;#QSD4lb3NW69*A2K0;jlV+tdo<+bk7;#9i~HHwlPwO&QUZm>P16?4+;$bmut?+B
zo*#*;d^*-zGGUI7!;akblccW=l9;A07`rAm=st0>#z2LvPxker*sa3PVfXlC
zCfDOP1%E`S5vPUFnEdqu(tLq6uG7E!(D(qP%8urLCdP~i>JZ|=SwRU~wb}HqmRJVn
zSj$9@C#PZnfgCEc-x2SnVil(%nUFMTP-dUG5;2A;KOge(>~j70Z*5N^bLg$jb{H3~
zwXXrv^V^hq2lbIY!m1cqWuNax9?hXo8@F5pq>!vS*!cGhM_`@Ra(Ern&&m!fL>Unu
zl-PAkziq39Kk8ouM*yS+vdBIb>soXBXbXFR-exb!4#Mk@P*4_szH6o_x#jYBUh16
z`PqA0dR&B-k)ByD
z-}NOowpvy~(Mgbd?Oft-I2o|_nP3@G4d`c7^K{dhC8An8oKJq+Dj5RA_|
zE)3k-Y7#wmA3AAp0noO(Z*m~O`#08&+tlgD3b!FR>u*v0%~7TICQ*jv1M8?3yR0sE
zTt@zu-9Id_#pYk=)DO**2i8%k2v&gNruiqna}?`+XBfM_ccvx%4cn-CI-}fNM)SR_
zco}SSXQ}`~c!NyW(jyf?20@Fq%bF<0ip+B^ot-hOjA98Fu#W$2=Q=hu1as-3+RN+j
zvwN4v(kq~!qkQj>gdk1!Zgb2JIwj`-f*8XG6*sPu%NlQOBeq={FA2&#_>|42}&{X*`hszn<04O+g
zOWtYz#n~O*d^?6q%rcx}RQ9kfy4ul4&#A5J0;M
z8YQ2Srv4Z1&HhRypM=A2xAvb*81*Z}cgS-C8BaunyTjEJmk7;6wyk~qxuu4f!Ayz4
zX0U*TzCG~`TZB8Y13hIGP=Z&Hr8JfeD8c_TzKQMNuQ&ccpn9m7Tkn*Wi^gc;ThB_-
z*B4siql#A84)v77>Ir$gYe0%}-87Jyk1D=VY8tvammBDUF->?Bg0D)n8>kYU*k4eb
zFrZ50H?WuT=p==n)mD%&q1PGVGd|pv`XTP#>H-)khyNJW>PCKI5?v*cjT-PKik&V~
zMqJzFj2v9sr9E^7V9$nIzn%@Z#7V8K?X6rF4SwJzB{0tUs4d+CmUca{-vKM$-N;wh
z0ZY3^cx@Nv%Zmlc%6~3!*YKAcel~FT)_{IA!aK{516^a5P%>QH5KbMGoweY2z?n?&
z@f1M06h)OC%hRc8;&AP%(gwm{3&_Np>3?rpa=WeUhiq>gl|Nae
z6&gx|nSK|}q^HvHN+3E9S>lV9zR$|97f6osQF~gXR5_n)L8%Cq39e3L4cWXrbc?Sb
ze>Y`Z?`}$=3%+O!x&}soO#Gt*ipQ4fXA=jk^69jUZATB7B?`dfydD-+4_UoT9I|?O
z*e2MXEr3gVwg4(?yKAJSrMV+4PHKemi#Xao)>EC3pB{qs#Fa_+V+Pj~|1+tC{w^}A
zBCeIcwk)wDYD
zS8o=VNy<`gm@icj5zf*6JIdtC#SQ7eBfsnXE*xf$71$WPz@Uv*ak)zp>uL0hT?MJv-N1yag4TCD{Xh0(@j2DN@|
zv8dD!7bJ=bm0b}NmL#Iobi@)m+M-2?)v2+i5^W2}8Zg>0g%~v=NZ13UAqEH`1hT#F
zK9-oU8JJd{dX9QL#N*}NcmMzYZ@b8OaPGg%YWmULYyg2b1{du1IZS9K=mvFM5lPUT
z?w{tSw6WBqUKV~21s=N{EJBBO&J(S47uTfw(=(GPUH#J>0uGd_d+ugfwRz;u>DkAP
zA+Nuwom^Lf({nBW>P^B<9&-5km8gXrVLx<|ndRd5aB<0pfwr@glT>-xJ5ZpXZ`!}J
zY$SBDcI4eqqoI`!-p@uWbtyvvQ>o9u#FLs}PFS}4z20?whK=*j_S1ZPl&yA+HaVtM
zx_HbQdNPN<8QclGD+GV@s?V{n%2(Lgp%l?!SHl&p-$1a4A}CV(>uIsrYiwn9c+4JWvS
zNG(y(A7200xf92Qmx?m4J%V$XiH{%swC_r|#5UP=PT=b4XYb#6Sok(HXXR+uL=AUy
zf&;jiz4)WxA*+&+8s`Qq$Ltq#7+t6_2nsC<94rBWZU4m_$B<`Oo<`0z0K7_rQ>y=W
z!-_Z4QD3|Z#Wf3wOZ=jpgLl_Is$rL7mQR0OICH^#qe(6vQy4>xLs}I8ZyabTMR(?o
z#mNp7@4sZOMyRj$AnA=W7dW1Bg*5`%7BzQf|Fk2?lEcP$)jA(e1Tq4Xz)C3q
zD_eDn&;A3>lfNTwbpZ4_GDOEUmlZc*ZUK5g>e){ZoH&@)usBX|s4#DA617Pvmi9@%
zlOc6+UegB^-hIoj-;BhRvkkb9L?)v!EZ4twY@k^o>uywh_Zw0d2XDplG`9xlBllj*
z%G_f#p~kO~hLtJWEXD)$2($=iFHnxm5i}1N2w0L`mqpw?nqT#ge_4dI(xm(
zea?6?-ih*W4xe8kZtO*$vPA@739C(w*wj63{$~Iw7bbl(L-CL;Gg_V-+b8{}B-^T-
zl}cAPTKUmCL{AF~LtVxkw0B3i|E?d9z+36z1w9@MBSZb&SK_7Q>shmaF?2$_6==Q`
z3hAU;6pEwOpM%H3!`wg_2ii;+8QNG5@K`~~-0bXOTT`e=d&bth4YsC2GMNtS`7N(-
z72)9M%L_AMd1;)=R4l>}6oE&BvjOroxBaz~)zub$a4}Ddnn*D}9JN~aA4EYY21h2W
z`HQ)kWN(u9_aL*<^-DDc58(dN&6>v!X6rFM;l^iGI&hp&W{TngD4AAN=B9SMXr=L51{MD?t)3_jD51
zzi(i5$Bu`FP0!q8tch9@`rG3skiKgxw4!_R)LVqv&XFhJPr;S)%@LP)Js$6U
z0~7(lnik=*6}i(~e~lYZXiVE}ytv=$vi)2F$5z<`Q4}RwfhdlD*feM0ue-}}>Wn<8
zuX1mAm#!;VJRY#uKqF#E0SIHRjE0^53U0qI>vfT^apktKs(#f_Tvqrz%>Ia-nZ6$5
zNoz!)E_#ne3&@&H`#TO!wK^702bo7F+8JJu8j``V}G8VI@-oLg8nNa!&
zk{{VE=vn*
z815WE_O=9|o^@F59k1FRB4+Wmo
z*g?+=_&4kp2YHReY>seoM&A2oOMjiW+||e*tRlwBeN&+VEjK@+u80gtt(o*s?Oncy
z-Ly%S3l9Rf5gxdW);qW53&wF9F}IlJHu}J1x6$aVjefQ^);cMv_QDzSWM_6gEH1j1
zn|f~JC@by$S8P;tbS$D&^y9Yr2BcKyrsIq!PuWtBy`utJIh7n18#hv*z?xD?komLZ
zg;r+=`6!aZt#ZtqQB*UaW@BsZp=R-jvgX|P_6hE1HZFo4&&4Qa`gt;-y|@`Q_|#OG
z#B(wGEJnV6Kt8YRY<(a?lE&PK1~vc=ob9ZQ7@M9m_QJ(GFC>rz#kFqoQmbvJ7VXsAp9F+x^H2+Zkz=
zi~X~+o}(4V)I%f^h-K#8@B^)+jJPB#o27S70c?(uAwi6FYJ?JDoGn=5Qz9@F+|9FU
zboM_LLrnd6=EJp{=LyV!Kt?v8u{c9HA5wwHZi1IfKNhA%48Q9OQ?~D!o+#$;VI#3%nMvGO5bMU54xhZ&}XMN`xpw)72`&=md
zB)IVDlL9jgkKh3{skon&$>RG3c41O0AlP+1eeT3%AlSV=UUjxHO|UDPv|!hSV-S?E
zSs8*MsZT|Wr$yk>U-eNQw?%xa+BbE{#EG;&)sJHGTlQ{chFc^i{ljZ0;nUz1zgLpyO*V>n0uEd$uL7sb%nj6RWZaAVwqFwRX4D104?iLX~Vo0lTv0#
zS3uu5LT$aQ2Dah1$|@!yY^7xUNw(RE)aoH&Yj|MhTr<7edc*Zy7adN1Q`PTxwjKkT
zn}zx&;d*Y$6!^d<^4`JK?MQyeOZs7EjZG-(D)rLBY;)b`9R8w7c-#)SPkq}sG^pi&
zZ!mFJtt~l{5c_s;z#D**sl&4hS74D5F<>N<9~IjlU4N!5$9!wHt=!51mQ}22o*O&s
zO8>UJN@FOQE(jLw8qmCB8}ZA^w>^9chC7{d-DJIfW9W3iTyTKa=f!~|4V$h(`Pt8|
z-!5qLd${XX0EV`}X@z3b!`trt2?Me5W7rd2oHC;C14j^Y$C{y|(jl<*%Xc@6vfE#K
zT^OSgo^rKWd1DsbD|>_XWCVCHg?8DA9+SXv^VkX$?*yY5HCU+2MO1LYgj*B6B2o}L
zC?RL>xCOHPaN(t(dTV-L5KYB!Xr#oaC%Yv!dWZv^(+%R-5{*EF*r+%}dGAM;Fd4(F
zqY$9S=A)vA4Wx*?p_PY`bzBf7~L0$rXRO4RbYp!$LQCpr{6xU?O8}1tY
z=!V|!GBA0wyP%>=z_{0b7@ABJ7t4PNNyIU2iN)&+=QD=FPhk>KhG5^`P!gA^feGm;
zJ{a0ipcAkGQ~oxf5jofBjTrZ~X<*Pu&t9Tv?v`l-jU*sQZ?1MgK&IcM;JXo4%XwSA
zK6OtX2_wmHreC}!ME&9){(~eiT-Uy#CIKh`5CBSRhLGYKY!sDnL6$&B+_?A6Q0IS7
zQJlbJH{{8|4VhnS1`f%_wh_-we9F4ODb#lQo+!sDh?E&iC1~Wa98)G}ji0|KF=0cM
z6o!BR<(rK&N`X){B#xf~LGhhJDZ(?NL5Ych!ELQ`kK~(!a8Ryfq_gJ2!AQG3{Q1ac
z*$l_g1yA)ciF0@OH4Lsz`vUlC#zBHhav5Pq6RijUHZ?y4#GK8BJ(T6AS15+aW#-=o0EwN!#y8U0USj`AHqC^g63
z-CwPuUun0U>O{XuK$Igxfzr-c(-_`ROw6Yml`l)xMi4O}2_;^eS_$>2GF<37O$Jlf
zn#Q=ufO;!@(E;g&USye!)I~+JC=ivv>Ju}`%G&xOwNAv6t8rTKfgXwWohPg~r9fF<
z1j)37da{hpQa7^EMXFA_xW?|qVhQRx-bU5Igqk`sIz787eM*YV1+V4g;Np|XV)H&K
zt53orE7{f*6~QJ(D~Tw2Y}32qHdEKB5Y!i{b+sr+)P)vFT*#1)ims!mS*%{Rw;iRo
zDW{&IRJ)KhwfQd2(PXtQjR1i~K%EDxyfH;FkV33d=?+th`kHt;B^}a;D)B6B5T4Z6
z?UCcCB+%EkchtpegV9})D!Z=8ShYfeKT%VIt<%{Z>XTbK60CjcH~n;)Hi?HiC7;T3
zMC;=0dmNRO;Db#3MfFR#a8Cz3%cd(*2R=@|abI|%Ovp~t{_fD8iQ~3(iBLaaN^;Ut
zQd_$^iE+^4W-(8_ghrs{;F5HmBGlUU2pqMhzTJbA(BbZ=-bl~P438jJ-{;_1y8V|e
zHS#MsT@2&*!_j$#YasZ4Bp`jYsQ1XcLu${<{93M%k;1@rtiw0tr|}#K9xiX^kubaZ
zzs_=NI2w({Q8E6ygkG?sT^Dd$b2Tyemcy$lTe=&0`7fWpOY`->^|c7;c&Y805~UKX
zNEt{x#$@v7p6NPGKq*%$N=ZZI`qg9OXXlc7ZMygywT;tM;5$x|a|w{>kWABFN$G9P
zM?)RxI_+a?=!x)JcYB%=Y!fMy5}%iat65Lc9)70~;^ucyNV#;Z-~05AOB8b90f@)*
z6|h#XQSanU&!HUDE|qAON?W%#$ZdHiYp|B_b*k-O<_9J4f@^T#OMbe`d*G1%GB$)n
z{=a6~_J*HrMM3ND@|@_}3hvK+HJCSUiTmo~u=znv;pyU4YoIvZ|C~=>Ux(RCihVss
z?)5|*(=2Bxy`|AVz7+b>Ni&FTO;gn+$?pwp}
zs!tQ5idcCno33tA>JK$|9M}|O;s@PYacfkmI2GqiIp(qTW9vA2T@CI$?lXA7m({#i
zn%H#w#W*N3PP?kPCpMzRGCpT!Orr*T5xKgXiet^`B1S7d=x*V;tcX2SEsiQpdM~zM
zb%f_#21_Nj7Afm>ot~XReW|#Pj^k+@34c*oDvq^IqvCJx?G$-0>Z3ofzD-%qn#tpx
z)KD~^5w%ODC>Dyo0jrJ^`SNsa^;mUAC9l<%5|p049t%~(#1`eUL>|A(@fUcMAl)+7
zQb>@NQ^`zzCF29uyJg;G{Jwao8zNIQ@5if>@H$qecW-S4pQ5un+?OQCVd^-wP=Us?
z>MiAa&3mXA9gieSqt}thx+FYyNqjN7!^0|F*Tkm=bEUmCh1R@}A1mZ6g$wy$lwXQS
z%!{CjC<;w^4b*i;ql7wBp%%r#4|TmhT@rNB|I+eAk_=A1oa6g|4i)r>Th-|F8Ib&de?3Vl
zY(amZJ6(2^qST`BWDS2qujt~UK%7pc&FLtDd|BGoh&rfsZ@14wG+D*wqba>w{x2-D
zyj@@kEn4q=B{xso)z)6d=h7*P77k18^C%U~FH&{wJ
Date: Sat, 23 Nov 2024 21:39:25 +0100
Subject: [PATCH 226/266] upgraded some plugins and dependencies

---
 pom.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 52b653da..0203eaa3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,13 +65,13 @@
             
                 org.junit.jupiter
                 junit-jupiter
-                5.7.1
+                5.11.3
                 test
             
             
                 org.assertj
                 assertj-core
-                3.19.0
+                3.26.3
                 test
             
         
@@ -81,7 +81,7 @@
             
                 org.apache.maven.plugins
                 maven-release-plugin
-                2.5.3
+                3.1.1
                 
                     true
                     false
@@ -91,7 +91,7 @@
             
                 org.apache.felix
                 maven-bundle-plugin
-                3.3.0
+                3.5.1
                 
                     
                         bundle-manifest
@@ -105,7 +105,7 @@
             
                 org.apache.maven.plugins
                 maven-javadoc-plugin
-                3.1.1
+                3.11.1
                 
                     ${javadoc.opts}
                     none
@@ -122,7 +122,7 @@
             
                 org.apache.maven.plugins
                 maven-checkstyle-plugin
-                3.1.0
+                3.6.0
                 
                     
                         verify-style
@@ -176,7 +176,7 @@
             
                 org.apache.maven.plugins
                 maven-surefire-plugin
-                3.0.0-M4
+                3.5.2
                 
                     
                         **/LR*.java
@@ -199,7 +199,7 @@
                     
                         org.apache.maven.plugins
                         maven-gpg-plugin
-                        1.6
+                        3.2.7
                         
                             
                                 sign-artifacts

From ace11bc484d2dd8051ca33840257db72712e9b90 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 23 Nov 2024 22:00:14 +0100
Subject: [PATCH 227/266] [maven-release-plugin] prepare release
 java-diff-utils-parent-4.13

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index 6d0fbdd2..7e7d7c82 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.13-SNAPSHOT
+        4.13
     
     java-diff-utils-jgit
     java-diff-utils-jgit
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index c18e88b0..27da211f 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -7,7 +7,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.13-SNAPSHOT
+        4.13
     
     
         UTF-8
diff --git a/pom.xml b/pom.xml
index 0203eaa3..799c35f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.13-SNAPSHOT
+    4.13
     java-diff-utils-parent
     pom
     
@@ -29,7 +29,7 @@
         scm:git:https://github.com/java-diff-utils/java-diff-utils.git
         scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
         https://github.com/java-diff-utils/java-diff-utils.git
-        HEAD
+        java-diff-utils-parent-4.13
     
     
         GitHub Issues

From 0f7c32b98393f118546555c5bf633860de5ffd1f Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 23 Nov 2024 22:00:16 +0100
Subject: [PATCH 228/266] [maven-release-plugin] prepare for next development
 iteration

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index 7e7d7c82..8220036b 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.13
+        4.14-SNAPSHOT
     
     java-diff-utils-jgit
     java-diff-utils-jgit
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index 27da211f..802dd9a0 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -7,7 +7,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.13
+        4.14-SNAPSHOT
     
     
         UTF-8
diff --git a/pom.xml b/pom.xml
index 799c35f3..6d4ae5f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.13
+    4.14-SNAPSHOT
     java-diff-utils-parent
     pom
     
@@ -29,7 +29,7 @@
         scm:git:https://github.com/java-diff-utils/java-diff-utils.git
         scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
         https://github.com/java-diff-utils/java-diff-utils.git
-        java-diff-utils-parent-4.13
+        HEAD
     
     
         GitHub Issues

From dad43159a85a68656c73d2d2cc6c6c86b9bac4ab Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 23 Nov 2024 22:08:00 +0100
Subject: [PATCH 229/266] [maven-release-plugin] rollback the release of
 java-diff-utils-parent-4.13

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index 8220036b..6d0fbdd2 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.14-SNAPSHOT
+        4.13-SNAPSHOT
     
     java-diff-utils-jgit
     java-diff-utils-jgit
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index 802dd9a0..c18e88b0 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -7,7 +7,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.14-SNAPSHOT
+        4.13-SNAPSHOT
     
     
         UTF-8
diff --git a/pom.xml b/pom.xml
index 6d4ae5f8..0203eaa3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.14-SNAPSHOT
+    4.13-SNAPSHOT
     java-diff-utils-parent
     pom
     

From 52e61d653fca450ca0df5e51d32e8486fdd531f5 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 23 Nov 2024 22:10:34 +0100
Subject: [PATCH 230/266] upgraded some plugins and dependencies

---
 pom.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0203eaa3..09ec71e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,11 +81,17 @@
             
                 org.apache.maven.plugins
                 maven-release-plugin
-                3.1.1
+                 
+                3.0.0-M7
                 
                     true
                     false
                     forked-path
+                    sign-release-artifacts
                 
             
             

From 23c80bc30dcfd8b1c152359725970ff1bab4b83d Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 23 Nov 2024 22:13:47 +0100
Subject: [PATCH 231/266] [maven-release-plugin] prepare release
 java-diff-utils-parent-4.13

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index 6d0fbdd2..7e7d7c82 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.13-SNAPSHOT
+        4.13
     
     java-diff-utils-jgit
     java-diff-utils-jgit
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index c18e88b0..27da211f 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -7,7 +7,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.13-SNAPSHOT
+        4.13
     
     
         UTF-8
diff --git a/pom.xml b/pom.xml
index 09ec71e2..408ad040 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.13-SNAPSHOT
+    4.13
     java-diff-utils-parent
     pom
     
@@ -29,7 +29,7 @@
         scm:git:https://github.com/java-diff-utils/java-diff-utils.git
         scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
         https://github.com/java-diff-utils/java-diff-utils.git
-        HEAD
+        java-diff-utils-parent-4.13
     
     
         GitHub Issues

From 94aafa7e68fe11917b06fd09db9d08107b3fb640 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 23 Nov 2024 22:13:49 +0100
Subject: [PATCH 232/266] [maven-release-plugin] prepare for next development
 iteration

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index 7e7d7c82..8220036b 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.13
+        4.14-SNAPSHOT
     
     java-diff-utils-jgit
     java-diff-utils-jgit
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index 27da211f..802dd9a0 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -7,7 +7,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.13
+        4.14-SNAPSHOT
     
     
         UTF-8
diff --git a/pom.xml b/pom.xml
index 408ad040..a15e39a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.13
+    4.14-SNAPSHOT
     java-diff-utils-parent
     pom
     
@@ -29,7 +29,7 @@
         scm:git:https://github.com/java-diff-utils/java-diff-utils.git
         scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
         https://github.com/java-diff-utils/java-diff-utils.git
-        java-diff-utils-parent-4.13
+        HEAD
     
     
         GitHub Issues

From 509d5071fd4b90299127e3188b7b06c58fc44452 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 23 Nov 2024 22:36:20 +0100
Subject: [PATCH 233/266] added missing sources plugin

---
 pom.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pom.xml b/pom.xml
index a15e39a9..c0552ad1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,6 +108,20 @@
                     
                 
             
+            
+                org.apache.maven.plugins
+                maven-source-plugin
+                4.0.0-beta-1
+                
+                    
+                        attach-sources
+                        verify
+                        
+                            jar-no-fork
+                        
+                    
+                
+            
             
                 org.apache.maven.plugins
                 maven-javadoc-plugin

From 1fdcf13803ed38a96da4dfbeb48c1288ee187d77 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 23 Nov 2024 22:38:43 +0100
Subject: [PATCH 234/266] added missing sources plugin

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c0552ad1..2ff6c49e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
             
                 org.apache.maven.plugins
                 maven-source-plugin
-                4.0.0-beta-1
+                3.3.1
                 
                     
                         attach-sources

From 1560c2203470382e6b1fb84f3454484042fa0dd9 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 23 Nov 2024 22:40:23 +0100
Subject: [PATCH 235/266] [maven-release-plugin] prepare release
 java-diff-utils-parent-4.14

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index 8220036b..48e8059a 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.14-SNAPSHOT
+        4.14
     
     java-diff-utils-jgit
     java-diff-utils-jgit
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index 802dd9a0..dbac789c 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -7,7 +7,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.14-SNAPSHOT
+        4.14
     
     
         UTF-8
diff --git a/pom.xml b/pom.xml
index 2ff6c49e..9cbad909 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.14-SNAPSHOT
+    4.14
     java-diff-utils-parent
     pom
     
@@ -29,7 +29,7 @@
         scm:git:https://github.com/java-diff-utils/java-diff-utils.git
         scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
         https://github.com/java-diff-utils/java-diff-utils.git
-        HEAD
+        java-diff-utils-parent-4.14
     
     
         GitHub Issues

From b7c1aaeb2ecb013ba2e09c7b7d1c9fece2170655 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 23 Nov 2024 22:40:25 +0100
Subject: [PATCH 236/266] [maven-release-plugin] prepare for next development
 iteration

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index 48e8059a..057a9939 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.14
+        4.15-SNAPSHOT
     
     java-diff-utils-jgit
     java-diff-utils-jgit
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index dbac789c..15c8bbd3 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -7,7 +7,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.14
+        4.15-SNAPSHOT
     
     
         UTF-8
diff --git a/pom.xml b/pom.xml
index 9cbad909..20833896 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.14
+    4.15-SNAPSHOT
     java-diff-utils-parent
     pom
     
@@ -29,7 +29,7 @@
         scm:git:https://github.com/java-diff-utils/java-diff-utils.git
         scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
         https://github.com/java-diff-utils/java-diff-utils.git
-        java-diff-utils-parent-4.14
+        HEAD
     
     
         GitHub Issues

From 5245ee8b778a039a5b51c1ed67f2ce91c5c70ad5 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 23 Nov 2024 22:43:15 +0100
Subject: [PATCH 237/266] [maven-release-plugin] rollback the release of
 java-diff-utils-parent-4.14

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index 057a9939..8220036b 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.15-SNAPSHOT
+        4.14-SNAPSHOT
     
     java-diff-utils-jgit
     java-diff-utils-jgit
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index 15c8bbd3..802dd9a0 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -7,7 +7,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.15-SNAPSHOT
+        4.14-SNAPSHOT
     
     
         UTF-8
diff --git a/pom.xml b/pom.xml
index 20833896..2ff6c49e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.15-SNAPSHOT
+    4.14-SNAPSHOT
     java-diff-utils-parent
     pom
     

From 0307c80edb51fb79ec2c3c72a2aed8357d2eb9be Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 23 Nov 2024 22:49:57 +0100
Subject: [PATCH 238/266] downgraded plugins again, certificate problems for
 java 8

---
 pom.xml | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2ff6c49e..9cfd03d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,12 +81,7 @@
             
                 org.apache.maven.plugins
                 maven-release-plugin
-                 
-                3.0.0-M7
+                2.5.3
                 
                     true
                     false
@@ -108,24 +103,10 @@
                     
                 
             
-            
-                org.apache.maven.plugins
-                maven-source-plugin
-                3.3.1
-                
-                    
-                        attach-sources
-                        verify
-                        
-                            jar-no-fork
-                        
-                    
-                
-            
             
                 org.apache.maven.plugins
                 maven-javadoc-plugin
-                3.11.1
+                3.1.1
                 
                     ${javadoc.opts}
                     none
@@ -219,7 +200,7 @@
                     
                         org.apache.maven.plugins
                         maven-gpg-plugin
-                        3.2.7
+                        1.6
                         
                             
                                 sign-artifacts

From 1d8148ac056ecaaf61495c636e2f35488446ad5a Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 23 Nov 2024 22:51:38 +0100
Subject: [PATCH 239/266] [maven-release-plugin] prepare release
 java-diff-utils-parent-4.14

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index 8220036b..48e8059a 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.14-SNAPSHOT
+        4.14
     
     java-diff-utils-jgit
     java-diff-utils-jgit
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index 802dd9a0..dbac789c 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -7,7 +7,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.14-SNAPSHOT
+        4.14
     
     
         UTF-8
diff --git a/pom.xml b/pom.xml
index 9cfd03d2..b0b79a87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.14-SNAPSHOT
+    4.14
     java-diff-utils-parent
     pom
     
@@ -29,7 +29,7 @@
         scm:git:https://github.com/java-diff-utils/java-diff-utils.git
         scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
         https://github.com/java-diff-utils/java-diff-utils.git
-        HEAD
+        java-diff-utils-parent-4.14
     
     
         GitHub Issues

From af9d84cd71bb39aaec1c9db72e79857737a4b620 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 23 Nov 2024 22:51:42 +0100
Subject: [PATCH 240/266] [maven-release-plugin] prepare for next development
 iteration

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index 48e8059a..057a9939 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.14
+        4.15-SNAPSHOT
     
     java-diff-utils-jgit
     java-diff-utils-jgit
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index dbac789c..15c8bbd3 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -7,7 +7,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.14
+        4.15-SNAPSHOT
     
     
         UTF-8
diff --git a/pom.xml b/pom.xml
index b0b79a87..6945139c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.14
+    4.15-SNAPSHOT
     java-diff-utils-parent
     pom
     
@@ -29,7 +29,7 @@
         scm:git:https://github.com/java-diff-utils/java-diff-utils.git
         scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
         https://github.com/java-diff-utils/java-diff-utils.git
-        java-diff-utils-parent-4.14
+        HEAD
     
     
         GitHub Issues

From 71981d8faaff266654964ce3334e7faf64d2b9f2 Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 23 Nov 2024 22:58:04 +0100
Subject: [PATCH 241/266] [maven-release-plugin] prepare release
 java-diff-utils-parent-4.15

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index 057a9939..daac9fe1 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.15-SNAPSHOT
+        4.15
     
     java-diff-utils-jgit
     java-diff-utils-jgit
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index 15c8bbd3..13ecfd39 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -7,7 +7,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.15-SNAPSHOT
+        4.15
     
     
         UTF-8
diff --git a/pom.xml b/pom.xml
index 6945139c..f5d42c12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.15-SNAPSHOT
+    4.15
     java-diff-utils-parent
     pom
     
@@ -29,7 +29,7 @@
         scm:git:https://github.com/java-diff-utils/java-diff-utils.git
         scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
         https://github.com/java-diff-utils/java-diff-utils.git
-        HEAD
+        java-diff-utils-parent-4.15
     
     
         GitHub Issues

From 4b3367674af140eedf5be9dd95308fc51c499bef Mon Sep 17 00:00:00 2001
From: Tobias Warneke 
Date: Sat, 23 Nov 2024 22:58:05 +0100
Subject: [PATCH 242/266] [maven-release-plugin] prepare for next development
 iteration

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index daac9fe1..9e3f2b96 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.15
+        4.16-SNAPSHOT
     
     java-diff-utils-jgit
     java-diff-utils-jgit
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index 13ecfd39..95560b01 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -7,7 +7,7 @@
     
         io.github.java-diff-utils
         java-diff-utils-parent
-        4.15
+        4.16-SNAPSHOT
     
     
         UTF-8
diff --git a/pom.xml b/pom.xml
index f5d42c12..31300b5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.15
+    4.16-SNAPSHOT
     java-diff-utils-parent
     pom
     
@@ -29,7 +29,7 @@
         scm:git:https://github.com/java-diff-utils/java-diff-utils.git
         scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
         https://github.com/java-diff-utils/java-diff-utils.git
-        java-diff-utils-parent-4.15
+        HEAD
     
     
         GitHub Issues

From 0f8365b35d30faa300b442cd90f57f95a60eaf45 Mon Sep 17 00:00:00 2001
From: Tobias 
Date: Sat, 23 Nov 2024 23:09:14 +0100
Subject: [PATCH 243/266] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 70dfa521..06c39d76 100644
--- a/README.md
+++ b/README.md
@@ -125,7 +125,7 @@ Just add the code below to your maven dependencies:
 
     io.github.java-diff-utils
     java-diff-utils
-    4.12
+    4.15
 
 ```
 

From 527e83cee1babf73ed0e31358088794be05cd381 Mon Sep 17 00:00:00 2001
From: tw 
Date: Wed, 5 Feb 2025 21:25:54 +0100
Subject: [PATCH 244/266] fixes #197 - corrected revised filename output

---
 .../main/java/com/github/difflib/UnifiedDiffUtils.java |  2 +-
 .../com/github/difflib/GenerateUnifiedDiffTest.java    | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
index 727008db..a6f83b64 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
@@ -352,7 +352,7 @@ public static List generateOriginalAndDiff(List original, List generateOriginalAndDiff(List original, List revised, String originalFileName, String revisedFileName) {
         String originalFileNameTemp = originalFileName;
-        String revisedFileNameTemp = originalFileName;
+        String revisedFileNameTemp = revisedFileName;
         if (originalFileNameTemp == null) {
             originalFileNameTemp = "original";
         }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
index e13d41aa..b8667818 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
@@ -51,8 +51,14 @@ public void testGenerateUnifiedWithOneDelta() throws IOException {
     @Test
     public void testGenerateUnifiedDiffWithoutAnyDeltas() {
         List test = Arrays.asList("abc");
-        Patch patch = DiffUtils.diff(test, test);
-        UnifiedDiffUtils.generateUnifiedDiff("abc", "abc", test, patch, 0);
+        List testRevised = Arrays.asList("abc2");
+        Patch patch = DiffUtils.diff(test, testRevised);
+        String unifiedDiffTxt = String.join("\n", UnifiedDiffUtils.generateUnifiedDiff("abc1", "abc2", test, patch, 0));
+        System.out.println(unifiedDiffTxt);
+        
+        assertThat(unifiedDiffTxt)
+                .as("original filename should be abc1").contains("--- abc1")
+                .as("revised filename should be abc2").contains("+++ abc2");
     }
 
     @Test

From b5b7dacc6e0720bbfc634b5d15e283be13e570f9 Mon Sep 17 00:00:00 2001
From: epictecch <57089715+epictecch@users.noreply.github.com>
Date: Wed, 5 Feb 2025 21:48:53 +0100
Subject: [PATCH 245/266] added support for merging inline deltas split by
 whitespace or a minor equality (#168) (#191)

Co-authored-by: Tobias 
---
 .../github/difflib/text/DiffRowGenerator.java | 31 +++++++-
 .../text/deltamerge/DeltaMergeUtils.java      | 79 +++++++++++++++++++
 .../text/deltamerge/InlineDeltaMergeInfo.java | 51 ++++++++++++
 .../difflib/text/DiffRowGeneratorTest.java    | 46 +++++++++++
 4 files changed, 206 insertions(+), 1 deletion(-)
 create mode 100644 java-diff-utils/src/main/java/com/github/difflib/text/deltamerge/DeltaMergeUtils.java
 create mode 100644 java-diff-utils/src/main/java/com/github/difflib/text/deltamerge/InlineDeltaMergeInfo.java

diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
index 3711bfb6..e540004c 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
@@ -24,6 +24,8 @@
 import com.github.difflib.patch.InsertDelta;
 import com.github.difflib.patch.Patch;
 import com.github.difflib.text.DiffRow.Tag;
+import com.github.difflib.text.deltamerge.DeltaMergeUtils;
+import com.github.difflib.text.deltamerge.InlineDeltaMergeInfo;
 import java.util.*;
 import java.util.function.BiFunction;
 import java.util.function.BiPredicate;
@@ -75,6 +77,14 @@ public final class DiffRowGenerator {
     public static final Function> SPLITTER_BY_WORD = line -> splitStringPreserveDelimiter(line, SPLIT_BY_WORD_PATTERN);
     public static final Pattern WHITESPACE_PATTERN = Pattern.compile("\\s+");
 
+    public static final Function>> DEFAULT_INLINE_DELTA_MERGER = InlineDeltaMergeInfo::getDeltas;
+
+    /**
+     * Merge diffs which are separated by equalities consisting of whitespace only.
+     */
+    public static final Function>> WHITESPACE_EQUALITIES_MERGER = deltaMergeInfo -> DeltaMergeUtils
+            .mergeInlineDeltas(deltaMergeInfo, (equalities -> equalities.stream().allMatch(String::isBlank)));
+
     public static Builder create() {
         return new Builder();
     }
@@ -170,6 +180,7 @@ static void wrapInTag(List sequence, int startPosition,
     private final boolean reportLinesUnchanged;
     private final Function lineNormalizer;
     private final Function processDiffs;
+    private final Function>> inlineDeltaMerger;
 
     private final boolean showInlineDiffs;
     private final boolean replaceOriginalLinefeedInChangesWithSpaces;
@@ -194,11 +205,13 @@ private DiffRowGenerator(Builder builder) {
         reportLinesUnchanged = builder.reportLinesUnchanged;
         lineNormalizer = builder.lineNormalizer;
         processDiffs = builder.processDiffs;
+        inlineDeltaMerger = builder.inlineDeltaMerger;
 
         replaceOriginalLinefeedInChangesWithSpaces = builder.replaceOriginalLinefeedInChangesWithSpaces;
 
         Objects.requireNonNull(inlineDiffSplitter);
         Objects.requireNonNull(lineNormalizer);
+        Objects.requireNonNull(inlineDeltaMerger);
     }
 
     /**
@@ -370,7 +383,10 @@ private List generateInlineDiffs(AbstractDelta delta) {
         origList = inlineDiffSplitter.apply(joinedOrig);
         revList = inlineDiffSplitter.apply(joinedRev);
 
-        List> inlineDeltas = DiffUtils.diff(origList, revList, equalizer).getDeltas();
+        List> originalInlineDeltas = DiffUtils.diff(origList, revList, equalizer)
+                .getDeltas();
+        List> inlineDeltas = inlineDeltaMerger
+                .apply(new InlineDeltaMergeInfo(originalInlineDeltas, origList, revList));
 
         Collections.reverse(inlineDeltas);
         for (AbstractDelta inlineDelta : inlineDeltas) {
@@ -465,6 +481,7 @@ public static class Builder {
         private Function processDiffs = null;
         private BiPredicate equalizer = null;
         private boolean replaceOriginalLinefeedInChangesWithSpaces = false;
+        private Function>> inlineDeltaMerger = DEFAULT_INLINE_DELTA_MERGER;
 
         private Builder() {
         }
@@ -673,5 +690,17 @@ public Builder replaceOriginalLinefeedInChangesWithSpaces(boolean replace) {
             this.replaceOriginalLinefeedInChangesWithSpaces = replace;
             return this;
         }
+
+        /**
+         * Provide an inline delta merger for use case specific delta optimizations.
+         *
+         * @param inlineDeltaMerger
+         * @return
+         */
+        public Builder inlineDeltaMerger(
+                Function>> inlineDeltaMerger) {
+            this.inlineDeltaMerger = inlineDeltaMerger;
+            return this;
+        }
     }
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/deltamerge/DeltaMergeUtils.java b/java-diff-utils/src/main/java/com/github/difflib/text/deltamerge/DeltaMergeUtils.java
new file mode 100644
index 00000000..0d9a0a16
--- /dev/null
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/deltamerge/DeltaMergeUtils.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2009-2024 java-diff-utils.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.difflib.text.deltamerge;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Predicate;
+
+import com.github.difflib.patch.AbstractDelta;
+import com.github.difflib.patch.ChangeDelta;
+import com.github.difflib.patch.Chunk;
+
+/**
+ * Provides utility features for merge inline deltas
+ *
+ * @author Christian Meier
+ */
+final public class DeltaMergeUtils {
+
+    public static List> mergeInlineDeltas(InlineDeltaMergeInfo deltaMergeInfo,
+            Predicate> replaceEquality) {
+        final List> originalDeltas = deltaMergeInfo.getDeltas();
+        if (originalDeltas.size() < 2) {
+            return originalDeltas;
+        }
+
+        final List> newDeltas = new ArrayList<>();
+        newDeltas.add(originalDeltas.get(0));
+        for (int i = 1; i < originalDeltas.size(); i++) {
+            final AbstractDelta previousDelta = newDeltas.getLast();
+            final AbstractDelta currentDelta = originalDeltas.get(i);
+
+            final List equalities = deltaMergeInfo.getOrigList().subList(
+                    previousDelta.getSource().getPosition() + previousDelta.getSource().size(),
+                    currentDelta.getSource().getPosition());
+
+            if (replaceEquality.test(equalities)) {
+                // Merge the previous delta, the equality and the current delta into one
+                // ChangeDelta and replace the previous delta by this new ChangeDelta.
+                final List allSourceLines = new ArrayList<>();
+                allSourceLines.addAll(previousDelta.getSource().getLines());
+                allSourceLines.addAll(equalities);
+                allSourceLines.addAll(currentDelta.getSource().getLines());
+
+                final List allTargetLines = new ArrayList<>();
+                allTargetLines.addAll(previousDelta.getTarget().getLines());
+                allTargetLines.addAll(equalities);
+                allTargetLines.addAll(currentDelta.getTarget().getLines());
+
+                final ChangeDelta replacement = new ChangeDelta<>(
+                        new Chunk<>(previousDelta.getSource().getPosition(), allSourceLines),
+                        new Chunk<>(previousDelta.getTarget().getPosition(), allTargetLines));
+
+                newDeltas.removeLast();
+                newDeltas.add(replacement);
+            } else {
+                newDeltas.add(currentDelta);
+            }
+        }
+
+        return newDeltas;
+    }
+
+    private DeltaMergeUtils() {
+    }
+}
diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/deltamerge/InlineDeltaMergeInfo.java b/java-diff-utils/src/main/java/com/github/difflib/text/deltamerge/InlineDeltaMergeInfo.java
new file mode 100644
index 00000000..cc6b399a
--- /dev/null
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/deltamerge/InlineDeltaMergeInfo.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2009-2024 java-diff-utils.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.difflib.text.deltamerge;
+
+import java.util.List;
+
+import com.github.difflib.patch.AbstractDelta;
+
+/**
+ * Holds the information required to merge deltas originating from an inline
+ * diff
+ *
+ * @author Christian Meier
+ */
+public final class InlineDeltaMergeInfo {
+
+    private final List> deltas;
+    private final List origList;
+    private final List revList;
+
+    public InlineDeltaMergeInfo(List> deltas, List origList, List revList) {
+        this.deltas = deltas;
+        this.origList = origList;
+        this.revList = revList;
+    }
+
+    public List> getDeltas() {
+        return deltas;
+    }
+
+    public List getOrigList() {
+        return origList;
+    }
+
+    public List getRevList() {
+        return revList;
+    }
+}
diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
index f881c474..76c03044 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
@@ -12,6 +12,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.function.Function;
 import java.util.regex.Pattern;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
@@ -20,6 +21,10 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import org.junit.jupiter.api.Test;
 
+import com.github.difflib.patch.AbstractDelta;
+import com.github.difflib.text.deltamerge.DeltaMergeUtils;
+import com.github.difflib.text.deltamerge.InlineDeltaMergeInfo;
+
 public class DiffRowGeneratorTest {
 
     @Test
@@ -791,6 +796,47 @@ public void testIssue129SkipWhitespaceChanges() throws IOException {
                 .forEach(System.out::println);
     }
 
+    @Test
+    public void testGeneratorWithWhitespaceDeltaMerge() {
+        final DiffRowGenerator generator = DiffRowGenerator.create().showInlineDiffs(true).mergeOriginalRevised(true)
+                .inlineDiffByWord(true).oldTag(f -> "~").newTag(f -> "**") //
+                .lineNormalizer(StringUtils::htmlEntites) // do not replace tabs
+                .inlineDeltaMerger(DiffRowGenerator.WHITESPACE_EQUALITIES_MERGER).build();
+
+        assertInlineDiffResult(generator, "No diff", "No diff", "No diff");
+        assertInlineDiffResult(generator, " x whitespace before diff", " y whitespace before diff",
+                " ~x~**y** whitespace before diff");
+        assertInlineDiffResult(generator, "Whitespace after diff x ", "Whitespace after diff y ",
+                "Whitespace after diff ~x~**y** ");
+        assertInlineDiffResult(generator, "Diff x x between", "Diff y y between", "Diff ~x x~**y y** between");
+        assertInlineDiffResult(generator, "Hello \t world", "Hi \t universe", "~Hello \t world~**Hi \t universe**");
+        assertInlineDiffResult(generator, "The quick brown fox jumps over the lazy dog", "A lazy dog jumps over a fox",
+                "~The quick brown fox ~**A lazy dog **jumps over ~the lazy dog~**a fox**");
+    }
+
+    @Test
+    public void testGeneratorWithMergingDeltasForShortEqualities() {
+        final Function>> shortEqualitiesMerger = deltaMergeInfo -> DeltaMergeUtils
+                .mergeInlineDeltas(deltaMergeInfo,
+                        (equalities -> equalities.stream().mapToInt(String::length).sum() < 6));
+
+        final DiffRowGenerator generator = DiffRowGenerator.create().showInlineDiffs(true).mergeOriginalRevised(true)
+                .inlineDiffByWord(true).oldTag(f -> "~").newTag(f -> "**").inlineDeltaMerger(shortEqualitiesMerger)
+                .build();
+
+        assertInlineDiffResult(generator, "No diff", "No diff", "No diff");
+        assertInlineDiffResult(generator, "aaa bbb ccc", "xxx bbb zzz", "~aaa bbb ccc~**xxx bbb zzz**");
+        assertInlineDiffResult(generator, "aaa bbbb ccc", "xxx bbbb zzz", "~aaa~**xxx** bbbb ~ccc~**zzz**");
+    }
+
+    private void assertInlineDiffResult(DiffRowGenerator generator, String original, String revised, String expected) {
+        final List rows = generator.generateDiffRows(Arrays.asList(original), Arrays.asList(revised));
+        print(rows);
+
+        assertEquals(1, rows.size());
+        assertEquals(expected, rows.get(0).getOldLine().toString());
+    }
+  
     @Test
     public void testIssue188HangOnExamples() throws IOException, URISyntaxException {        
         try (FileSystem zipFs = FileSystems.newFileSystem(Paths.get("target/test-classes/com/github/difflib/text/test.zip"), null);) {

From 803fc4a18838a7d02a26ff916688fb0aa85391ad Mon Sep 17 00:00:00 2001
From: tw 
Date: Wed, 5 Feb 2025 22:04:26 +0100
Subject: [PATCH 246/266] fixes #191 - downgraded patch to Java 8 compliance

---
 .../main/java/com/github/difflib/text/DiffRowGenerator.java   | 2 +-
 .../com/github/difflib/text/deltamerge/DeltaMergeUtils.java   | 4 ++--
 .../java/com/github/difflib/text/DiffRowGeneratorTest.java    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
index e540004c..9ec50a84 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
@@ -83,7 +83,7 @@ public final class DiffRowGenerator {
      * Merge diffs which are separated by equalities consisting of whitespace only.
      */
     public static final Function>> WHITESPACE_EQUALITIES_MERGER = deltaMergeInfo -> DeltaMergeUtils
-            .mergeInlineDeltas(deltaMergeInfo, (equalities -> equalities.stream().allMatch(String::isBlank)));
+            .mergeInlineDeltas(deltaMergeInfo, equalities -> equalities.stream().allMatch(s -> s==null || s.replaceAll("\\s+", "").equals("")));
 
     public static Builder create() {
         return new Builder();
diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/deltamerge/DeltaMergeUtils.java b/java-diff-utils/src/main/java/com/github/difflib/text/deltamerge/DeltaMergeUtils.java
index 0d9a0a16..b2580957 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/text/deltamerge/DeltaMergeUtils.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/deltamerge/DeltaMergeUtils.java
@@ -40,7 +40,7 @@ public static List> mergeInlineDeltas(InlineDeltaMergeInfo
         final List> newDeltas = new ArrayList<>();
         newDeltas.add(originalDeltas.get(0));
         for (int i = 1; i < originalDeltas.size(); i++) {
-            final AbstractDelta previousDelta = newDeltas.getLast();
+            final AbstractDelta previousDelta = newDeltas.get(newDeltas.size()-1);
             final AbstractDelta currentDelta = originalDeltas.get(i);
 
             final List equalities = deltaMergeInfo.getOrigList().subList(
@@ -64,7 +64,7 @@ public static List> mergeInlineDeltas(InlineDeltaMergeInfo
                         new Chunk<>(previousDelta.getSource().getPosition(), allSourceLines),
                         new Chunk<>(previousDelta.getTarget().getPosition(), allTargetLines));
 
-                newDeltas.removeLast();
+                newDeltas.remove(newDeltas.size()-1);
                 newDeltas.add(replacement);
             } else {
                 newDeltas.add(currentDelta);
diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
index 76c03044..7725bb0b 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
@@ -818,7 +818,7 @@ public void testGeneratorWithWhitespaceDeltaMerge() {
     public void testGeneratorWithMergingDeltasForShortEqualities() {
         final Function>> shortEqualitiesMerger = deltaMergeInfo -> DeltaMergeUtils
                 .mergeInlineDeltas(deltaMergeInfo,
-                        (equalities -> equalities.stream().mapToInt(String::length).sum() < 6));
+                        equalities -> equalities.stream().mapToInt(String::length).sum() < 6);
 
         final DiffRowGenerator generator = DiffRowGenerator.create().showInlineDiffs(true).mergeOriginalRevised(true)
                 .inlineDiffByWord(true).oldTag(f -> "~").newTag(f -> "**").inlineDeltaMerger(shortEqualitiesMerger)

From 110a0da37bf02aced82dab720ea57982dd42c458 Mon Sep 17 00:00:00 2001
From: tw 
Date: Wed, 5 Feb 2025 22:44:27 +0100
Subject: [PATCH 247/266] fixes #191 - downgraded patch to Java 8 compliance

---
 .../test/java/com/github/difflib/text/DiffRowGeneratorTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
index 7725bb0b..beccad8c 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
@@ -839,7 +839,7 @@ private void assertInlineDiffResult(DiffRowGenerator generator, String original,
   
     @Test
     public void testIssue188HangOnExamples() throws IOException, URISyntaxException {        
-        try (FileSystem zipFs = FileSystems.newFileSystem(Paths.get("target/test-classes/com/github/difflib/text/test.zip"), null);) {
+        try (FileSystem zipFs = FileSystems.newFileSystem(Paths.get("target/test-classes/com/github/difflib/text/test.zip"), (ClassLoader) null);) {
             List original = Files.readAllLines(zipFs.getPath("old.html"));
             List revised = Files.readAllLines(zipFs.getPath("new.html"));
 

From 8397e20ddcdedc40be2de7f2f7885490f59dc5a4 Mon Sep 17 00:00:00 2001
From: rushii <33725716+rushiiMachine@users.noreply.github.com>
Date: Wed, 5 Feb 2025 14:23:11 -0800
Subject: [PATCH 248/266] fix: parsing unified diff chunk headers (#198)

The regex matching chunk headers does not account for diffs generated with --show-function-line
---
 .../src/main/java/com/github/difflib/UnifiedDiffUtils.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
index a6f83b64..94786b6c 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
@@ -36,7 +36,7 @@
 public final class UnifiedDiffUtils {
 
     private static final Pattern UNIFIED_DIFF_CHUNK_REGEXP = Pattern
-            .compile("^@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@$");
+            .compile("^@@\\s+-(\\d+)(?:,(\\d+))?\\s+\\+(\\d+)(?:,(\\d+))?\\s+@@.*$");
     private static final String NULL_FILE_INDICATOR = "/dev/null";
 
     /**

From 01a7fb16cfc33abc3e6ac4adcc2db79438f56fcf Mon Sep 17 00:00:00 2001
From: tw 
Date: Sun, 9 Feb 2025 20:53:14 +0100
Subject: [PATCH 249/266] updates test dependencies

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 31300b5b..aa1deae3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,13 +65,13 @@
             
                 org.junit.jupiter
                 junit-jupiter
-                5.11.3
+                5.11.4
                 test
             
             
                 org.assertj
                 assertj-core
-                3.26.3
+                3.27.3
                 test
             
         

From c1aa689dce9fa2703292f7282e919bc0b1a9fa2d Mon Sep 17 00:00:00 2001
From: Davide Santonocito 
Date: Wed, 5 Mar 2025 15:43:04 +0100
Subject: [PATCH 250/266] Fix a typo in DiffUtils.java javadocs

---
 .../java/com/github/difflib/DiffUtils.java    | 56 +++++++++----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
index 8917772b..e0ac521f 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
@@ -42,7 +42,7 @@ public final class DiffUtils {
     /**
      * Sets the default diff algorithm factory to be used by all diff routines.
      *
-     * @param factory a {@link DiffAlgorithmFactory} represnting the new default diff algorithm factory.
+     * @param factory a {@link DiffAlgorithmFactory} representing the new default diff algorithm factory.
      */
     public static void withDefaultDiffAlgorithmFactory(DiffAlgorithmFactory factory) {
         DEFAULT_DIFF = factory;
@@ -52,9 +52,9 @@ public static void withDefaultDiffAlgorithmFactory(DiffAlgorithmFactory factory)
      * Computes the difference between two sequences of elements using the default diff algorithm.
      *
      * @param  a generic representing the type of the elements to be compared.
-     * @param original a {@link List} represnting the original sequence of elements. Must not be {@code null}.
-     * @param revised a {@link List} represnting the revised sequence of elements. Must not be {@code null}.
-     * @param progress a {@link DiffAlgorithmListener} represnting the progress listener. Can be {@code null}.
+     * @param original a {@link List} representing the original sequence of elements. Must not be {@code null}.
+     * @param revised a {@link List} representing the revised sequence of elements. Must not be {@code null}.
+     * @param progress a {@link DiffAlgorithmListener} representing the progress listener. Can be {@code null}.
      * @return The patch describing the difference between the original and revised sequences. Never {@code null}.
      */
     public static  Patch diff(List original, List revised, DiffAlgorithmListener progress) {
@@ -65,8 +65,8 @@ public static  Patch diff(List original, List revised, DiffAlgorithm
      * Computes the difference between two sequences of elements using the default diff algorithm.
      *
      * @param  a generic representing the type of the elements to be compared.
-     * @param original a {@link List} represnting the original sequence of elements. Must not be {@code null}.
-     * @param revised a {@link List} represnting the revised sequence of elements. Must not be {@code null}.
+     * @param original a {@link List} representing the original sequence of elements. Must not be {@code null}.
+     * @param revised a {@link List} representing the revised sequence of elements. Must not be {@code null}.
      * @return The patch describing the difference between the original and revised sequences. Never {@code null}.
      */
     public static  Patch diff(List original, List revised) {
@@ -77,9 +77,9 @@ public static  Patch diff(List original, List revised) {
      * Computes the difference between two sequences of elements using the default diff algorithm.
      *
      * @param  a generic representing the type of the elements to be compared.
-     * @param original a {@link List} represnting the original sequence of elements. Must not be {@code null}.
-     * @param revised a {@link List} represnting the revised sequence of elements. Must not be {@code null}.
-     * @param includeEqualParts a {@link boolean} represnting whether to include equal parts in the resulting patch.
+     * @param original a {@link List} representing the original sequence of elements. Must not be {@code null}.
+     * @param revised a {@link List} representing the revised sequence of elements. Must not be {@code null}.
+     * @param includeEqualParts a {@link boolean} representing whether to include equal parts in the resulting patch.
      * @return The patch describing the difference between the original and revised sequences. Never {@code null}.
      */
     public static  Patch diff(List original, List revised, boolean includeEqualParts) {
@@ -89,9 +89,9 @@ public static  Patch diff(List original, List revised, boolean inclu
     /**
      * Computes the difference between two strings using the default diff algorithm.
      *
-     * @param sourceText a {@link String} represnting the original string. Must not be {@code null}.
-     * @param targetText a {@link String} represnting the revised string. Must not be {@code null}.
-     * @param progress a {@link DiffAlgorithmListener} represnting the progress listener. Can be {@code null}.
+     * @param sourceText a {@link String} representing the original string. Must not be {@code null}.
+     * @param targetText a {@link String} representing the revised string. Must not be {@code null}.
+     * @param progress a {@link DiffAlgorithmListener} representing the progress listener. Can be {@code null}.
      * @return The patch describing the difference between the original and revised strings. Never {@code null}.
      */
     public static Patch diff(String sourceText, String targetText,
@@ -105,9 +105,9 @@ public static Patch diff(String sourceText, String targetText,
      * Computes the difference between the original and revised list of elements
      * with default diff algorithm
      *
-     * @param source a {@link List} represnting the original text. Must not be {@code null}.
-     * @param target a {@link List} represnting the revised text. Must not be {@code null}.
-     * @param equalizer a {@link BiPredicate} represnting the equalizer object to replace the default compare
+     * @param source a {@link List} representing the original text. Must not be {@code null}.
+     * @param target a {@link List} representing the revised text. Must not be {@code null}.
+     * @param equalizer a {@link BiPredicate} representing the equalizer object to replace the default compare
      * algorithm (Object.equals). If {@code null} the default equalizer of the
      * default algorithm is used.
      * @return The patch describing the difference between the original and
@@ -131,10 +131,10 @@ public static  Patch diff(List original, List revised,
      * Computes the difference between the original and revised list of elements
      * with default diff algorithm
      *
-     * @param original a {@link List} represnting the original text. Must not be {@code null}.
-     * @param revised a {@link List} represnting the revised text. Must not be {@code null}.
-     * @param algorithm a {@link DiffAlgorithmI} represnting the diff algorithm. Must not be {@code null}.
-     * @param progress a {@link DiffAlgorithmListener} represnting the diff algorithm listener.
+     * @param original a {@link List} representing the original text. Must not be {@code null}.
+     * @param revised a {@link List} representing the revised text. Must not be {@code null}.
+     * @param algorithm a {@link DiffAlgorithmI} representing the diff algorithm. Must not be {@code null}.
+     * @param progress a {@link DiffAlgorithmListener} representing the diff algorithm listener.
      * @param includeEqualParts Include equal data parts into the patch.
      * @return The patch describing the difference between the original and
      * revised sequences. Never {@code null}.
@@ -154,9 +154,9 @@ public static  Patch diff(List original, List revised,
      * Computes the difference between the original and revised list of elements
      * with default diff algorithm
      *
-     * @param original a {@link List} represnting the original text. Must not be {@code null}.
-     * @param revised a {@link List} represnting the revised text. Must not be {@code null}.
-     * @param algorithm a {@link DiffAlgorithmI} represnting the diff algorithm. Must not be {@code null}.
+     * @param original a {@link List} representing the original text. Must not be {@code null}.
+     * @param revised a {@link List} representing the revised text. Must not be {@code null}.
+     * @param algorithm a {@link DiffAlgorithmI} representing the diff algorithm. Must not be {@code null}.
      * @return The patch describing the difference between the original and
      * revised sequences. Never {@code null}.
      */
@@ -169,8 +169,8 @@ public static  Patch diff(List original, List revised, DiffAlgorithm
      * "trick" to make out of texts lists of characters, like DiffRowGenerator
      * does and merges those changes at the end together again.
      *
-     * @param original a {@link String} represnting the original text. Must not be {@code null}.
-     * @param revised a {@link String} represnting the revised text. Must not be {@code null}.
+     * @param original a {@link String} representing the original text. Must not be {@code null}.
+     * @param revised a {@link String} representing the revised text. Must not be {@code null}.
      * @return The patch describing the difference between the original and
      * revised sequences. Never {@code null}.
      */
@@ -194,8 +194,8 @@ public static Patch diffInline(String original, String revised) {
     /**
      * Applies the given patch to the original list and returns the revised list.
      *
-     * @param original a {@link List} represnting the original list.
-     * @param patch a {@link List} represnting the patch to apply.
+     * @param original a {@link List} representing the original list.
+     * @param patch a {@link List} representing the patch to apply.
      * @return the revised list.
      * @throws PatchFailedException if the patch cannot be applied.
      */
@@ -207,8 +207,8 @@ public static  List patch(List original, Patch patch)
     /**
      * Applies the given patch to the revised list and returns the original list.
      *
-     * @param revised a {@link List} represnting the revised list.
-     * @param patch a {@link Patch} represnting the patch to apply.
+     * @param revised a {@link List} representing the revised list.
+     * @param patch a {@link Patch} representing the patch to apply.
      * @return the original list.
      * @throws PatchFailedException if the patch cannot be applied.
      */

From d15ecbb5683a29d94910fb3d2d08148398809346 Mon Sep 17 00:00:00 2001
From: Tran Ngoc Nhan 
Date: Tue, 25 Mar 2025 23:16:19 +0700
Subject: [PATCH 251/266] Fix typo javadoc

---
 .../java/com/github/difflib/algorithm/jgit/HistogramDiff.java   | 2 +-
 .../com/github/difflib/algorithm/DiffAlgorithmListener.java     | 2 +-
 .../src/main/java/com/github/difflib/patch/Chunk.java           | 2 +-
 .../src/main/java/com/github/difflib/patch/Patch.java           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils-jgit/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java b/java-diff-utils-jgit/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java
index e3f6cd5b..6d15f609 100644
--- a/java-diff-utils-jgit/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java
+++ b/java-diff-utils-jgit/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java
@@ -28,7 +28,7 @@
 import org.eclipse.jgit.diff.SequenceComparator;
 
 /**
- * HistorgramDiff using JGit - Library. This one is much more performant than the orginal Myers
+ * HistorgramDiff using JGit - Library. This one is much more performant than the original Myers
  * implementation.
  *
  * @author toben
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmListener.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmListener.java
index 37d51813..a141d7be 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmListener.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmListener.java
@@ -24,7 +24,7 @@ public interface DiffAlgorithmListener {
     
     /**
      * This is a step within the diff algorithm. Due to different implementations the value
-     * is not strict incrementing to the max and is not garantee to reach the max. It could
+     * is not strict incrementing to the max and is not guarantee to reach the max. It could
      * stop before.
      * @param value
      * @param max 
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
index 7e55ac0d..50054074 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
@@ -26,7 +26,7 @@
  *
  * 

  * Text is represented as Object[] because the diff engine is
- * capable of handling more than plain ascci. In fact, arrays or lists of any
+ * capable of handling more than plain ascii. 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.
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
index aaff7d94..305f2de7 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
@@ -224,7 +224,7 @@ private int findPositionWithFuzzAndMoreDelta(PatchApplyingContext ctx, Abstra
     private ConflictOutput conflictOutput = CONFLICT_PRODUCES_EXCEPTION;
 
     /**
-     * Alter normal conflict output behaviour to e.g. inclide some conflict
+     * Alter normal conflict output behaviour to e.g. include some conflict
      * statements in the result, like git does it.
      */
     public Patch withConflictOutput(ConflictOutput conflictOutput) {

From 8e8ba4793965b02dc6d1196045edbf2634c7d4a1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 May 2025 18:52:05 +0000
Subject: [PATCH 252/266] Bump org.eclipse.jgit:org.eclipse.jgit in
 /java-diff-utils-jgit

Bumps [org.eclipse.jgit:org.eclipse.jgit](https://github.com/eclipse-jgit/jgit) from 5.13.3.202401111512-r to 7.2.1.202505142326-r.
- [Commits](https://github.com/eclipse-jgit/jgit/compare/v5.13.3.202401111512-r...v7.2.1.202505142326-r)

---
updated-dependencies:
- dependency-name: org.eclipse.jgit:org.eclipse.jgit
  dependency-version: 7.2.1.202505142326-r
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] 
---
 java-diff-utils-jgit/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index 9e3f2b96..93e12d59 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -20,7 +20,7 @@
         
             org.eclipse.jgit
             org.eclipse.jgit
-            5.13.3.202401111512-r
+            7.2.1.202505142326-r
             
                 
                     com.googlecode.javaewah

From 755024eceec4246e3453dea5e157b3b04ad69cf3 Mon Sep 17 00:00:00 2001
From: tw 
Date: Sat, 24 May 2025 23:11:54 +0200
Subject: [PATCH 253/266] downgrade jgit

---
 java-diff-utils-jgit/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index 93e12d59..5b01d2c5 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -18,9 +18,10 @@
             test
         
         
+					  
             org.eclipse.jgit
             org.eclipse.jgit
-            7.2.1.202505142326-r
+            5.13.3.202401111512-r
             
                 
                     com.googlecode.javaewah

From de0e157a8ff43a92a8940d7c9455357a4663ec68 Mon Sep 17 00:00:00 2001
From: tw 
Date: Mon, 7 Jul 2025 21:58:42 +0200
Subject: [PATCH 254/266] fixes #207

---
 KEYS      | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 README.md |  4 ++++
 2 files changed, 50 insertions(+)
 create mode 100644 KEYS

diff --git a/KEYS b/KEYS
new file mode 100644
index 00000000..b301c122
--- /dev/null
+++ b/KEYS
@@ -0,0 +1,46 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: Benutzer-ID:	Tobias Warneke
+Comment: Fingerabdruck:	D477D51812E692011DB11E66A6EA2E2BF22E0543
+
+
+mQGNBFJQhigBDADpuhND/VUQwJT0nnJxfjAIur59hyaZZ3Ph/KIgmCneyq7lzYO6
+xa1ucH8mqNBVNLLBhs4CjihBddU/ZKTX3WnZyhQKQMZr3Tg+TCNFmAR4/hnZ3NjZ
+N5N5gUj/dqVI2rIvypIuxUApl88BYMsxYpn2+8FKeMd8oBJLqFRJ3WNjB4Op2tRO
+XRWoxs1ypubS/IV1zkphHHpi6VSABlTyTWu4kXEj/1/GpsdtHRa9kvdWw7yKQbnM
+XuwOxtzZFJcyu0P2jYVfHHvxcjxuklc9edmCGdNxgKIoo0LXZOeFIi6OWtwzD0pn
+O6ovJ+PL9QscMdnQlPwsiCwjNUNue20GBv3aUIYc+Z8Gq0SqSan5V0IiKRHMJkzd
+FAhnpkSFBvHhPJn07BCcb1kctqL+xnLxIdi7arq3WNA/6bJjsojc/x3FdIvORIeP
+sqejhtL8mCBvbMAMHSBrFxclMp+HSz2ouHEEPIQam0KeN8t1yEqIy3/aYKMzHj9c
+C3s8XOaBCbJbKpMAEQEAAbQ9VG9iaWFzIFdhcm5la2UgKGZvciBkZXZlbG9wbWVu
+dCBwdXJwb3NlcykgPHQud2FybmVrZUBnbXgubmV0PokBvwQTAQIAKQUCUlCGKAIb
+DwUJCWav+AcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEKbqLivyLgVD/8IL
++gPYvGZcd52WqUqXlZQQQWheMNGlxKd85MV0Kf1TlukHEzaC2XE0Hjz3RNWBroL2
+QZ+CR/17XX9+10VCAdDYtArClFo85B1+TwST+g42Y7rHqghhetW9jnvGxbkCIUdS
+093zg0kGgDJN4/Gy2slOsWjQpDzBfziuxTZcX/kJEJS6/H5eia/UAsR53wCN/12F
+jzlRPAhZcUg0rAxNs0Kd6gF5TLfG6BgRhZkKSsiT+JS/ADanCoLDMd4NGiZ/U5PB
+bdVnRT39x8XK3dGCRTmCgXnlg4imcoCNKTLKARJoCziQ+sy0AnqDLyUqwESnFB8l
+YfpzlDoxmfdFVvZLkPG+WkJ6Ioiqcq1fUOdmsJme23gPCuu3hoV6Ysnv6Jpid1sy
+6feYDEbo2qb4J8Q6Jwa5OYVLrJqS61g07EmvG3PvIQgi3rKvlPd9CTouFzOGNelW
+W8TE+62Uixu1VlKxKUSUVXm65U5Vhx+OdAm25SPkm3A/qaGfQ2OP9iIk/Mba6Ckz
+Q4kB1gQTAQgAQAIbDwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAFiEE1HfVGBLm
+kgEdsR5mpuouK/IuBUMFAmd12+0FCRrKLosACgkQpuouK/IuBUMN3Qv8CSdONLjX
+DbS4sCR3U3T33m0Fl22DVRGP9+Oxfzu2qz6UNjm+rxOY2+gktDjeQZqQH3bMiJIV
+9oVPE2/8QbhgZGJ6Yal5tKXTlTkjNxssITJH6SOLD0F0DRWWfqC8fm4Mnex2O9Uz
+vML1YTZeHFoi4Qe3cIdR41x73ltmuRIpqpHO5upw5mXs8h6g/HpGACrQSv/MMthE
+/ftVyzn/aAwB3ozR28D6nK6DlheffvjUGBfIYCbOn9Q5peCIuL9zUr3KDR332NWG
+1EFGYXAfedtTQhab3VyF0XJy8U29JtpDNd1DeoKNYiQhmN4VDmAYzpgnbAw4OEuZ
+UEtWO2QMXC9bGyy7mm8jGFk3ORmk1oINTPczCkz37SHrQ4IIawDZfrR8a+Q/VyYW
+3sNXQ1y7PzLTrR2L+uOsO5/P4qFpViielJst7uiO+1I/eoJ6GONFurzEXXZB7Cu8
+dA67vgGwgVaMosnTOz1Pyc+mzzG5H3i8gjqQQl+JEZFG/+ng/fyvnLjZiQHWBBMB
+CABAAhsPBwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AWIQTUd9UYEuaSAR2xHmam
+6i4r8i4FQwUCX58d7AUJERB2CAAKCRCm6i4r8i4FQ8COC/4i8YPxqtk/Z6nEHXSc
+3F6GB0He9UZG8LMBbLD93nooHAY3VzOaUcg0/8SN+HhtFmAVcgshKpx/7ysBO8hK
+wKArPN+W458O4VGm6pmKyuVqoSkOpQYrZHzHuTEBFoHYbeDh3LrHIlnC//l18U9A
+n9pCN42RFKhcjhZYs17FkHcTQbH1rcXfZe+vzu+70ZyGyh+3FB+32OgW6lGD6QKK
+lD7DfoP2BaYVe2OlhPdZ2ubQBw/qV7Or5KlzBWff4Nbv2nT9Y4uFGvo01CxEEi4z
+mc0hsK3yGeP26V49kZy3PAJNjyy4gPhG7Xw06JTw0rO2hcgjtdGWgH2/l7PCS0qg
+PPBMGDCbb5cz++8YWUHT0togJ2K49BqKpJlt4soqYFPWFMS0QeI90yV3YeWOL+tV
+hLcJ6K/RhSg6eagAASa0AbuCGkgnHJW1ZlyFnnketvihTkCe2yGvBgxY1F7S2jGN
+B2zkOzYjaWqSN5SlpSNBcSY8NLWGdyQoDEjY+I56J+IuWPE=
+=H+XU
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/README.md b/README.md
index 06c39d76..cbcba7af 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,10 @@ Main reason to build this library was the lack of easy-to-use libraries with all
 
 **This is originally a fork of java-diff-utils from Google Code Archive.**
 
+## GPG Signature Validation
+
+The gpg singing key in [KEYS] is used for this projects artifacts.
+
 ## API
 
 Javadocs of the actual release version: [JavaDocs java-diff-utils](https://java-diff-utils.github.io/java-diff-utils/4.10/docs/apidocs/)

From c7f4dfb1464753c530868319819f196efa19fff5 Mon Sep 17 00:00:00 2001
From: tw 
Date: Mon, 7 Jul 2025 22:27:16 +0200
Subject: [PATCH 255/266] fixes #208 - reformatted source code

---
 java-diff-utils-jgit/pom.xml                  |  110 +-
 .../difflib/algorithm/jgit/HistogramDiff.java |  108 +-
 .../algorithm/jgit/HistogramDiffTest.java     |  108 +-
 .../algorithm/jgit/LRHistogramDiffTest.java   |   74 +-
 java-diff-utils/pom.xml                       |  124 +-
 .../java/com/github/difflib/DiffUtils.java    |  377 ++--
 .../com/github/difflib/UnifiedDiffUtils.java  |  858 ++++----
 .../com/github/difflib/algorithm/Change.java  |   40 +-
 .../algorithm/DiffAlgorithmFactory.java       |    8 +-
 .../difflib/algorithm/DiffAlgorithmI.java     |   40 +-
 .../algorithm/DiffAlgorithmListener.java      |   23 +-
 .../difflib/algorithm/myers/MyersDiff.java    |  330 ++--
 .../myers/MyersDiffWithLinearSpace.java       |  419 ++--
 .../difflib/algorithm/myers/PathNode.java     |  156 +-
 .../github/difflib/patch/AbstractDelta.java   |  169 +-
 .../com/github/difflib/patch/ChangeDelta.java |  114 +-
 .../java/com/github/difflib/patch/Chunk.java  |  309 ++-
 .../github/difflib/patch/ConflictOutput.java  |    5 +-
 .../com/github/difflib/patch/DeleteDelta.java |   70 +-
 .../com/github/difflib/patch/DeltaType.java   |   46 +-
 .../github/difflib/patch/DiffException.java   |   11 +-
 .../com/github/difflib/patch/EqualDelta.java  |   58 +-
 .../com/github/difflib/patch/InsertDelta.java |   70 +-
 .../java/com/github/difflib/patch/Patch.java  |  617 +++---
 .../difflib/patch/PatchFailedException.java   |   11 +-
 .../com/github/difflib/patch/VerifyChunk.java |    6 +-
 .../java/com/github/difflib/text/DiffRow.java |  159 +-
 .../github/difflib/text/DiffRowGenerator.java | 1344 ++++++-------
 .../com/github/difflib/text/StringUtils.java  |  105 +-
 .../text/deltamerge/DeltaMergeUtils.java      |   87 +-
 .../text/deltamerge/InlineDeltaMergeInfo.java |   37 +-
 .../difflib/unifieddiff/UnifiedDiff.java      |   82 +-
 .../difflib/unifieddiff/UnifiedDiffFile.java  |  372 ++--
 .../UnifiedDiffParserException.java           |   29 +-
 .../unifieddiff/UnifiedDiffReader.java        |  885 +++++----
 .../unifieddiff/UnifiedDiffWriter.java        |  367 ++--
 .../com/github/difflib/DiffUtilsTest.java     |  437 +++--
 .../difflib/GenerateUnifiedDiffTest.java      |  421 ++--
 .../com/github/difflib/TestConstants.java     |   13 +-
 .../algorithm/myers/MyersDiffTest.java        |   84 +-
 .../myers/MyersDiffWithLinearSpaceTest.java   |  120 +-
 ...WithMyersDiffWithLinearSpacePatchTest.java |  743 +++----
 .../github/difflib/examples/ApplyPatch.java   |   24 +-
 .../difflib/examples/ComputeDifference.java   |   22 +-
 .../difflib/examples/OriginalAndDiffTest.java |   89 +-
 .../com/github/difflib/patch/ChunkTest.java   |   64 +-
 .../patch/PatchWithAllDiffAlgorithmsTest.java |  174 +-
 .../difflib/patch/PatchWithMyerDiffTest.java  |   58 +-
 .../PatchWithMyerDiffWithLinearSpaceTest.java |   64 +-
 .../difflib/text/DiffRowGeneratorTest.java    | 1725 +++++++++--------
 .../github/difflib/text/StringUtilsTest.java  |   63 +-
 .../unifieddiff/UnifiedDiffReaderTest.java    |  777 ++++----
 .../UnifiedDiffRoundTripNewLineTest.java      |   39 +-
 .../unifieddiff/UnifiedDiffRoundTripTest.java |  292 +--
 .../unifieddiff/UnifiedDiffWriterTest.java    |   83 +-
 pom.xml                                       |  500 ++---
 56 files changed, 6881 insertions(+), 6639 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index 5b01d2c5..766719b6 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -1,58 +1,58 @@
 
 
-    4.0.0
-    
-        io.github.java-diff-utils
-        java-diff-utils-parent
-        4.16-SNAPSHOT
-    
-    java-diff-utils-jgit
-    java-diff-utils-jgit
-    jar
-    This is an extension of java-diff-utils using jgit to use its implementation of
+  4.0.0
+  
+    io.github.java-diff-utils
+    java-diff-utils-parent
+    4.16-SNAPSHOT
+  
+  java-diff-utils-jgit
+  jar
+  java-diff-utils-jgit
+  This is an extension of java-diff-utils using jgit to use its implementation of
         some difference algorithms.
-    
-        
-            org.junit.jupiter
-            junit-jupiter
-            test
-        
-        
-					  
-            org.eclipse.jgit
-            org.eclipse.jgit
-            5.13.3.202401111512-r
-            
-                
-                    com.googlecode.javaewah
-                    JavaEWAH
-                
-                
-                    commons-codec
-                    commons-codec
-                
-                
-                    commons-logging
-                    commons-logging
-                
-                
-                    org.apache.httpcomponents
-                    httpclient
-                
-                
-                    com.jcraft
-                    jsch
-                
-                
-                    org.slf4j
-                    slf4j-api
-                
-            
-        
-        
-            ${project.groupId}
-            java-diff-utils
-            ${project.version}
-        
-    
-
\ No newline at end of file
+  
+    
+      org.junit.jupiter
+      junit-jupiter
+      test
+    
+    
+      
+      org.eclipse.jgit
+      org.eclipse.jgit
+      5.13.3.202401111512-r
+      
+        
+          com.googlecode.javaewah
+          JavaEWAH
+        
+        
+          commons-codec
+          commons-codec
+        
+        
+          commons-logging
+          commons-logging
+        
+        
+          org.apache.httpcomponents
+          httpclient
+        
+        
+          com.jcraft
+          jsch
+        
+        
+          org.slf4j
+          slf4j-api
+        
+      
+    
+    
+      ${project.groupId}
+      java-diff-utils
+      ${project.version}
+    
+  
+
diff --git a/java-diff-utils-jgit/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java b/java-diff-utils-jgit/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java
index 6d15f609..0476b269 100644
--- a/java-diff-utils-jgit/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java
+++ b/java-diff-utils-jgit/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java
@@ -35,71 +35,71 @@
  */
 public class HistogramDiff implements DiffAlgorithmI {
 
-    @Override
-    public List computeDiff(List source, List target, DiffAlgorithmListener progress) {
-        Objects.requireNonNull(source, "source list must not be null");
-        Objects.requireNonNull(target, "target list must not be null");
-        if (progress != null) {
-            progress.diffStart();
-        }
-        EditList diffList = new EditList();
-        diffList.addAll(new org.eclipse.jgit.diff.HistogramDiff().diff(new DataListComparator<>(progress), new DataList<>(source), new DataList<>(target)));
-        List patch = new ArrayList<>();
-        for (Edit edit : diffList) {
-            DeltaType type = DeltaType.EQUAL;
-            switch (edit.getType()) {
-                case DELETE:
-                    type = DeltaType.DELETE;
-                    break;
-                case INSERT:
-                    type = DeltaType.INSERT;
-                    break;
-                case REPLACE:
-                    type = DeltaType.CHANGE;
-                    break;
-            }
-            patch.add(new Change(type, edit.getBeginA(), edit.getEndA(), edit.getBeginB(), edit.getEndB()));
-        }
-        if (progress != null) {
-            progress.diffEnd();
-        }
-        return patch;
-    }
+		@Override
+		public List computeDiff(List source, List target, DiffAlgorithmListener progress) {
+				Objects.requireNonNull(source, "source list must not be null");
+				Objects.requireNonNull(target, "target list must not be null");
+				if (progress != null) {
+						progress.diffStart();
+				}
+				EditList diffList = new EditList();
+				diffList.addAll(new org.eclipse.jgit.diff.HistogramDiff()
+								.diff(new DataListComparator<>(progress), new DataList<>(source), new DataList<>(target)));
+				List patch = new ArrayList<>();
+				for (Edit edit : diffList) {
+						DeltaType type = DeltaType.EQUAL;
+						switch (edit.getType()) {
+								case DELETE:
+										type = DeltaType.DELETE;
+										break;
+								case INSERT:
+										type = DeltaType.INSERT;
+										break;
+								case REPLACE:
+										type = DeltaType.CHANGE;
+										break;
+						}
+						patch.add(new Change(type, edit.getBeginA(), edit.getEndA(), edit.getBeginB(), edit.getEndB()));
+				}
+				if (progress != null) {
+						progress.diffEnd();
+				}
+				return patch;
+		}
 }
 
 class DataListComparator extends SequenceComparator> {
 
-    private final DiffAlgorithmListener progress;
+		private final DiffAlgorithmListener progress;
 
-    public DataListComparator(DiffAlgorithmListener progress) {
-        this.progress = progress;
-    }
+		public DataListComparator(DiffAlgorithmListener progress) {
+				this.progress = progress;
+		}
 
-    @Override
-    public boolean equals(DataList original, int orgIdx, DataList revised, int revIdx) {
-        if (progress != null) {
-            progress.diffStep(orgIdx + revIdx, original.size() + revised.size());
-        }
-        return original.data.get(orgIdx).equals(revised.data.get(revIdx));
-    }
-
-    @Override
-    public int hash(DataList s, int i) {
-        return s.data.get(i).hashCode();
-    }
+		@Override
+		public boolean equals(DataList original, int orgIdx, DataList revised, int revIdx) {
+				if (progress != null) {
+						progress.diffStep(orgIdx + revIdx, original.size() + revised.size());
+				}
+				return original.data.get(orgIdx).equals(revised.data.get(revIdx));
+		}
 
+		@Override
+		public int hash(DataList s, int i) {
+				return s.data.get(i).hashCode();
+		}
 }
 
 class DataList extends Sequence {
 
-    final List data;
+		final List data;
 
-    public DataList(List data) {
-        this.data = data;
-    }
+		public DataList(List data) {
+				this.data = data;
+		}
 
-    @Override
-    public int size() {
-        return data.size();
-    }
+		@Override
+		public int size() {
+				return data.size();
+		}
 }
diff --git a/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java b/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java
index ac85f985..5dc33f82 100644
--- a/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java
+++ b/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java
@@ -15,14 +15,15 @@
  */
 package com.github.difflib.algorithm.jgit;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import com.github.difflib.algorithm.DiffAlgorithmListener;
 import com.github.difflib.patch.Patch;
 import com.github.difflib.patch.PatchFailedException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -31,57 +32,64 @@
  */
 public class HistogramDiffTest {
 
-    public HistogramDiffTest() {
-    }
+		public HistogramDiffTest() {}
+
+		/**
+		 * Test of diff method, of class HistogramDiff.
+		 */
+		@Test
+		public void testDiff() throws PatchFailedException {
+				List orgList = Arrays.asList("A", "B", "C", "A", "B", "B", "A");
+				List revList = Arrays.asList("C", "B", "A", "B", "A", "C");
+				final Patch patch =
+								Patch.generate(orgList, revList, new HistogramDiff().computeDiff(orgList, revList, null));
+				System.out.println(patch);
+				assertNotNull(patch);
+				assertEquals(3, patch.getDeltas().size());
+				assertEquals(
+								"Patch{deltas=[[DeleteDelta, position: 0, lines: [A, B]], [DeleteDelta, position: 3, lines: [A, B]], [InsertDelta, position: 7, lines: [B, A, C]]]}",
+								patch.toString());
+
+				List patched = patch.applyTo(orgList);
+				assertEquals(revList, patched);
+		}
+
+		@Test
+		public void testDiffWithListener() throws PatchFailedException {
+				List orgList = Arrays.asList("A", "B", "C", "A", "B", "B", "A");
+				List revList = Arrays.asList("C", "B", "A", "B", "A", "C");
 
-    /**
-     * Test of diff method, of class HistogramDiff.
-     */
-    @Test
-    public void testDiff() throws PatchFailedException {
-        List orgList = Arrays.asList("A", "B", "C", "A", "B", "B", "A");
-        List revList = Arrays.asList("C", "B", "A", "B", "A", "C");
-        final Patch patch = Patch.generate(orgList, revList, new HistogramDiff().computeDiff(orgList, revList, null));
-        System.out.println(patch);
-        assertNotNull(patch);
-        assertEquals(3, patch.getDeltas().size());
-        assertEquals("Patch{deltas=[[DeleteDelta, position: 0, lines: [A, B]], [DeleteDelta, position: 3, lines: [A, B]], [InsertDelta, position: 7, lines: [B, A, C]]]}", patch.toString());
+				List logdata = new ArrayList<>();
+				final Patch patch = Patch.generate(
+								orgList,
+								revList,
+								new HistogramDiff().computeDiff(orgList, revList, new DiffAlgorithmListener() {
+										@Override
+										public void diffStart() {
+												logdata.add("start");
+										}
 
-        List patched = patch.applyTo(orgList);
-        assertEquals(revList, patched);
-    }
-    
-    @Test
-    public void testDiffWithListener() throws PatchFailedException {
-        List orgList = Arrays.asList("A", "B", "C", "A", "B", "B", "A");
-        List revList = Arrays.asList("C", "B", "A", "B", "A", "C");
-        
-        List logdata = new ArrayList<>();
-        final Patch patch = Patch.generate(orgList, revList, new HistogramDiff().computeDiff(orgList, revList, new DiffAlgorithmListener() {
-            @Override
-            public void diffStart() {
-                logdata.add("start");
-            }
+										@Override
+										public void diffStep(int value, int max) {
+												logdata.add(value + " - " + max);
+										}
 
-            @Override
-            public void diffStep(int value, int max) {
-                logdata.add(value + " - " + max);
-            }
+										@Override
+										public void diffEnd() {
+												logdata.add("end");
+										}
+								}));
+				System.out.println(patch);
+				assertNotNull(patch);
+				assertEquals(3, patch.getDeltas().size());
+				assertEquals(
+								"Patch{deltas=[[DeleteDelta, position: 0, lines: [A, B]], [DeleteDelta, position: 3, lines: [A, B]], [InsertDelta, position: 7, lines: [B, A, C]]]}",
+								patch.toString());
 
-            @Override
-            public void diffEnd() {
-                logdata.add("end");
-            }
-        }));
-        System.out.println(patch);
-        assertNotNull(patch);
-        assertEquals(3, patch.getDeltas().size());
-        assertEquals("Patch{deltas=[[DeleteDelta, position: 0, lines: [A, B]], [DeleteDelta, position: 3, lines: [A, B]], [InsertDelta, position: 7, lines: [B, A, C]]]}", patch.toString());
+				List patched = patch.applyTo(orgList);
+				assertEquals(revList, patched);
 
-        List patched = patch.applyTo(orgList);
-        assertEquals(revList, patched);
-        
-        System.out.println(logdata);
-        assertEquals(19, logdata.size());
-    }
+				System.out.println(logdata);
+				assertEquals(19, logdata.size());
+		}
 }
diff --git a/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java b/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java
index ccbc2f30..955f5f7d 100644
--- a/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java
+++ b/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java
@@ -15,6 +15,10 @@
  */
 package com.github.difflib.algorithm.jgit;
 
+import static java.util.stream.Collectors.toList;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import com.github.difflib.algorithm.DiffAlgorithmListener;
 import com.github.difflib.patch.Patch;
 import com.github.difflib.patch.PatchFailedException;
@@ -26,10 +30,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
-import static java.util.stream.Collectors.toList;
 import java.util.zip.ZipFile;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -38,43 +39,46 @@
  */
 public class LRHistogramDiffTest {
 
-    @Test
-    public void testPossibleDiffHangOnLargeDatasetDnaumenkoIssue26() throws IOException, PatchFailedException {
-        ZipFile zip = new ZipFile("target/test-classes/mocks/large_dataset1.zip");
-        List original = readStringListFromInputStream(zip.getInputStream(zip.getEntry("ta")));
-        List revised = readStringListFromInputStream(zip.getInputStream(zip.getEntry("tb")));
+		@Test
+		public void testPossibleDiffHangOnLargeDatasetDnaumenkoIssue26() throws IOException, PatchFailedException {
+				ZipFile zip = new ZipFile("target/test-classes/mocks/large_dataset1.zip");
+				List original = readStringListFromInputStream(zip.getInputStream(zip.getEntry("ta")));
+				List revised = readStringListFromInputStream(zip.getInputStream(zip.getEntry("tb")));
+
+				List logdata = new ArrayList<>();
+				Patch patch = Patch.generate(
+								original,
+								revised,
+								new HistogramDiff().computeDiff(original, revised, new DiffAlgorithmListener() {
+										@Override
+										public void diffStart() {
+												logdata.add("start");
+										}
 
-        List logdata = new ArrayList<>();
-        Patch patch = Patch.generate(original, revised, new HistogramDiff().computeDiff(original, revised, new DiffAlgorithmListener() {
-            @Override
-            public void diffStart() {
-                logdata.add("start");
-            }
+										@Override
+										public void diffStep(int value, int max) {
+												logdata.add(value + " - " + max);
+										}
 
-            @Override
-            public void diffStep(int value, int max) {
-                logdata.add(value + " - " + max);
-            }
+										@Override
+										public void diffEnd() {
+												logdata.add("end");
+										}
+								}));
 
-            @Override
-            public void diffEnd() {
-                logdata.add("end");
-            }
-        }));
+				assertEquals(34, patch.getDeltas().size());
 
-        assertEquals(34, patch.getDeltas().size());
+				List created = patch.applyTo(original);
+				assertArrayEquals(revised.toArray(), created.toArray());
 
-        List created = patch.applyTo(original);
-        assertArrayEquals(revised.toArray(), created.toArray());
-        
-        assertEquals(246579, logdata.size());
-    }
+				assertEquals(246579, logdata.size());
+		}
 
-    public static List readStringListFromInputStream(InputStream is) throws IOException {
-        try (BufferedReader reader = new BufferedReader(
-                new InputStreamReader(is, Charset.forName(StandardCharsets.UTF_8.name())))) {
+		public static List readStringListFromInputStream(InputStream is) throws IOException {
+				try (BufferedReader reader =
+								new BufferedReader(new InputStreamReader(is, Charset.forName(StandardCharsets.UTF_8.name())))) {
 
-            return reader.lines().collect(toList());
-        }
-    }
+						return reader.lines().collect(toList());
+				}
+		}
 }
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index 95560b01..e0c1139f 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -1,67 +1,67 @@
+
 
-    4.0.0
+  4.0.0
+  
     io.github.java-diff-utils
-    java-diff-utils
-    jar
-    java-diff-utils
-    
-        io.github.java-diff-utils
-        java-diff-utils-parent
-        4.16-SNAPSHOT
-    
-    
-        UTF-8
-    
+    java-diff-utils-parent
+    4.16-SNAPSHOT
+  
+  io.github.java-diff-utils
+  java-diff-utils
+  jar
+  java-diff-utils
+  
+    UTF-8
+  
 
-    
-        
-            org.junit.jupiter
-            junit-jupiter
-            test
-        
-        
-            org.assertj
-            assertj-core
-            test
-        
-    
+  
+    
+      org.junit.jupiter
+      junit-jupiter
+      test
+    
+    
+      org.assertj
+      assertj-core
+      test
+    
+  
 
-    
-        	
-            
-                org.apache.maven.plugins
-                maven-compiler-plugin
-                3.6.1
-                
-                    1.8
-                    1.8
-                    UTF-8
-                
-            
-            
-                maven-jar-plugin
-                3.0.2
-                
-                    
-                        ${project.build.outputDirectory}/META-INF/MANIFEST.MF
-                        
-                            
-                            io.github.javadiffutils
-                        
-                    
-                
-            
-            
-                org.apache.maven.plugins
-                maven-surefire-plugin
-                
-                    false
-                    
-                        target/test-classes/logging.properties
-                    
-                
-            
-        
-    
+  
+    
+      
+        org.apache.maven.plugins
+        maven-compiler-plugin
+        3.6.1
+        
+          1.8
+          1.8
+          UTF-8
+        
+      
+      
+        maven-jar-plugin
+        3.0.2
+        
+          
+            ${project.build.outputDirectory}/META-INF/MANIFEST.MF
+            
+              
+              io.github.javadiffutils
+            
+          
+        
+      
+      
+        org.apache.maven.plugins
+        maven-surefire-plugin
+        
+          false
+          
+            target/test-classes/logging.properties
+          
+        
+      
+    
+  
 
-
diff --git a/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
index e0ac521f..e43be506 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
@@ -34,195 +34,190 @@
  */
 public final class DiffUtils {
 
-    /**
-     * This factory generates the DEFAULT_DIFF algorithm for all these routines.
-     */
-    static DiffAlgorithmFactory DEFAULT_DIFF = MyersDiff.factory();
-
-    /**
-     * Sets the default diff algorithm factory to be used by all diff routines.
-     *
-     * @param factory a {@link DiffAlgorithmFactory} representing the new default diff algorithm factory.
-     */
-    public static void withDefaultDiffAlgorithmFactory(DiffAlgorithmFactory factory) {
-        DEFAULT_DIFF = factory;
-    }
-
-    /**
-     * Computes the difference between two sequences of elements using the default diff algorithm.
-     *
-     * @param  a generic representing the type of the elements to be compared.
-     * @param original a {@link List} representing the original sequence of elements. Must not be {@code null}.
-     * @param revised a {@link List} representing the revised sequence of elements. Must not be {@code null}.
-     * @param progress a {@link DiffAlgorithmListener} representing the progress listener. Can be {@code null}.
-     * @return The patch describing the difference between the original and revised sequences. Never {@code null}.
-     */
-    public static  Patch diff(List original, List revised, DiffAlgorithmListener progress) {
-        return DiffUtils.diff(original, revised, DEFAULT_DIFF.create(), progress);
-    }
-
-    /**
-     * Computes the difference between two sequences of elements using the default diff algorithm.
-     *
-     * @param  a generic representing the type of the elements to be compared.
-     * @param original a {@link List} representing the original sequence of elements. Must not be {@code null}.
-     * @param revised a {@link List} representing the revised sequence of elements. Must not be {@code null}.
-     * @return The patch describing the difference between the original and revised sequences. Never {@code null}.
-     */
-    public static  Patch diff(List original, List revised) {
-        return DiffUtils.diff(original, revised, DEFAULT_DIFF.create(), null);
-    }
-
-    /**
-     * Computes the difference between two sequences of elements using the default diff algorithm.
-     *
-     * @param  a generic representing the type of the elements to be compared.
-     * @param original a {@link List} representing the original sequence of elements. Must not be {@code null}.
-     * @param revised a {@link List} representing the revised sequence of elements. Must not be {@code null}.
-     * @param includeEqualParts a {@link boolean} representing whether to include equal parts in the resulting patch.
-     * @return The patch describing the difference between the original and revised sequences. Never {@code null}.
-     */
-    public static  Patch diff(List original, List revised, boolean includeEqualParts) {
-        return DiffUtils.diff(original, revised, DEFAULT_DIFF.create(), null, includeEqualParts);
-    }
-
-    /**
-     * Computes the difference between two strings using the default diff algorithm.
-     *
-     * @param sourceText a {@link String} representing the original string. Must not be {@code null}.
-     * @param targetText a {@link String} representing the revised string. Must not be {@code null}.
-     * @param progress a {@link DiffAlgorithmListener} representing the progress listener. Can be {@code null}.
-     * @return The patch describing the difference between the original and revised strings. Never {@code null}.
-     */
-    public static Patch diff(String sourceText, String targetText,
-                                     DiffAlgorithmListener progress) {
-        return DiffUtils.diff(
-                Arrays.asList(sourceText.split("\n")),
-                Arrays.asList(targetText.split("\n")), progress);
-    }
-
-    /**
-     * Computes the difference between the original and revised list of elements
-     * with default diff algorithm
-     *
-     * @param source a {@link List} representing the original text. Must not be {@code null}.
-     * @param target a {@link List} representing the revised text. Must not be {@code null}.
-     * @param equalizer a {@link BiPredicate} representing the equalizer object to replace the default compare
-     * algorithm (Object.equals). If {@code null} the default equalizer of the
-     * default algorithm is used.
-     * @return The patch describing the difference between the original and
-     * revised sequences. Never {@code null}.
-     */
-    public static  Patch diff(List source, List target,
-                                    BiPredicate equalizer) {
-        if (equalizer != null) {
-            return DiffUtils.diff(source, target,
-                    DEFAULT_DIFF.create(equalizer));
-        }
-        return DiffUtils.diff(source, target, new MyersDiff<>());
-    }
-
-    public static  Patch diff(List original, List revised,
-                                    DiffAlgorithmI algorithm, DiffAlgorithmListener progress) {
-        return diff(original, revised, algorithm, progress, false);
-    }
-
-    /**
-     * Computes the difference between the original and revised list of elements
-     * with default diff algorithm
-     *
-     * @param original a {@link List} representing the original text. Must not be {@code null}.
-     * @param revised a {@link List} representing the revised text. Must not be {@code null}.
-     * @param algorithm a {@link DiffAlgorithmI} representing the diff algorithm. Must not be {@code null}.
-     * @param progress a {@link DiffAlgorithmListener} representing the diff algorithm listener.
-     * @param includeEqualParts Include equal data parts into the patch.
-     * @return The patch describing the difference between the original and
-     * revised sequences. Never {@code null}.
-     */
-    public static  Patch diff(List original, List revised,
-                                    DiffAlgorithmI algorithm, DiffAlgorithmListener progress,
-                                    boolean includeEqualParts) {
-        Objects.requireNonNull(original, "original must not be null");
-        Objects.requireNonNull(revised, "revised must not be null");
-        Objects.requireNonNull(algorithm, "algorithm must not be null");
-
-        return Patch.generate(original, revised, algorithm.computeDiff(original, revised, progress), includeEqualParts);
-    }
-
-
-    /**
-     * Computes the difference between the original and revised list of elements
-     * with default diff algorithm
-     *
-     * @param original a {@link List} representing the original text. Must not be {@code null}.
-     * @param revised a {@link List} representing the revised text. Must not be {@code null}.
-     * @param algorithm a {@link DiffAlgorithmI} representing the diff algorithm. Must not be {@code null}.
-     * @return The patch describing the difference between the original and
-     * revised sequences. Never {@code null}.
-     */
-    public static  Patch diff(List original, List revised, DiffAlgorithmI algorithm) {
-        return diff(original, revised, algorithm, null);
-    }
-
-    /**
-     * Computes the difference between the given texts inline. This one uses the
-     * "trick" to make out of texts lists of characters, like DiffRowGenerator
-     * does and merges those changes at the end together again.
-     *
-     * @param original a {@link String} representing the original text. Must not be {@code null}.
-     * @param revised a {@link String} representing the revised text. Must not be {@code null}.
-     * @return The patch describing the difference between the original and
-     * revised sequences. Never {@code null}.
-     */
-    public static Patch diffInline(String original, String revised) {
-        List origList = new ArrayList<>();
-        List revList = new ArrayList<>();
-        for (Character character : original.toCharArray()) {
-            origList.add(character.toString());
-        }
-        for (Character character : revised.toCharArray()) {
-            revList.add(character.toString());
-        }
-        Patch patch = DiffUtils.diff(origList, revList);
-        for (AbstractDelta delta : patch.getDeltas()) {
-            delta.getSource().setLines(compressLines(delta.getSource().getLines(), ""));
-            delta.getTarget().setLines(compressLines(delta.getTarget().getLines(), ""));
-        }
-        return patch;
-    }
-
-    /**
-     * Applies the given patch to the original list and returns the revised list.
-     *
-     * @param original a {@link List} representing the original list.
-     * @param patch a {@link List} representing the patch to apply.
-     * @return the revised list.
-     * @throws PatchFailedException if the patch cannot be applied.
-     */
-    public static  List patch(List original, Patch patch)
-            throws PatchFailedException {
-        return patch.applyTo(original);
-    }
-
-    /**
-     * Applies the given patch to the revised list and returns the original list.
-     *
-     * @param revised a {@link List} representing the revised list.
-     * @param patch a {@link Patch} representing the patch to apply.
-     * @return the original list.
-     * @throws PatchFailedException if the patch cannot be applied.
-     */
-    public static  List unpatch(List revised, Patch patch) {
-        return patch.restore(revised);
-    }
-
-    private static List compressLines(List lines, String delimiter) {
-        if (lines.isEmpty()) {
-            return Collections.emptyList();
-        }
-        return Collections.singletonList(String.join(delimiter, lines));
-    }
-
-    private DiffUtils() {
-    }
+		/**
+		 * This factory generates the DEFAULT_DIFF algorithm for all these routines.
+		 */
+		static DiffAlgorithmFactory DEFAULT_DIFF = MyersDiff.factory();
+
+		/**
+		 * Sets the default diff algorithm factory to be used by all diff routines.
+		 *
+		 * @param factory a {@link DiffAlgorithmFactory} representing the new default diff algorithm factory.
+		 */
+		public static void withDefaultDiffAlgorithmFactory(DiffAlgorithmFactory factory) {
+				DEFAULT_DIFF = factory;
+		}
+
+		/**
+		 * Computes the difference between two sequences of elements using the default diff algorithm.
+		 *
+		 * @param  a generic representing the type of the elements to be compared.
+		 * @param original a {@link List} representing the original sequence of elements. Must not be {@code null}.
+		 * @param revised a {@link List} representing the revised sequence of elements. Must not be {@code null}.
+		 * @param progress a {@link DiffAlgorithmListener} representing the progress listener. Can be {@code null}.
+		 * @return The patch describing the difference between the original and revised sequences. Never {@code null}.
+		 */
+		public static  Patch diff(List original, List revised, DiffAlgorithmListener progress) {
+				return DiffUtils.diff(original, revised, DEFAULT_DIFF.create(), progress);
+		}
+
+		/**
+		 * Computes the difference between two sequences of elements using the default diff algorithm.
+		 *
+		 * @param  a generic representing the type of the elements to be compared.
+		 * @param original a {@link List} representing the original sequence of elements. Must not be {@code null}.
+		 * @param revised a {@link List} representing the revised sequence of elements. Must not be {@code null}.
+		 * @return The patch describing the difference between the original and revised sequences. Never {@code null}.
+		 */
+		public static  Patch diff(List original, List revised) {
+				return DiffUtils.diff(original, revised, DEFAULT_DIFF.create(), null);
+		}
+
+		/**
+		 * Computes the difference between two sequences of elements using the default diff algorithm.
+		 *
+		 * @param  a generic representing the type of the elements to be compared.
+		 * @param original a {@link List} representing the original sequence of elements. Must not be {@code null}.
+		 * @param revised a {@link List} representing the revised sequence of elements. Must not be {@code null}.
+		 * @param includeEqualParts a {@link boolean} representing whether to include equal parts in the resulting patch.
+		 * @return The patch describing the difference between the original and revised sequences. Never {@code null}.
+		 */
+		public static  Patch diff(List original, List revised, boolean includeEqualParts) {
+				return DiffUtils.diff(original, revised, DEFAULT_DIFF.create(), null, includeEqualParts);
+		}
+
+		/**
+		 * Computes the difference between two strings using the default diff algorithm.
+		 *
+		 * @param sourceText a {@link String} representing the original string. Must not be {@code null}.
+		 * @param targetText a {@link String} representing the revised string. Must not be {@code null}.
+		 * @param progress a {@link DiffAlgorithmListener} representing the progress listener. Can be {@code null}.
+		 * @return The patch describing the difference between the original and revised strings. Never {@code null}.
+		 */
+		public static Patch diff(String sourceText, String targetText, DiffAlgorithmListener progress) {
+				return DiffUtils.diff(Arrays.asList(sourceText.split("\n")), Arrays.asList(targetText.split("\n")), progress);
+		}
+
+		/**
+		 * Computes the difference between the original and revised list of elements
+		 * with default diff algorithm
+		 *
+		 * @param source a {@link List} representing the original text. Must not be {@code null}.
+		 * @param target a {@link List} representing the revised text. Must not be {@code null}.
+		 * @param equalizer a {@link BiPredicate} representing the equalizer object to replace the default compare
+		 * algorithm (Object.equals). If {@code null} the default equalizer of the
+		 * default algorithm is used.
+		 * @return The patch describing the difference between the original and
+		 * revised sequences. Never {@code null}.
+		 */
+		public static  Patch diff(List source, List target, BiPredicate equalizer) {
+				if (equalizer != null) {
+						return DiffUtils.diff(source, target, DEFAULT_DIFF.create(equalizer));
+				}
+				return DiffUtils.diff(source, target, new MyersDiff<>());
+		}
+
+		public static  Patch diff(
+						List original, List revised, DiffAlgorithmI algorithm, DiffAlgorithmListener progress) {
+				return diff(original, revised, algorithm, progress, false);
+		}
+
+		/**
+		 * Computes the difference between the original and revised list of elements
+		 * with default diff algorithm
+		 *
+		 * @param original a {@link List} representing the original text. Must not be {@code null}.
+		 * @param revised a {@link List} representing the revised text. Must not be {@code null}.
+		 * @param algorithm a {@link DiffAlgorithmI} representing the diff algorithm. Must not be {@code null}.
+		 * @param progress a {@link DiffAlgorithmListener} representing the diff algorithm listener.
+		 * @param includeEqualParts Include equal data parts into the patch.
+		 * @return The patch describing the difference between the original and
+		 * revised sequences. Never {@code null}.
+		 */
+		public static  Patch diff(
+						List original,
+						List revised,
+						DiffAlgorithmI algorithm,
+						DiffAlgorithmListener progress,
+						boolean includeEqualParts) {
+				Objects.requireNonNull(original, "original must not be null");
+				Objects.requireNonNull(revised, "revised must not be null");
+				Objects.requireNonNull(algorithm, "algorithm must not be null");
+
+				return Patch.generate(original, revised, algorithm.computeDiff(original, revised, progress), includeEqualParts);
+		}
+
+		/**
+		 * Computes the difference between the original and revised list of elements
+		 * with default diff algorithm
+		 *
+		 * @param original a {@link List} representing the original text. Must not be {@code null}.
+		 * @param revised a {@link List} representing the revised text. Must not be {@code null}.
+		 * @param algorithm a {@link DiffAlgorithmI} representing the diff algorithm. Must not be {@code null}.
+		 * @return The patch describing the difference between the original and
+		 * revised sequences. Never {@code null}.
+		 */
+		public static  Patch diff(List original, List revised, DiffAlgorithmI algorithm) {
+				return diff(original, revised, algorithm, null);
+		}
+
+		/**
+		 * Computes the difference between the given texts inline. This one uses the
+		 * "trick" to make out of texts lists of characters, like DiffRowGenerator
+		 * does and merges those changes at the end together again.
+		 *
+		 * @param original a {@link String} representing the original text. Must not be {@code null}.
+		 * @param revised a {@link String} representing the revised text. Must not be {@code null}.
+		 * @return The patch describing the difference between the original and
+		 * revised sequences. Never {@code null}.
+		 */
+		public static Patch diffInline(String original, String revised) {
+				List origList = new ArrayList<>();
+				List revList = new ArrayList<>();
+				for (Character character : original.toCharArray()) {
+						origList.add(character.toString());
+				}
+				for (Character character : revised.toCharArray()) {
+						revList.add(character.toString());
+				}
+				Patch patch = DiffUtils.diff(origList, revList);
+				for (AbstractDelta delta : patch.getDeltas()) {
+						delta.getSource().setLines(compressLines(delta.getSource().getLines(), ""));
+						delta.getTarget().setLines(compressLines(delta.getTarget().getLines(), ""));
+				}
+				return patch;
+		}
+
+		/**
+		 * Applies the given patch to the original list and returns the revised list.
+		 *
+		 * @param original a {@link List} representing the original list.
+		 * @param patch a {@link List} representing the patch to apply.
+		 * @return the revised list.
+		 * @throws PatchFailedException if the patch cannot be applied.
+		 */
+		public static  List patch(List original, Patch patch) throws PatchFailedException {
+				return patch.applyTo(original);
+		}
+
+		/**
+		 * Applies the given patch to the revised list and returns the original list.
+		 *
+		 * @param revised a {@link List} representing the revised list.
+		 * @param patch a {@link Patch} representing the patch to apply.
+		 * @return the original list.
+		 * @throws PatchFailedException if the patch cannot be applied.
+		 */
+		public static  List unpatch(List revised, Patch patch) {
+				return patch.restore(revised);
+		}
+
+		private static List compressLines(List lines, String delimiter) {
+				if (lines.isEmpty()) {
+						return Collections.emptyList();
+				}
+				return Collections.singletonList(String.join(delimiter, lines));
+		}
+
+		private DiffUtils() {}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
index 94786b6c..ca6a34ad 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
@@ -15,11 +15,10 @@
  */
 package com.github.difflib;
 
+import com.github.difflib.patch.AbstractDelta;
 import com.github.difflib.patch.ChangeDelta;
 import com.github.difflib.patch.Chunk;
-import com.github.difflib.patch.AbstractDelta;
 import com.github.difflib.patch.Patch;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -35,433 +34,430 @@
  */
 public final class UnifiedDiffUtils {
 
-    private static final Pattern UNIFIED_DIFF_CHUNK_REGEXP = Pattern
-            .compile("^@@\\s+-(\\d+)(?:,(\\d+))?\\s+\\+(\\d+)(?:,(\\d+))?\\s+@@.*$");
-    private static final String NULL_FILE_INDICATOR = "/dev/null";
-
-    /**
-     * Parse the given text in unified format and creates the list of deltas for it.
-     *
-     * @param diff the text in unified format
-     * @return the patch with deltas.
-     */
-    public static Patch parseUnifiedDiff(List diff) {
-        boolean inPrelude = true;
-        List rawChunk = new ArrayList<>();
-        Patch patch = new Patch<>();
-
-        int old_ln = 0;
-        int new_ln = 0;
-        String tag;
-        String rest;
-        for (String line : diff) {
-            // Skip leading lines until after we've seen one starting with '+++'
-            if (inPrelude) {
-                if (line.startsWith("+++")) {
-                    inPrelude = false;
-                }
-                continue;
-            }
-            Matcher m = UNIFIED_DIFF_CHUNK_REGEXP.matcher(line);
-            if (m.find()) {
-                // Process the lines in the previous chunk
-                processLinesInPrevChunk(rawChunk, patch, old_ln, new_ln);
-                // Parse the @@ header
-                old_ln = m.group(1) == null ? 1 : Integer.parseInt(m.group(1));
-                new_ln = m.group(3) == null ? 1 : Integer.parseInt(m.group(3));
-
-                if (old_ln == 0) {
-                    old_ln = 1;
-                }
-                if (new_ln == 0) {
-                    new_ln = 1;
-                }
-            } else {
-                if (line.length() > 0) {
-                    tag = line.substring(0, 1);
-                    rest = line.substring(1);
-                    if (" ".equals(tag) || "+".equals(tag) || "-".equals(tag)) {
-                        rawChunk.add(new String[]{tag, rest});
-                    }
-                } else {
-                    rawChunk.add(new String[]{" ", ""});
-                }
-            }
-        }
-
-        // Process the lines in the last chunk
-        processLinesInPrevChunk(rawChunk, patch, old_ln, new_ln);
-
-        return patch;
-    }
-
-    private static void processLinesInPrevChunk(List rawChunk, Patch patch, int old_ln, int new_ln) {
-        String tag;
-        String rest;
-        if (!rawChunk.isEmpty()) {
-            List oldChunkLines = new ArrayList<>();
-            List newChunkLines = new ArrayList<>();
-
-            List removePosition = new ArrayList<>();
-            List addPosition = new ArrayList<>();
-            int removeNum = 0;
-            int addNum = 0;
-            for (String[] raw_line : rawChunk) {
-                tag = raw_line[0];
-                rest = raw_line[1];
-                if (" ".equals(tag) || "-".equals(tag)) {
-                    removeNum++;
-                    oldChunkLines.add(rest);
-                    if ("-".equals(tag)) {
-                        removePosition.add(old_ln - 1 + removeNum);
-                    }
-                }
-                if (" ".equals(tag) || "+".equals(tag)) {
-                    addNum++;
-                    newChunkLines.add(rest);
-                    if ("+".equals(tag)) {
-                        addPosition.add(new_ln - 1 + addNum);
-                    }
-                }
-            }
-            patch.addDelta(new ChangeDelta<>(new Chunk<>(
-                    old_ln - 1, oldChunkLines, removePosition), new Chunk<>(
-                    new_ln - 1, newChunkLines, addPosition)));
-            rawChunk.clear();
-        }
-    }
-
-    /**
-     * generateUnifiedDiff takes a Patch and some other arguments, returning the Unified Diff format
-     * text representing the Patch.  Author: Bill James (tankerbay@gmail.com).
-     *
-     * @param originalFileName - Filename of the original (unrevised file)
-     * @param revisedFileName - Filename of the revised file
-     * @param originalLines - Lines of the original file
-     * @param patch - Patch created by the diff() function
-     * @param contextSize - number of lines of context output around each difference in the file.
-     * @return List of strings representing the Unified Diff representation of the Patch argument.
-     */
-    public static List generateUnifiedDiff(String originalFileName,
-            String revisedFileName, List originalLines, Patch patch,
-            int contextSize) {
-        if (!patch.getDeltas().isEmpty()) {
-            List ret = new ArrayList<>();
-            ret.add("--- " + Optional.ofNullable(originalFileName).orElse(NULL_FILE_INDICATOR));
-            ret.add("+++ " + Optional.ofNullable(revisedFileName).orElse(NULL_FILE_INDICATOR));
-
-            List> patchDeltas = new ArrayList<>(
-                    patch.getDeltas());
-
-            // code outside the if block also works for single-delta issues.
-            List> deltas = new ArrayList<>(); // current
-            // list
-            // of
-            // Delta's to
-            // process
-            AbstractDelta delta = patchDeltas.get(0);
-            deltas.add(delta); // add the first Delta to the current set
-            // if there's more than 1 Delta, we may need to output them together
-            if (patchDeltas.size() > 1) {
-                for (int i = 1; i < patchDeltas.size(); i++) {
-                    int position = delta.getSource().getPosition(); // store
-                    // the
-                    // current
-                    // position
-                    // of
-                    // the first Delta
-
-                    // Check if the next Delta is too close to the current
-                    // position.
-                    // And if it is, add it to the current set
-                    AbstractDelta nextDelta = patchDeltas.get(i);
-                    if ((position + delta.getSource().size() + contextSize) >= (nextDelta
-                            .getSource().getPosition() - contextSize)) {
-                        deltas.add(nextDelta);
-                    } else {
-                        // if it isn't, output the current set,
-                        // then create a new set and add the current Delta to
-                        // it.
-                        List curBlock = processDeltas(originalLines,
-                                deltas, contextSize, false);
-                        ret.addAll(curBlock);
-                        deltas.clear();
-                        deltas.add(nextDelta);
-                    }
-                    delta = nextDelta;
-                }
-
-            }
-            // don't forget to process the last set of Deltas
-            List curBlock = processDeltas(originalLines, deltas,
-                    contextSize, patchDeltas.size() == 1 && originalFileName == null);
-            ret.addAll(curBlock);
-            return ret;
-        }
-        return new ArrayList<>();
-    }
-
-    /**
-     * processDeltas takes a list of Deltas and outputs them together in a single block of
-     * Unified-Diff-format text.  Author: Bill James (tankerbay@gmail.com).
-     *
-     * @param origLines - the lines of the original file
-     * @param deltas - the Deltas to be output as a single block
-     * @param contextSize - the number of lines of context to place around block
-     * @return
-     */
-    private static List processDeltas(List origLines,
-            List> deltas, int contextSize, boolean newFile) {
-        List buffer = new ArrayList<>();
-        int origTotal = 0; // counter for total lines output from Original
-        int revTotal = 0; // counter for total lines output from Original
-        int line;
-
-        AbstractDelta curDelta = deltas.get(0);
-        int origStart;
-        if (newFile) {
-            origStart = 0;
-        } else {
-            // NOTE: +1 to overcome the 0-offset Position
-            origStart = curDelta.getSource().getPosition() + 1 - contextSize;
-            if (origStart < 1) {
-                origStart = 1;
-            }
-        }
-
-        int revStart = curDelta.getTarget().getPosition() + 1 - contextSize;
-        if (revStart < 1) {
-            revStart = 1;
-        }
-
-        // find the start of the wrapper context code
-        int contextStart = curDelta.getSource().getPosition() - contextSize;
-        if (contextStart < 0) {
-            contextStart = 0; // clamp to the start of the file
-        }
-
-        // output the context before the first Delta
-        for (line = contextStart; line < curDelta.getSource().getPosition(); line++) { //
-            buffer.add(" " + origLines.get(line));
-            origTotal++;
-            revTotal++;
-        }
-
-        // output the first Delta
-        buffer.addAll(getDeltaText(curDelta));
-        origTotal += curDelta.getSource().getLines().size();
-        revTotal += curDelta.getTarget().getLines().size();
-
-        int deltaIndex = 1;
-        while (deltaIndex < deltas.size()) { // for each of the other Deltas
-            AbstractDelta nextDelta = deltas.get(deltaIndex);
-            int intermediateStart = curDelta.getSource().getPosition()
-                    + curDelta.getSource().getLines().size();
-            for (line = intermediateStart; line < nextDelta.getSource()
-                    .getPosition(); line++) {
-                // output the code between the last Delta and this one
-                buffer.add(" " + origLines.get(line));
-                origTotal++;
-                revTotal++;
-            }
-            buffer.addAll(getDeltaText(nextDelta)); // output the Delta
-            origTotal += nextDelta.getSource().getLines().size();
-            revTotal += nextDelta.getTarget().getLines().size();
-            curDelta = nextDelta;
-            deltaIndex++;
-        }
-
-        // Now output the post-Delta context code, clamping the end of the file
-        contextStart = curDelta.getSource().getPosition()
-                + curDelta.getSource().getLines().size();
-        for (line = contextStart; (line < (contextStart + contextSize))
-                && (line < origLines.size()); line++) {
-            buffer.add(" " + origLines.get(line));
-            origTotal++;
-            revTotal++;
-        }
-
-        // Create and insert the block header, conforming to the Unified Diff
-        // standard
-        StringBuilder header = new StringBuilder();
-        header.append("@@ -");
-        header.append(origStart);
-        header.append(",");
-        header.append(origTotal);
-        header.append(" +");
-        header.append(revStart);
-        header.append(",");
-        header.append(revTotal);
-        header.append(" @@");
-        buffer.add(0, header.toString());
-
-        return buffer;
-    }
-
-    /**
-     * getDeltaText returns the lines to be added to the Unified Diff text from the Delta parameter.  Author: Bill James (tankerbay@gmail.com).
-     *
-     * @param delta - the Delta to output
-     * @return list of String lines of code.
-     */
-    private static List getDeltaText(AbstractDelta delta) {
-        List buffer = new ArrayList<>();
-        for (String line : delta.getSource().getLines()) {
-            buffer.add("-" + line);
-        }
-        for (String line : delta.getTarget().getLines()) {
-            buffer.add("+" + line);
-        }
-        return buffer;
-    }
-
-    private UnifiedDiffUtils() {
-    }
-
-    /**
-     * Compare the differences between two files and return to the original file and diff format
-     *
-     * (This method compares the original file with the comparison file to obtain a diff, and inserts the diff into the corresponding position of the original file.
-     * You can see all the differences and unmodified places from the original file.
-     * Also, this will be very easy and useful for making side-by-side comparison display applications,
-     * for example, if you use diff2html (https://github.com/rtfpessoa/diff2html#usage)
-     * Wait for tools to display your differences on html pages, you only need to insert the return value into your js code)
-     *
-     * @param original Original file content
-     * @param revised  revised file content
-     *
-     */
-    public static List generateOriginalAndDiff(List original, List revised) {
-        return generateOriginalAndDiff(original, revised, null, null);
-    }
-
-
-    /**
-     * Compare the differences between two files and return to the original file and diff format
-     *
-     * (This method compares the original file with the comparison file to obtain a diff, and inserts the diff into the corresponding position of the original file.
-     * You can see all the differences and unmodified places from the original file.
-     * Also, this will be very easy and useful for making side-by-side comparison display applications,
-     * for example, if you use diff2html (https://github.com/rtfpessoa/diff2html#usage)
-     * Wait for tools to display your differences on html pages, you only need to insert the return value into your js code)
-     *
-     * @param original         Original file content
-     * @param revised          revised file content
-     * @param originalFileName Original file name
-     * @param revisedFileName  revised file name
-     */
-    public static List generateOriginalAndDiff(List original, List revised, String originalFileName, String revisedFileName) {
-        String originalFileNameTemp = originalFileName;
-        String revisedFileNameTemp = revisedFileName;
-        if (originalFileNameTemp == null) {
-            originalFileNameTemp = "original";
-        }
-        if (revisedFileNameTemp == null) {
-            revisedFileNameTemp = "revised";
-        }
-        Patch patch = DiffUtils.diff(original, revised);
-        List unifiedDiff = generateUnifiedDiff(originalFileNameTemp, revisedFileNameTemp, original, patch, 0);
-        if (unifiedDiff.isEmpty()) {
-            unifiedDiff.add("--- " + originalFileNameTemp);
-            unifiedDiff.add("+++ " + revisedFileNameTemp);
-            unifiedDiff.add("@@ -0,0 +0,0 @@");
-        } else if (unifiedDiff.size() >= 3 && !unifiedDiff.get(2).contains("@@ -1,")) {
-            unifiedDiff.set(1, unifiedDiff.get(1));
-            unifiedDiff.add(2, "@@ -0,0 +0,0 @@");
-        }
-        List originalWithPrefix = original.stream().map(v -> " " + v).collect(Collectors.toList());
-        return insertOrig(originalWithPrefix, unifiedDiff);
-    }
-
-    //Insert the diff format to the original file
-    private static List insertOrig(List original, List unifiedDiff) {
-        List result = new ArrayList<>();
-        List> diffList = new ArrayList<>();
-        List diff = new ArrayList<>();
-        for (int i = 0; i < unifiedDiff.size(); i++) {
-            String u = unifiedDiff.get(i);
-            if (u.startsWith("@@") && !"@@ -0,0 +0,0 @@".equals(u) && !u.contains("@@ -1,")) {
-                List twoList = new ArrayList<>();
-                twoList.addAll(diff);
-                diffList.add(twoList);
-                diff.clear();
-                diff.add(u);
-                continue;
-            }
-            if (i == unifiedDiff.size() - 1) {
-                diff.add(u);
-                List twoList = new ArrayList<>();
-                twoList.addAll(diff);
-                diffList.add(twoList);
-                diff.clear();
-                break;
-            }
-            diff.add(u);
-        }
-        insertOrig(diffList, result, original);
-        return result;
-    }
-
-    //Insert the diff format to the original file
-    private static void insertOrig(List> diffList, List result, List original) {
-        for (int i = 0; i < diffList.size(); i++) {
-            List diff = diffList.get(i);
-            List nexDiff = i == diffList.size() - 1 ? null : diffList.get(i + 1);
-            String simb = i == 0 ? diff.get(2) : diff.get(0);
-            String nexSimb = nexDiff == null ? null : nexDiff.get(0);
-            insert(result, diff);
-            Map map = getRowMap(simb);
-            if (null != nexSimb) {
-                Map nexMap = getRowMap(nexSimb);
-                int start = 0;
-                if (map.get("orgRow") != 0) {
-                    start = map.get("orgRow") + map.get("orgDel") - 1;
-                }
-                int end = nexMap.get("revRow") - 2;
-                insert(result, getOrigList(original, start, end));
-            }
-            int start = map.get("orgRow") + map.get("orgDel") - 1;
-            start = start == -1 ? 0 : start;
-            if (simb.contains("@@ -1,") && null == nexSimb && map.get("orgDel") != original.size()) {
-                insert(result, getOrigList(original, start, original.size() - 1));
-            } else if (null == nexSimb && (map.get("orgRow") + map.get("orgDel") - 1) < original.size()) {
-                insert(result, getOrigList(original, start, original.size() - 1));
-            }
-        }
-    }
-
-    //Insert the unchanged content in the source file into result
-    private static void insert(List result, List noChangeContent) {
-        for (String ins : noChangeContent) {
-            result.add(ins);
-        }
-    }
-
-    //Parse the line containing @@ to get the modified line number to delete or add a few lines
-    private static Map getRowMap(String str) {
-        Map map = new HashMap<>();
-        if (str.startsWith("@@")) {
-            String[] sp = str.split(" ");
-            String org = sp[1];
-            String[] orgSp = org.split(",");
-            map.put("orgRow", Integer.valueOf(orgSp[0].substring(1)));
-            map.put("orgDel", Integer.valueOf(orgSp[1]));
-            String[] revSp = org.split(",");
-            map.put("revRow", Integer.valueOf(revSp[0].substring(1)));
-            map.put("revAdd", Integer.valueOf(revSp[1]));
-        }
-        return map;
-    }
-
-    //Get the specified part of the line from the original file
-    private static List getOrigList(List originalWithPrefix, int start, int end) {
-        List list = new ArrayList<>();
-        if (originalWithPrefix.size() >= 1 && start <= end && end < originalWithPrefix.size()) {
-            int startTemp = start;
-            for (; startTemp <= end; startTemp++) {
-                list.add(originalWithPrefix.get(startTemp));
-            }
-        }
-        return list;
-    }
+		private static final Pattern UNIFIED_DIFF_CHUNK_REGEXP =
+						Pattern.compile("^@@\\s+-(\\d+)(?:,(\\d+))?\\s+\\+(\\d+)(?:,(\\d+))?\\s+@@.*$");
+		private static final String NULL_FILE_INDICATOR = "/dev/null";
+
+		/**
+		 * Parse the given text in unified format and creates the list of deltas for it.
+		 *
+		 * @param diff the text in unified format
+		 * @return the patch with deltas.
+		 */
+		public static Patch parseUnifiedDiff(List diff) {
+				boolean inPrelude = true;
+				List rawChunk = new ArrayList<>();
+				Patch patch = new Patch<>();
+
+				int old_ln = 0;
+				int new_ln = 0;
+				String tag;
+				String rest;
+				for (String line : diff) {
+						// Skip leading lines until after we've seen one starting with '+++'
+						if (inPrelude) {
+								if (line.startsWith("+++")) {
+										inPrelude = false;
+								}
+								continue;
+						}
+						Matcher m = UNIFIED_DIFF_CHUNK_REGEXP.matcher(line);
+						if (m.find()) {
+								// Process the lines in the previous chunk
+								processLinesInPrevChunk(rawChunk, patch, old_ln, new_ln);
+								// Parse the @@ header
+								old_ln = m.group(1) == null ? 1 : Integer.parseInt(m.group(1));
+								new_ln = m.group(3) == null ? 1 : Integer.parseInt(m.group(3));
+
+								if (old_ln == 0) {
+										old_ln = 1;
+								}
+								if (new_ln == 0) {
+										new_ln = 1;
+								}
+						} else {
+								if (line.length() > 0) {
+										tag = line.substring(0, 1);
+										rest = line.substring(1);
+										if (" ".equals(tag) || "+".equals(tag) || "-".equals(tag)) {
+												rawChunk.add(new String[] {tag, rest});
+										}
+								} else {
+										rawChunk.add(new String[] {" ", ""});
+								}
+						}
+				}
+
+				// Process the lines in the last chunk
+				processLinesInPrevChunk(rawChunk, patch, old_ln, new_ln);
+
+				return patch;
+		}
+
+		private static void processLinesInPrevChunk(List rawChunk, Patch patch, int old_ln, int new_ln) {
+				String tag;
+				String rest;
+				if (!rawChunk.isEmpty()) {
+						List oldChunkLines = new ArrayList<>();
+						List newChunkLines = new ArrayList<>();
+
+						List removePosition = new ArrayList<>();
+						List addPosition = new ArrayList<>();
+						int removeNum = 0;
+						int addNum = 0;
+						for (String[] raw_line : rawChunk) {
+								tag = raw_line[0];
+								rest = raw_line[1];
+								if (" ".equals(tag) || "-".equals(tag)) {
+										removeNum++;
+										oldChunkLines.add(rest);
+										if ("-".equals(tag)) {
+												removePosition.add(old_ln - 1 + removeNum);
+										}
+								}
+								if (" ".equals(tag) || "+".equals(tag)) {
+										addNum++;
+										newChunkLines.add(rest);
+										if ("+".equals(tag)) {
+												addPosition.add(new_ln - 1 + addNum);
+										}
+								}
+						}
+						patch.addDelta(new ChangeDelta<>(
+										new Chunk<>(old_ln - 1, oldChunkLines, removePosition),
+										new Chunk<>(new_ln - 1, newChunkLines, addPosition)));
+						rawChunk.clear();
+				}
+		}
+
+		/**
+		 * generateUnifiedDiff takes a Patch and some other arguments, returning the Unified Diff format
+		 * text representing the Patch.  Author: Bill James (tankerbay@gmail.com).
+		 *
+		 * @param originalFileName - Filename of the original (unrevised file)
+		 * @param revisedFileName - Filename of the revised file
+		 * @param originalLines - Lines of the original file
+		 * @param patch - Patch created by the diff() function
+		 * @param contextSize - number of lines of context output around each difference in the file.
+		 * @return List of strings representing the Unified Diff representation of the Patch argument.
+		 */
+		public static List generateUnifiedDiff(
+						String originalFileName,
+						String revisedFileName,
+						List originalLines,
+						Patch patch,
+						int contextSize) {
+				if (!patch.getDeltas().isEmpty()) {
+						List ret = new ArrayList<>();
+						ret.add("--- " + Optional.ofNullable(originalFileName).orElse(NULL_FILE_INDICATOR));
+						ret.add("+++ " + Optional.ofNullable(revisedFileName).orElse(NULL_FILE_INDICATOR));
+
+						List> patchDeltas = new ArrayList<>(patch.getDeltas());
+
+						// code outside the if block also works for single-delta issues.
+						List> deltas = new ArrayList<>(); // current
+						// list
+						// of
+						// Delta's to
+						// process
+						AbstractDelta delta = patchDeltas.get(0);
+						deltas.add(delta); // add the first Delta to the current set
+						// if there's more than 1 Delta, we may need to output them together
+						if (patchDeltas.size() > 1) {
+								for (int i = 1; i < patchDeltas.size(); i++) {
+										int position = delta.getSource().getPosition(); // store
+										// the
+										// current
+										// position
+										// of
+										// the first Delta
+
+										// Check if the next Delta is too close to the current
+										// position.
+										// And if it is, add it to the current set
+										AbstractDelta nextDelta = patchDeltas.get(i);
+										if ((position + delta.getSource().size() + contextSize)
+														>= (nextDelta.getSource().getPosition() - contextSize)) {
+												deltas.add(nextDelta);
+										} else {
+												// if it isn't, output the current set,
+												// then create a new set and add the current Delta to
+												// it.
+												List curBlock = processDeltas(originalLines, deltas, contextSize, false);
+												ret.addAll(curBlock);
+												deltas.clear();
+												deltas.add(nextDelta);
+										}
+										delta = nextDelta;
+								}
+						}
+						// don't forget to process the last set of Deltas
+						List curBlock = processDeltas(
+										originalLines, deltas, contextSize, patchDeltas.size() == 1 && originalFileName == null);
+						ret.addAll(curBlock);
+						return ret;
+				}
+				return new ArrayList<>();
+		}
+
+		/**
+		 * processDeltas takes a list of Deltas and outputs them together in a single block of
+		 * Unified-Diff-format text.  Author: Bill James (tankerbay@gmail.com).
+		 *
+		 * @param origLines - the lines of the original file
+		 * @param deltas - the Deltas to be output as a single block
+		 * @param contextSize - the number of lines of context to place around block
+		 * @return
+		 */
+		private static List processDeltas(
+						List origLines, List> deltas, int contextSize, boolean newFile) {
+				List buffer = new ArrayList<>();
+				int origTotal = 0; // counter for total lines output from Original
+				int revTotal = 0; // counter for total lines output from Original
+				int line;
+
+				AbstractDelta curDelta = deltas.get(0);
+				int origStart;
+				if (newFile) {
+						origStart = 0;
+				} else {
+						// NOTE: +1 to overcome the 0-offset Position
+						origStart = curDelta.getSource().getPosition() + 1 - contextSize;
+						if (origStart < 1) {
+								origStart = 1;
+						}
+				}
+
+				int revStart = curDelta.getTarget().getPosition() + 1 - contextSize;
+				if (revStart < 1) {
+						revStart = 1;
+				}
+
+				// find the start of the wrapper context code
+				int contextStart = curDelta.getSource().getPosition() - contextSize;
+				if (contextStart < 0) {
+						contextStart = 0; // clamp to the start of the file
+				}
+
+				// output the context before the first Delta
+				for (line = contextStart; line < curDelta.getSource().getPosition(); line++) { //
+						buffer.add(" " + origLines.get(line));
+						origTotal++;
+						revTotal++;
+				}
+
+				// output the first Delta
+				buffer.addAll(getDeltaText(curDelta));
+				origTotal += curDelta.getSource().getLines().size();
+				revTotal += curDelta.getTarget().getLines().size();
+
+				int deltaIndex = 1;
+				while (deltaIndex < deltas.size()) { // for each of the other Deltas
+						AbstractDelta nextDelta = deltas.get(deltaIndex);
+						int intermediateStart = curDelta.getSource().getPosition()
+										+ curDelta.getSource().getLines().size();
+						for (line = intermediateStart; line < nextDelta.getSource().getPosition(); line++) {
+								// output the code between the last Delta and this one
+								buffer.add(" " + origLines.get(line));
+								origTotal++;
+								revTotal++;
+						}
+						buffer.addAll(getDeltaText(nextDelta)); // output the Delta
+						origTotal += nextDelta.getSource().getLines().size();
+						revTotal += nextDelta.getTarget().getLines().size();
+						curDelta = nextDelta;
+						deltaIndex++;
+				}
+
+				// Now output the post-Delta context code, clamping the end of the file
+				contextStart = curDelta.getSource().getPosition()
+								+ curDelta.getSource().getLines().size();
+				for (line = contextStart; (line < (contextStart + contextSize)) && (line < origLines.size()); line++) {
+						buffer.add(" " + origLines.get(line));
+						origTotal++;
+						revTotal++;
+				}
+
+				// Create and insert the block header, conforming to the Unified Diff
+				// standard
+				StringBuilder header = new StringBuilder();
+				header.append("@@ -");
+				header.append(origStart);
+				header.append(",");
+				header.append(origTotal);
+				header.append(" +");
+				header.append(revStart);
+				header.append(",");
+				header.append(revTotal);
+				header.append(" @@");
+				buffer.add(0, header.toString());
+
+				return buffer;
+		}
+
+		/**
+		 * getDeltaText returns the lines to be added to the Unified Diff text from the Delta parameter.  Author: Bill James (tankerbay@gmail.com).
+		 *
+		 * @param delta - the Delta to output
+		 * @return list of String lines of code.
+		 */
+		private static List getDeltaText(AbstractDelta delta) {
+				List buffer = new ArrayList<>();
+				for (String line : delta.getSource().getLines()) {
+						buffer.add("-" + line);
+				}
+				for (String line : delta.getTarget().getLines()) {
+						buffer.add("+" + line);
+				}
+				return buffer;
+		}
+
+		private UnifiedDiffUtils() {}
+
+		/**
+		 * Compare the differences between two files and return to the original file and diff format
+		 *
+		 * (This method compares the original file with the comparison file to obtain a diff, and inserts the diff into the corresponding position of the original file.
+		 * You can see all the differences and unmodified places from the original file.
+		 * Also, this will be very easy and useful for making side-by-side comparison display applications,
+		 * for example, if you use diff2html (https://github.com/rtfpessoa/diff2html#usage)
+		 * Wait for tools to display your differences on html pages, you only need to insert the return value into your js code)
+		 *
+		 * @param original Original file content
+		 * @param revised  revised file content
+		 *
+		 */
+		public static List generateOriginalAndDiff(List original, List revised) {
+				return generateOriginalAndDiff(original, revised, null, null);
+		}
+
+		/**
+		 * Compare the differences between two files and return to the original file and diff format
+		 *
+		 * (This method compares the original file with the comparison file to obtain a diff, and inserts the diff into the corresponding position of the original file.
+		 * You can see all the differences and unmodified places from the original file.
+		 * Also, this will be very easy and useful for making side-by-side comparison display applications,
+		 * for example, if you use diff2html (https://github.com/rtfpessoa/diff2html#usage)
+		 * Wait for tools to display your differences on html pages, you only need to insert the return value into your js code)
+		 *
+		 * @param original         Original file content
+		 * @param revised          revised file content
+		 * @param originalFileName Original file name
+		 * @param revisedFileName  revised file name
+		 */
+		public static List generateOriginalAndDiff(
+						List original, List revised, String originalFileName, String revisedFileName) {
+				String originalFileNameTemp = originalFileName;
+				String revisedFileNameTemp = revisedFileName;
+				if (originalFileNameTemp == null) {
+						originalFileNameTemp = "original";
+				}
+				if (revisedFileNameTemp == null) {
+						revisedFileNameTemp = "revised";
+				}
+				Patch patch = DiffUtils.diff(original, revised);
+				List unifiedDiff = generateUnifiedDiff(originalFileNameTemp, revisedFileNameTemp, original, patch, 0);
+				if (unifiedDiff.isEmpty()) {
+						unifiedDiff.add("--- " + originalFileNameTemp);
+						unifiedDiff.add("+++ " + revisedFileNameTemp);
+						unifiedDiff.add("@@ -0,0 +0,0 @@");
+				} else if (unifiedDiff.size() >= 3 && !unifiedDiff.get(2).contains("@@ -1,")) {
+						unifiedDiff.set(1, unifiedDiff.get(1));
+						unifiedDiff.add(2, "@@ -0,0 +0,0 @@");
+				}
+				List originalWithPrefix = original.stream().map(v -> " " + v).collect(Collectors.toList());
+				return insertOrig(originalWithPrefix, unifiedDiff);
+		}
+
+		// Insert the diff format to the original file
+		private static List insertOrig(List original, List unifiedDiff) {
+				List result = new ArrayList<>();
+				List> diffList = new ArrayList<>();
+				List diff = new ArrayList<>();
+				for (int i = 0; i < unifiedDiff.size(); i++) {
+						String u = unifiedDiff.get(i);
+						if (u.startsWith("@@") && !"@@ -0,0 +0,0 @@".equals(u) && !u.contains("@@ -1,")) {
+								List twoList = new ArrayList<>();
+								twoList.addAll(diff);
+								diffList.add(twoList);
+								diff.clear();
+								diff.add(u);
+								continue;
+						}
+						if (i == unifiedDiff.size() - 1) {
+								diff.add(u);
+								List twoList = new ArrayList<>();
+								twoList.addAll(diff);
+								diffList.add(twoList);
+								diff.clear();
+								break;
+						}
+						diff.add(u);
+				}
+				insertOrig(diffList, result, original);
+				return result;
+		}
+
+		// Insert the diff format to the original file
+		private static void insertOrig(List> diffList, List result, List original) {
+				for (int i = 0; i < diffList.size(); i++) {
+						List diff = diffList.get(i);
+						List nexDiff = i == diffList.size() - 1 ? null : diffList.get(i + 1);
+						String simb = i == 0 ? diff.get(2) : diff.get(0);
+						String nexSimb = nexDiff == null ? null : nexDiff.get(0);
+						insert(result, diff);
+						Map map = getRowMap(simb);
+						if (null != nexSimb) {
+								Map nexMap = getRowMap(nexSimb);
+								int start = 0;
+								if (map.get("orgRow") != 0) {
+										start = map.get("orgRow") + map.get("orgDel") - 1;
+								}
+								int end = nexMap.get("revRow") - 2;
+								insert(result, getOrigList(original, start, end));
+						}
+						int start = map.get("orgRow") + map.get("orgDel") - 1;
+						start = start == -1 ? 0 : start;
+						if (simb.contains("@@ -1,") && null == nexSimb && map.get("orgDel") != original.size()) {
+								insert(result, getOrigList(original, start, original.size() - 1));
+						} else if (null == nexSimb && (map.get("orgRow") + map.get("orgDel") - 1) < original.size()) {
+								insert(result, getOrigList(original, start, original.size() - 1));
+						}
+				}
+		}
+
+		// Insert the unchanged content in the source file into result
+		private static void insert(List result, List noChangeContent) {
+				for (String ins : noChangeContent) {
+						result.add(ins);
+				}
+		}
+
+		// Parse the line containing @@ to get the modified line number to delete or add a few lines
+		private static Map getRowMap(String str) {
+				Map map = new HashMap<>();
+				if (str.startsWith("@@")) {
+						String[] sp = str.split(" ");
+						String org = sp[1];
+						String[] orgSp = org.split(",");
+						map.put("orgRow", Integer.valueOf(orgSp[0].substring(1)));
+						map.put("orgDel", Integer.valueOf(orgSp[1]));
+						String[] revSp = org.split(",");
+						map.put("revRow", Integer.valueOf(revSp[0].substring(1)));
+						map.put("revAdd", Integer.valueOf(revSp[1]));
+				}
+				return map;
+		}
+
+		// Get the specified part of the line from the original file
+		private static List getOrigList(List originalWithPrefix, int start, int end) {
+				List list = new ArrayList<>();
+				if (originalWithPrefix.size() >= 1 && start <= end && end < originalWithPrefix.size()) {
+						int startTemp = start;
+						for (; startTemp <= end; startTemp++) {
+								list.add(originalWithPrefix.get(startTemp));
+						}
+				}
+				return list;
+		}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/Change.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/Change.java
index 9b6f1dfe..7c2fae8c 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/Change.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/Change.java
@@ -23,25 +23,25 @@
  */
 public class Change {
 
-    public final DeltaType deltaType;
-    public final int startOriginal;
-    public final int endOriginal;
-    public final int startRevised;
-    public final int endRevised;
+		public final DeltaType deltaType;
+		public final int startOriginal;
+		public final int endOriginal;
+		public final int startRevised;
+		public final int endRevised;
 
-    public Change(DeltaType deltaType, int startOriginal, int endOriginal, int startRevised, int endRevised) {
-        this.deltaType = deltaType;
-        this.startOriginal = startOriginal;
-        this.endOriginal = endOriginal;
-        this.startRevised = startRevised;
-        this.endRevised = endRevised;
-    }
-    
-    public Change withEndOriginal(int endOriginal) {
-        return new Change(deltaType, startOriginal, endOriginal, startRevised, endRevised);
-    }
-    
-    public Change withEndRevised(int endRevised) {
-        return new Change(deltaType, startOriginal, endOriginal, startRevised, endRevised);
-    }
+		public Change(DeltaType deltaType, int startOriginal, int endOriginal, int startRevised, int endRevised) {
+				this.deltaType = deltaType;
+				this.startOriginal = startOriginal;
+				this.endOriginal = endOriginal;
+				this.startRevised = startRevised;
+				this.endRevised = endRevised;
+		}
+
+		public Change withEndOriginal(int endOriginal) {
+				return new Change(deltaType, startOriginal, endOriginal, startRevised, endRevised);
+		}
+
+		public Change withEndRevised(int endRevised) {
+				return new Change(deltaType, startOriginal, endOriginal, startRevised, endRevised);
+		}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmFactory.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmFactory.java
index 7e5205cd..307ee7e3 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmFactory.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmFactory.java
@@ -18,12 +18,12 @@
 import java.util.function.BiPredicate;
 
 /**
- * Tool to create new instances of a diff algorithm. This one is only needed at the moment to 
+ * Tool to create new instances of a diff algorithm. This one is only needed at the moment to
  * set DiffUtils default diff algorithm.
  * @author tw
  */
 public interface DiffAlgorithmFactory {
-     DiffAlgorithmI create();
-    
-     DiffAlgorithmI create(BiPredicate equalizer);
+		 DiffAlgorithmI create();
+
+		 DiffAlgorithmI create(BiPredicate equalizer);
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmI.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmI.java
index 117656e4..a12b499a 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmI.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmI.java
@@ -26,25 +26,25 @@
  */
 public interface DiffAlgorithmI {
 
-    /**
-     * Computes the changeset to patch the source list to the target list.
-     *
-     * @param source source data
-     * @param target target data
-     * @param progress progress listener
-     * @return
-     */
-    List computeDiff(List source, List target, DiffAlgorithmListener progress);
+		/**
+		 * Computes the changeset to patch the source list to the target list.
+		 *
+		 * @param source source data
+		 * @param target target data
+		 * @param progress progress listener
+		 * @return
+		 */
+		List computeDiff(List source, List target, DiffAlgorithmListener progress);
 
-    /**
-     * Simple extension to compute a changeset using arrays.
-     *
-     * @param source
-     * @param target
-     * @param progress
-     * @return
-     */
-    default List computeDiff(T[] source, T[] target, DiffAlgorithmListener progress) {
-        return computeDiff(Arrays.asList(source), Arrays.asList(target), progress);
-    }
+		/**
+		 * Simple extension to compute a changeset using arrays.
+		 *
+		 * @param source
+		 * @param target
+		 * @param progress
+		 * @return
+		 */
+		default List computeDiff(T[] source, T[] target, DiffAlgorithmListener progress) {
+				return computeDiff(Arrays.asList(source), Arrays.asList(target), progress);
+		}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmListener.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmListener.java
index a141d7be..21d864f5 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmListener.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmListener.java
@@ -20,15 +20,16 @@
  * @author Tobias Warneke (t.warneke@gmx.net)
  */
 public interface DiffAlgorithmListener {
-    void diffStart();
-    
-    /**
-     * This is a step within the diff algorithm. Due to different implementations the value
-     * is not strict incrementing to the max and is not guarantee to reach the max. It could
-     * stop before.
-     * @param value
-     * @param max 
-     */
-    void diffStep(int value, int max);
-    void diffEnd();
+		void diffStart();
+
+		/**
+		 * This is a step within the diff algorithm. Due to different implementations the value
+		 * is not strict incrementing to the max and is not guarantee to reach the max. It could
+		 * stop before.
+		 * @param value
+		 * @param max
+		 */
+		void diffStep(int value, int max);
+
+		void diffEnd();
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java
index 2517de46..5233e02b 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java
@@ -31,170 +31,168 @@
  */
 public final class MyersDiff implements DiffAlgorithmI {
 
-    private final BiPredicate equalizer;
-
-    public MyersDiff() {
-        equalizer = Object::equals;
-    }
-
-    public MyersDiff(final BiPredicate equalizer) {
-        Objects.requireNonNull(equalizer, "equalizer must not be null");
-        this.equalizer = equalizer;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * Return empty diff if get the error while procession the difference.
-     */
-    @Override
-    public List computeDiff(final List source, final List target, DiffAlgorithmListener progress) {
-        Objects.requireNonNull(source, "source list must not be null");
-        Objects.requireNonNull(target, "target list must not be null");
-
-        if (progress != null) {
-            progress.diffStart();
-        }
-        PathNode path = buildPath(source, target, progress);
-        List result = buildRevision(path, source, target);
-        if (progress != null) {
-            progress.diffEnd();
-        }
-        return result;
-    }
-
-    /**
-     * Computes the minimum diffpath that expresses de differences between the
-     * original and revised sequences, according to Gene Myers differencing
-     * algorithm.
-     *
-     * @param orig The original sequence.
-     * @param rev The revised sequence.
-     * @return A minimum {@link PathNode Path} accross the differences graph.
-     * @throws DifferentiationFailedException if a diff path could not be found.
-     */
-    private PathNode buildPath(final List orig, final List rev, DiffAlgorithmListener progress) {
-        Objects.requireNonNull(orig, "original sequence is null");
-        Objects.requireNonNull(rev, "revised sequence is null");
-
-        // these are local constants
-        final int N = orig.size();
-        final int M = rev.size();
-
-        final int MAX = N + M + 1;
-        final int size = 1 + 2 * MAX;
-        final int middle = size / 2;
-        final PathNode diagonal[] = new PathNode[size];
-
-        diagonal[middle + 1] = new PathNode(0, -1, true, true, null);
-        for (int d = 0; d < MAX; d++) {
-            if (progress != null) {
-                progress.diffStep(d, MAX);
-            }
-            for (int k = -d; k <= d; k += 2) {
-                final int kmiddle = middle + k;
-                final int kplus = kmiddle + 1;
-                final int kminus = kmiddle - 1;
-                PathNode prev;
-                int i;
-
-                if ((k == -d) || (k != d && diagonal[kminus].i < diagonal[kplus].i)) {
-                    i = diagonal[kplus].i;
-                    prev = diagonal[kplus];
-                } else {
-                    i = diagonal[kminus].i + 1;
-                    prev = diagonal[kminus];
-                }
-
-                diagonal[kminus] = null; // no longer used
-
-                int j = i - k;
-
-                PathNode node = new PathNode(i, j, false, false, prev);
-
-                while (i < N && j < M && equalizer.test(orig.get(i), rev.get(j))) {
-                    i++;
-                    j++;
-                }
-
-                if (i != node.i) {
-                    node = new PathNode(i, j, true, false, node);
-                }
-
-                diagonal[kmiddle] = node;
-
-                if (i >= N && j >= M) {
-                    return diagonal[kmiddle];
-                }
-            }
-            diagonal[middle + d - 1] = null;
-        }
-        // According to Myers, this cannot happen
-        throw new IllegalStateException("could not find a diff path");
-    }
-
-    /**
-     * Constructs a {@link Patch} from a difference path.
-     *
-     * @param actualPath The path.
-     * @param orig The original sequence.
-     * @param rev The revised sequence.
-     * @return A {@link Patch} script corresponding to the path.
-     * @throws DifferentiationFailedException if a {@link Patch} could not be
-     * built from the given path.
-     */
-    private List buildRevision(PathNode actualPath, List orig, List rev) {
-        Objects.requireNonNull(actualPath, "path is null");
-        Objects.requireNonNull(orig, "original sequence is null");
-        Objects.requireNonNull(rev, "revised sequence is null");
-
-        PathNode path = actualPath;
-        List changes = new ArrayList<>();
-        if (path.isSnake()) {
-            path = path.prev;
-        }
-        while (path != null && path.prev != null && path.prev.j >= 0) {
-            if (path.isSnake()) {
-                throw new IllegalStateException("bad diffpath: found snake when looking for diff");
-            }
-            int i = path.i;
-            int j = path.j;
-
-            path = path.prev;
-            int ianchor = path.i;
-            int janchor = path.j;
-
-            if (ianchor == i && janchor != j) {
-                changes.add(new Change(DeltaType.INSERT, ianchor, i, janchor, j));
-            } else if (ianchor != i && janchor == j) {
-                changes.add(new Change(DeltaType.DELETE, ianchor, i, janchor, j));
-            } else {
-                changes.add(new Change(DeltaType.CHANGE, ianchor, i, janchor, j));
-            }
-
-            if (path.isSnake()) {
-                path = path.prev;
-            }
-        }
-        return changes;
-    }
-
-    /**
-     * Factory to create instances of this specific diff algorithm.
-     */
-    public static DiffAlgorithmFactory factory() {
-        return new DiffAlgorithmFactory() {
-            @Override
-            public  DiffAlgorithmI 
-            create() {
-                return new MyersDiff<>();
-            }
-
-            @Override
-            public  DiffAlgorithmI 
-            create(BiPredicate < T, T > equalizer) {
-                return new MyersDiff<>(equalizer);
-            }
-        };
-    }
+		private final BiPredicate equalizer;
+
+		public MyersDiff() {
+				equalizer = Object::equals;
+		}
+
+		public MyersDiff(final BiPredicate equalizer) {
+				Objects.requireNonNull(equalizer, "equalizer must not be null");
+				this.equalizer = equalizer;
+		}
+
+		/**
+		 * {@inheritDoc}
+		 *
+		 * Return empty diff if get the error while procession the difference.
+		 */
+		@Override
+		public List computeDiff(final List source, final List target, DiffAlgorithmListener progress) {
+				Objects.requireNonNull(source, "source list must not be null");
+				Objects.requireNonNull(target, "target list must not be null");
+
+				if (progress != null) {
+						progress.diffStart();
+				}
+				PathNode path = buildPath(source, target, progress);
+				List result = buildRevision(path, source, target);
+				if (progress != null) {
+						progress.diffEnd();
+				}
+				return result;
+		}
+
+		/**
+		 * Computes the minimum diffpath that expresses de differences between the
+		 * original and revised sequences, according to Gene Myers differencing
+		 * algorithm.
+		 *
+		 * @param orig The original sequence.
+		 * @param rev The revised sequence.
+		 * @return A minimum {@link PathNode Path} accross the differences graph.
+		 * @throws DifferentiationFailedException if a diff path could not be found.
+		 */
+		private PathNode buildPath(final List orig, final List rev, DiffAlgorithmListener progress) {
+				Objects.requireNonNull(orig, "original sequence is null");
+				Objects.requireNonNull(rev, "revised sequence is null");
+
+				// these are local constants
+				final int N = orig.size();
+				final int M = rev.size();
+
+				final int MAX = N + M + 1;
+				final int size = 1 + 2 * MAX;
+				final int middle = size / 2;
+				final PathNode diagonal[] = new PathNode[size];
+
+				diagonal[middle + 1] = new PathNode(0, -1, true, true, null);
+				for (int d = 0; d < MAX; d++) {
+						if (progress != null) {
+								progress.diffStep(d, MAX);
+						}
+						for (int k = -d; k <= d; k += 2) {
+								final int kmiddle = middle + k;
+								final int kplus = kmiddle + 1;
+								final int kminus = kmiddle - 1;
+								PathNode prev;
+								int i;
+
+								if ((k == -d) || (k != d && diagonal[kminus].i < diagonal[kplus].i)) {
+										i = diagonal[kplus].i;
+										prev = diagonal[kplus];
+								} else {
+										i = diagonal[kminus].i + 1;
+										prev = diagonal[kminus];
+								}
+
+								diagonal[kminus] = null; // no longer used
+
+								int j = i - k;
+
+								PathNode node = new PathNode(i, j, false, false, prev);
+
+								while (i < N && j < M && equalizer.test(orig.get(i), rev.get(j))) {
+										i++;
+										j++;
+								}
+
+								if (i != node.i) {
+										node = new PathNode(i, j, true, false, node);
+								}
+
+								diagonal[kmiddle] = node;
+
+								if (i >= N && j >= M) {
+										return diagonal[kmiddle];
+								}
+						}
+						diagonal[middle + d - 1] = null;
+				}
+				// According to Myers, this cannot happen
+				throw new IllegalStateException("could not find a diff path");
+		}
+
+		/**
+		 * Constructs a {@link Patch} from a difference path.
+		 *
+		 * @param actualPath The path.
+		 * @param orig The original sequence.
+		 * @param rev The revised sequence.
+		 * @return A {@link Patch} script corresponding to the path.
+		 * @throws DifferentiationFailedException if a {@link Patch} could not be
+		 * built from the given path.
+		 */
+		private List buildRevision(PathNode actualPath, List orig, List rev) {
+				Objects.requireNonNull(actualPath, "path is null");
+				Objects.requireNonNull(orig, "original sequence is null");
+				Objects.requireNonNull(rev, "revised sequence is null");
+
+				PathNode path = actualPath;
+				List changes = new ArrayList<>();
+				if (path.isSnake()) {
+						path = path.prev;
+				}
+				while (path != null && path.prev != null && path.prev.j >= 0) {
+						if (path.isSnake()) {
+								throw new IllegalStateException("bad diffpath: found snake when looking for diff");
+						}
+						int i = path.i;
+						int j = path.j;
+
+						path = path.prev;
+						int ianchor = path.i;
+						int janchor = path.j;
+
+						if (ianchor == i && janchor != j) {
+								changes.add(new Change(DeltaType.INSERT, ianchor, i, janchor, j));
+						} else if (ianchor != i && janchor == j) {
+								changes.add(new Change(DeltaType.DELETE, ianchor, i, janchor, j));
+						} else {
+								changes.add(new Change(DeltaType.CHANGE, ianchor, i, janchor, j));
+						}
+
+						if (path.isSnake()) {
+								path = path.prev;
+						}
+				}
+				return changes;
+		}
+
+		/**
+		 * Factory to create instances of this specific diff algorithm.
+		 */
+		public static DiffAlgorithmFactory factory() {
+				return new DiffAlgorithmFactory() {
+						@Override
+						public  DiffAlgorithmI create() {
+								return new MyersDiff<>();
+						}
+
+						@Override
+						public  DiffAlgorithmI create(BiPredicate equalizer) {
+								return new MyersDiff<>(equalizer);
+						}
+				};
+		}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiffWithLinearSpace.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiffWithLinearSpace.java
index ca4114c4..f8c734ba 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiffWithLinearSpace.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiffWithLinearSpace.java
@@ -32,213 +32,214 @@
  */
 public class MyersDiffWithLinearSpace implements DiffAlgorithmI {
 
-    private final BiPredicate equalizer;
-
-    public MyersDiffWithLinearSpace() {
-        equalizer = Object::equals;
-    }
-
-    public MyersDiffWithLinearSpace(final BiPredicate equalizer) {
-        Objects.requireNonNull(equalizer, "equalizer must not be null");
-        this.equalizer = equalizer;
-    }
-
-    @Override
-    public List computeDiff(List source, List target, DiffAlgorithmListener progress) {
-        Objects.requireNonNull(source, "source list must not be null");
-        Objects.requireNonNull(target, "target list must not be null");
-
-        if (progress != null) {
-            progress.diffStart();
-        }
-
-        DiffData data = new DiffData(source, target);
-
-        int maxIdx = source.size() + target.size();
-
-        buildScript(data, 0, source.size(), 0, target.size(), idx -> {
-            if (progress != null) {
-                progress.diffStep(idx, maxIdx);
-            }
-        });
-
-        if (progress != null) {
-            progress.diffEnd();
-        }
-        return data.script;
-    }
-
-    private void buildScript(DiffData data, int start1, int end1, int start2, int end2, Consumer progress) {
-        if (progress != null) {
-            progress.accept((end1 - start1) / 2 + (end2 - start2) / 2);
-        }
-        final Snake middle = getMiddleSnake(data, start1, end1, start2, end2);
-        if (middle == null
-                || middle.start == end1 && middle.diag == end1 - end2
-                || middle.end == start1 && middle.diag == start1 - start2) {
-            int i = start1;
-            int j = start2;
-            while (i < end1 || j < end2) {
-                if (i < end1 && j < end2 && equalizer.test(data.source.get(i), data.target.get(j))) {
-                    //script.append(new KeepCommand<>(left.charAt(i)));
-                    ++i;
-                    ++j;
-                } else {
-                    //TODO: compress these commands.
-                    if (end1 - start1 > end2 - start2) {
-                        //script.append(new DeleteCommand<>(left.charAt(i)));
-                        if (data.script.isEmpty()
-                                || data.script.get(data.script.size() - 1).endOriginal != i
-                                || data.script.get(data.script.size() - 1).deltaType != DeltaType.DELETE) {
-                            data.script.add(new Change(DeltaType.DELETE, i, i + 1, j, j));
-                        } else {
-                            data.script.set(data.script.size() - 1, data.script.get(data.script.size() - 1).withEndOriginal(i + 1));
-                        }
-                        ++i;
-                    } else {
-                        if (data.script.isEmpty()
-                                || data.script.get(data.script.size() - 1).endRevised != j
-                                || data.script.get(data.script.size() - 1).deltaType != DeltaType.INSERT) {
-                            data.script.add(new Change(DeltaType.INSERT, i, i, j, j + 1));
-                        } else {
-                            data.script.set(data.script.size() - 1, data.script.get(data.script.size() - 1).withEndRevised(j + 1));
-                        }
-                        ++j;
-                    }
-                }
-            }
-        } else {
-            buildScript(data, start1, middle.start, start2, middle.start - middle.diag, progress);
-            buildScript(data, middle.end, end1, middle.end - middle.diag, end2, progress);
-        }
-    }
-
-    private Snake getMiddleSnake(DiffData data, int start1, int end1, int start2, int end2) {
-        final int m = end1 - start1;
-        final int n = end2 - start2;
-        if (m == 0 || n == 0) {
-            return null;
-        }
-
-        final int delta = m - n;
-        final int sum = n + m;
-        final int offset = (sum % 2 == 0 ? sum : sum + 1) / 2;
-        data.vDown[1 + offset] = start1;
-        data.vUp[1 + offset] = end1 + 1;
-
-        for (int d = 0; d <= offset; ++d) {
-            // Down
-            for (int k = -d; k <= d; k += 2) {
-                // First step
-
-                final int i = k + offset;
-                if (k == -d || k != d && data.vDown[i - 1] < data.vDown[i + 1]) {
-                    data.vDown[i] = data.vDown[i + 1];
-                } else {
-                    data.vDown[i] = data.vDown[i - 1] + 1;
-                }
-
-                int x = data.vDown[i];
-                int y = x - start1 + start2 - k;
-
-                while (x < end1 && y < end2 && equalizer.test(data.source.get(x), data.target.get(y))) {
-                    data.vDown[i] = ++x;
-                    ++y;
-                }
-                // Second step
-                if (delta % 2 != 0 && delta - d <= k && k <= delta + d) {
-                    if (data.vUp[i - delta] <= data.vDown[i]) {
-                        return buildSnake(data, data.vUp[i - delta], k + start1 - start2, end1, end2);
-                    }
-                }
-            }
-
-            // Up
-            for (int k = delta - d; k <= delta + d; k += 2) {
-                // First step
-                final int i = k + offset - delta;
-                if (k == delta - d
-                        || k != delta + d && data.vUp[i + 1] <= data.vUp[i - 1]) {
-                    data.vUp[i] = data.vUp[i + 1] - 1;
-                } else {
-                    data.vUp[i] = data.vUp[i - 1];
-                }
-
-                int x = data.vUp[i] - 1;
-                int y = x - start1 + start2 - k;
-                while (x >= start1 && y >= start2 && equalizer.test(data.source.get(x), data.target.get(y))) {
-                    data.vUp[i] = x--;
-                    y--;
-                }
-                // Second step
-                if (delta % 2 == 0 && -d <= k && k <= d) {
-                    if (data.vUp[i] <= data.vDown[i + delta]) {
-                        return buildSnake(data, data.vUp[i], k + start1 - start2, end1, end2);
-                    }
-                }
-            }
-        }
-
-        // According to Myers, this cannot happen
-        throw new IllegalStateException("could not find a diff path");
-    }
-
-    private Snake buildSnake(DiffData data, final int start, final int diag, final int end1, final int end2) {
-        int end = start;
-        while (end - diag < end2 && end < end1 && equalizer.test(data.source.get(end), data.target.get(end - diag))) {
-            ++end;
-        }
-        return new Snake(start, end, diag);
-    }
-
-    private class DiffData {
-
-        final int size;
-        final int[] vDown;
-        final int[] vUp;
-        final List script;
-        final List source;
-        final List target;
-
-        public DiffData(List source, List target) {
-            this.source = source;
-            this.target = target;
-            size = source.size() + target.size() + 2;
-            vDown = new int[size];
-            vUp = new int[size];
-            script = new ArrayList<>();
-        }
-    }
-
-    private class Snake {
-
-        final int start;
-        final int end;
-        final int diag;
-
-        public Snake(final int start, final int end, final int diag) {
-            this.start = start;
-            this.end = end;
-            this.diag = diag;
-        }
-    }
-    
-    /**
-     * Factory to create instances of this specific diff algorithm.
-     */
-    public static DiffAlgorithmFactory factory() {
-        return new DiffAlgorithmFactory() {
-            @Override
-            public  DiffAlgorithmI 
-            create() {
-                return new MyersDiffWithLinearSpace<>();
-            }
-
-            @Override
-            public  DiffAlgorithmI 
-            create(BiPredicate < T, T > equalizer) {
-                return new MyersDiffWithLinearSpace<>(equalizer);
-            }
-        };
-    }
+		private final BiPredicate equalizer;
+
+		public MyersDiffWithLinearSpace() {
+				equalizer = Object::equals;
+		}
+
+		public MyersDiffWithLinearSpace(final BiPredicate equalizer) {
+				Objects.requireNonNull(equalizer, "equalizer must not be null");
+				this.equalizer = equalizer;
+		}
+
+		@Override
+		public List computeDiff(List source, List target, DiffAlgorithmListener progress) {
+				Objects.requireNonNull(source, "source list must not be null");
+				Objects.requireNonNull(target, "target list must not be null");
+
+				if (progress != null) {
+						progress.diffStart();
+				}
+
+				DiffData data = new DiffData(source, target);
+
+				int maxIdx = source.size() + target.size();
+
+				buildScript(data, 0, source.size(), 0, target.size(), idx -> {
+						if (progress != null) {
+								progress.diffStep(idx, maxIdx);
+						}
+				});
+
+				if (progress != null) {
+						progress.diffEnd();
+				}
+				return data.script;
+		}
+
+		private void buildScript(DiffData data, int start1, int end1, int start2, int end2, Consumer progress) {
+				if (progress != null) {
+						progress.accept((end1 - start1) / 2 + (end2 - start2) / 2);
+				}
+				final Snake middle = getMiddleSnake(data, start1, end1, start2, end2);
+				if (middle == null
+								|| middle.start == end1 && middle.diag == end1 - end2
+								|| middle.end == start1 && middle.diag == start1 - start2) {
+						int i = start1;
+						int j = start2;
+						while (i < end1 || j < end2) {
+								if (i < end1 && j < end2 && equalizer.test(data.source.get(i), data.target.get(j))) {
+										// script.append(new KeepCommand<>(left.charAt(i)));
+										++i;
+										++j;
+								} else {
+										// TODO: compress these commands.
+										if (end1 - start1 > end2 - start2) {
+												// script.append(new DeleteCommand<>(left.charAt(i)));
+												if (data.script.isEmpty()
+																|| data.script.get(data.script.size() - 1).endOriginal != i
+																|| data.script.get(data.script.size() - 1).deltaType != DeltaType.DELETE) {
+														data.script.add(new Change(DeltaType.DELETE, i, i + 1, j, j));
+												} else {
+														data.script.set(
+																		data.script.size() - 1,
+																		data.script.get(data.script.size() - 1).withEndOriginal(i + 1));
+												}
+												++i;
+										} else {
+												if (data.script.isEmpty()
+																|| data.script.get(data.script.size() - 1).endRevised != j
+																|| data.script.get(data.script.size() - 1).deltaType != DeltaType.INSERT) {
+														data.script.add(new Change(DeltaType.INSERT, i, i, j, j + 1));
+												} else {
+														data.script.set(
+																		data.script.size() - 1,
+																		data.script.get(data.script.size() - 1).withEndRevised(j + 1));
+												}
+												++j;
+										}
+								}
+						}
+				} else {
+						buildScript(data, start1, middle.start, start2, middle.start - middle.diag, progress);
+						buildScript(data, middle.end, end1, middle.end - middle.diag, end2, progress);
+				}
+		}
+
+		private Snake getMiddleSnake(DiffData data, int start1, int end1, int start2, int end2) {
+				final int m = end1 - start1;
+				final int n = end2 - start2;
+				if (m == 0 || n == 0) {
+						return null;
+				}
+
+				final int delta = m - n;
+				final int sum = n + m;
+				final int offset = (sum % 2 == 0 ? sum : sum + 1) / 2;
+				data.vDown[1 + offset] = start1;
+				data.vUp[1 + offset] = end1 + 1;
+
+				for (int d = 0; d <= offset; ++d) {
+						// Down
+						for (int k = -d; k <= d; k += 2) {
+								// First step
+
+								final int i = k + offset;
+								if (k == -d || k != d && data.vDown[i - 1] < data.vDown[i + 1]) {
+										data.vDown[i] = data.vDown[i + 1];
+								} else {
+										data.vDown[i] = data.vDown[i - 1] + 1;
+								}
+
+								int x = data.vDown[i];
+								int y = x - start1 + start2 - k;
+
+								while (x < end1 && y < end2 && equalizer.test(data.source.get(x), data.target.get(y))) {
+										data.vDown[i] = ++x;
+										++y;
+								}
+								// Second step
+								if (delta % 2 != 0 && delta - d <= k && k <= delta + d) {
+										if (data.vUp[i - delta] <= data.vDown[i]) {
+												return buildSnake(data, data.vUp[i - delta], k + start1 - start2, end1, end2);
+										}
+								}
+						}
+
+						// Up
+						for (int k = delta - d; k <= delta + d; k += 2) {
+								// First step
+								final int i = k + offset - delta;
+								if (k == delta - d || k != delta + d && data.vUp[i + 1] <= data.vUp[i - 1]) {
+										data.vUp[i] = data.vUp[i + 1] - 1;
+								} else {
+										data.vUp[i] = data.vUp[i - 1];
+								}
+
+								int x = data.vUp[i] - 1;
+								int y = x - start1 + start2 - k;
+								while (x >= start1 && y >= start2 && equalizer.test(data.source.get(x), data.target.get(y))) {
+										data.vUp[i] = x--;
+										y--;
+								}
+								// Second step
+								if (delta % 2 == 0 && -d <= k && k <= d) {
+										if (data.vUp[i] <= data.vDown[i + delta]) {
+												return buildSnake(data, data.vUp[i], k + start1 - start2, end1, end2);
+										}
+								}
+						}
+				}
+
+				// According to Myers, this cannot happen
+				throw new IllegalStateException("could not find a diff path");
+		}
+
+		private Snake buildSnake(DiffData data, final int start, final int diag, final int end1, final int end2) {
+				int end = start;
+				while (end - diag < end2 && end < end1 && equalizer.test(data.source.get(end), data.target.get(end - diag))) {
+						++end;
+				}
+				return new Snake(start, end, diag);
+		}
+
+		private class DiffData {
+
+				final int size;
+				final int[] vDown;
+				final int[] vUp;
+				final List script;
+				final List source;
+				final List target;
+
+				public DiffData(List source, List target) {
+						this.source = source;
+						this.target = target;
+						size = source.size() + target.size() + 2;
+						vDown = new int[size];
+						vUp = new int[size];
+						script = new ArrayList<>();
+				}
+		}
+
+		private class Snake {
+
+				final int start;
+				final int end;
+				final int diag;
+
+				public Snake(final int start, final int end, final int diag) {
+						this.start = start;
+						this.end = end;
+						this.diag = diag;
+				}
+		}
+
+		/**
+		 * Factory to create instances of this specific diff algorithm.
+		 */
+		public static DiffAlgorithmFactory factory() {
+				return new DiffAlgorithmFactory() {
+						@Override
+						public  DiffAlgorithmI create() {
+								return new MyersDiffWithLinearSpace<>();
+						}
+
+						@Override
+						public  DiffAlgorithmI create(BiPredicate equalizer) {
+								return new MyersDiffWithLinearSpace<>(equalizer);
+						}
+				};
+		}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/PathNode.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/PathNode.java
index fe8fd03a..5504e817 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/PathNode.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/PathNode.java
@@ -22,89 +22,89 @@
  */
 public final class PathNode {
 
-    /**
-     * Position in the original sequence.
-     */
-    public final int i;
-    /**
-     * Position in the revised sequence.
-     */
-    public final int j;
-    /**
-     * The previous node in the path.
-     */
-    public final PathNode prev;
+		/**
+		 * Position in the original sequence.
+		 */
+		public final int i;
+		/**
+		 * Position in the revised sequence.
+		 */
+		public final int j;
+		/**
+		 * The previous node in the path.
+		 */
+		public final PathNode prev;
 
-    public final boolean snake;
+		public final boolean snake;
 
-    public final boolean bootstrap;
+		public final boolean bootstrap;
 
-    /**
-     * Concatenates a new path node with an existing diffpath.
-     *
-     * @param i The position in the original sequence for the new node.
-     * @param j The position in the revised sequence for the new node.
-     * @param prev The previous node in the path.
-     */
-    public PathNode(int i, int j, boolean snake, boolean bootstrap, PathNode prev) {
-        this.i = i;
-        this.j = j;
-        this.bootstrap = bootstrap;
-        if (snake) {
-            this.prev = prev;
-        } else {
-            this.prev = prev == null ? null : prev.previousSnake();
-        }
-        this.snake = snake;
-    }
+		/**
+		 * Concatenates a new path node with an existing diffpath.
+		 *
+		 * @param i The position in the original sequence for the new node.
+		 * @param j The position in the revised sequence for the new node.
+		 * @param prev The previous node in the path.
+		 */
+		public PathNode(int i, int j, boolean snake, boolean bootstrap, PathNode prev) {
+				this.i = i;
+				this.j = j;
+				this.bootstrap = bootstrap;
+				if (snake) {
+						this.prev = prev;
+				} else {
+						this.prev = prev == null ? null : prev.previousSnake();
+				}
+				this.snake = snake;
+		}
 
-    public boolean isSnake() {
-        return snake;
-    }
+		public boolean isSnake() {
+				return snake;
+		}
 
-    /**
-     * Is this a bootstrap node?
-     * 

-     * In bottstrap nodes one of the two corrdinates is less than zero.
-     *
-     * @return tru if this is a bootstrap node.
-     */
-    public boolean isBootstrap() {
-        return bootstrap;
-    }
+		/**
+		 * Is this a bootstrap node?
+		 * 

+		 * In bottstrap nodes one of the two corrdinates is less than zero.
+		 *
+		 * @return tru if this is a bootstrap node.
+		 */
+		public boolean isBootstrap() {
+				return bootstrap;
+		}
 
-    /**
-     * Skips sequences of {@link PathNode PathNodes} until a snake or bootstrap node is found, or the end of the
-     * path is reached.
-     *
-     * @return The next first {@link PathNode} or bootstrap node in the path, or null if none found.
-     */
-    public final PathNode previousSnake() {
-        if (isBootstrap()) {
-            return null;
-        }
-        if (!isSnake() && prev != null) {
-            return prev.previousSnake();
-        }
-        return this;
-    }
+		/**
+		 * Skips sequences of {@link PathNode PathNodes} until a snake or bootstrap node is found, or the end of the
+		 * path is reached.
+		 *
+		 * @return The next first {@link PathNode} or bootstrap node in the path, or null if none found.
+		 */
+		public final PathNode previousSnake() {
+				if (isBootstrap()) {
+						return null;
+				}
+				if (!isSnake() && prev != null) {
+						return prev.previousSnake();
+				}
+				return this;
+		}
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String toString() {
-        StringBuilder buf = new StringBuilder("[");
-        PathNode node = this;
-        while (node != null) {
-            buf.append("(");
-            buf.append(node.i);
-            buf.append(",");
-            buf.append(node.j);
-            buf.append(")");
-            node = node.prev;
-        }
-        buf.append("]");
-        return buf.toString();
-    }
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public String toString() {
+				StringBuilder buf = new StringBuilder("[");
+				PathNode node = this;
+				while (node != null) {
+						buf.append("(");
+						buf.append(node.i);
+						buf.append(",");
+						buf.append(node.j);
+						buf.append(")");
+						node = node.prev;
+				}
+				buf.append("]");
+				return buf.toString();
+		}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
index f74f62ca..acf231e1 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
@@ -20,97 +20,98 @@
 import java.util.Objects;
 
 /**
- * Abstract delta between a source and a target. 
+ * Abstract delta between a source and a target.
  * @author Tobias Warneke (t.warneke@gmx.net)
  */
 public abstract class AbstractDelta implements Serializable {
-    private final Chunk source;
-    private final Chunk target;
-    private final DeltaType type;
-    
-    public AbstractDelta(DeltaType type, Chunk source, Chunk target) {
-        Objects.requireNonNull(source);
-        Objects.requireNonNull(target);
-        Objects.requireNonNull(type);
-        this.type = type;
-        this.source = source;
-        this.target = target;
-    }
+		private final Chunk source;
+		private final Chunk target;
+		private final DeltaType type;
 
-    public Chunk getSource() {
-        return source;
-    }
+		public AbstractDelta(DeltaType type, Chunk source, Chunk target) {
+				Objects.requireNonNull(source);
+				Objects.requireNonNull(target);
+				Objects.requireNonNull(type);
+				this.type = type;
+				this.source = source;
+				this.target = target;
+		}
 
-    public Chunk getTarget() {
-        return target;
-    }
+		public Chunk getSource() {
+				return source;
+		}
 
-    public DeltaType getType() {
-        return type;
-    }
-    
-    /**
-     * Verify the chunk of this delta, to fit the target.
-     * @param target
-     * @throws PatchFailedException 
-     */
-    protected VerifyChunk verifyChunkToFitTarget(List target) throws PatchFailedException {
-        return getSource().verifyChunk(target);
-    }
-   
-    protected VerifyChunk verifyAndApplyTo(List target) throws PatchFailedException {
-        final VerifyChunk verify = verifyChunkToFitTarget(target);
-        if (verify == VerifyChunk.OK) {
-            applyTo(target);
-        }
-        return verify;
-    }
-    
-    protected abstract void applyTo(List target) throws PatchFailedException;
-    
-    protected abstract void restore(List target);
-    
-    /**
-     * Apply patch fuzzy.
-     *
-     * @param target the list this patch will be applied to
-     * @param fuzz the number of elements to ignore before/after the patched elements
-     * @param position the position this patch will be applied to. ignores {@code source.getPosition()}
-     * @see Description of Fuzzy Patch for more information.
-     */
-    @SuppressWarnings("RedundantThrows")
-    protected void applyFuzzyToAt(List target, int fuzz, int position) throws PatchFailedException {
-        throw new UnsupportedOperationException(this.getClass().getSimpleName() + " does not supports applying patch fuzzy");
-    }
+		public Chunk getTarget() {
+				return target;
+		}
 
-    /**
-     * Create a new delta of the actual instance with customized chunk data.
-     */
-    public abstract AbstractDelta withChunks(Chunk original, Chunk revised);
+		public DeltaType getType() {
+				return type;
+		}
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(this.source, this.target, this.type);
-    }
+		/**
+		 * Verify the chunk of this delta, to fit the target.
+		 * @param target
+		 * @throws PatchFailedException
+		 */
+		protected VerifyChunk verifyChunkToFitTarget(List target) throws PatchFailedException {
+				return getSource().verifyChunk(target);
+		}
 
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final AbstractDelta other = (AbstractDelta) obj;
-        if (!Objects.equals(this.source, other.source)) {
-            return false;
-        }
-        if (!Objects.equals(this.target, other.target)) {
-            return false;
-        }
-        return this.type == other.type;
-    }
+		protected VerifyChunk verifyAndApplyTo(List target) throws PatchFailedException {
+				final VerifyChunk verify = verifyChunkToFitTarget(target);
+				if (verify == VerifyChunk.OK) {
+						applyTo(target);
+				}
+				return verify;
+		}
+
+		protected abstract void applyTo(List target) throws PatchFailedException;
+
+		protected abstract void restore(List target);
+
+		/**
+		 * Apply patch fuzzy.
+		 *
+		 * @param target the list this patch will be applied to
+		 * @param fuzz the number of elements to ignore before/after the patched elements
+		 * @param position the position this patch will be applied to. ignores {@code source.getPosition()}
+		 * @see Description of Fuzzy Patch for more information.
+		 */
+		@SuppressWarnings("RedundantThrows")
+		protected void applyFuzzyToAt(List target, int fuzz, int position) throws PatchFailedException {
+				throw new UnsupportedOperationException(
+								this.getClass().getSimpleName() + " does not supports applying patch fuzzy");
+		}
+
+		/**
+		 * Create a new delta of the actual instance with customized chunk data.
+		 */
+		public abstract AbstractDelta withChunks(Chunk original, Chunk revised);
+
+		@Override
+		public int hashCode() {
+				return Objects.hash(this.source, this.target, this.type);
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+				if (this == obj) {
+						return true;
+				}
+				if (obj == null) {
+						return false;
+				}
+				if (getClass() != obj.getClass()) {
+						return false;
+				}
+				final AbstractDelta other = (AbstractDelta) obj;
+				if (!Objects.equals(this.source, other.source)) {
+						return false;
+				}
+				if (!Objects.equals(this.target, other.target)) {
+						return false;
+				}
+				return this.type == other.type;
+		}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java
index 376fd625..f82f13ac 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java
@@ -26,67 +26,67 @@
  */
 public final class ChangeDelta extends AbstractDelta {
 
-    /**
-     * Creates a change delta with the two given chunks.
-     *
-     * @param source The source chunk. Must not be {@code null}.
-     * @param target The target chunk. Must not be {@code null}.
-     */
-    public ChangeDelta(Chunk source, Chunk target) {
-        super(DeltaType.CHANGE, source, target);
-        Objects.requireNonNull(source, "source must not be null");
-        Objects.requireNonNull(target, "target must not be null");
-    }
+		/**
+		 * Creates a change delta with the two given chunks.
+		 *
+		 * @param source The source chunk. Must not be {@code null}.
+		 * @param target The target chunk. Must not be {@code null}.
+		 */
+		public ChangeDelta(Chunk source, Chunk target) {
+				super(DeltaType.CHANGE, source, target);
+				Objects.requireNonNull(source, "source must not be null");
+				Objects.requireNonNull(target, "target must not be null");
+		}
 
-    @Override
-    protected void applyTo(List target) throws PatchFailedException {
-        int position = getSource().getPosition();
-        int size = getSource().size();
-        for (int i = 0; i < size; i++) {
-            target.remove(position);
-        }
-        int i = 0;
-        for (T line : getTarget().getLines()) {
-            target.add(position + i, line);
-            i++;
-        }
-    }
+		@Override
+		protected void applyTo(List target) throws PatchFailedException {
+				int position = getSource().getPosition();
+				int size = getSource().size();
+				for (int i = 0; i < size; i++) {
+						target.remove(position);
+				}
+				int i = 0;
+				for (T line : getTarget().getLines()) {
+						target.add(position + i, line);
+						i++;
+				}
+		}
 
-    @Override
-    protected void restore(List target) {
-        int position = getTarget().getPosition();
-        int size = getTarget().size();
-        for (int i = 0; i < size; i++) {
-            target.remove(position);
-        }
-        int i = 0;
-        for (T line : getSource().getLines()) {
-            target.add(position + i, line);
-            i++;
-        }
-    }
+		@Override
+		protected void restore(List target) {
+				int position = getTarget().getPosition();
+				int size = getTarget().size();
+				for (int i = 0; i < size; i++) {
+						target.remove(position);
+				}
+				int i = 0;
+				for (T line : getSource().getLines()) {
+						target.add(position + i, line);
+						i++;
+				}
+		}
 
-    protected void applyFuzzyToAt(List target, int fuzz, int position) throws PatchFailedException {
-        int size = getSource().size();
-        for (int i = fuzz; i < size - fuzz; i++) {
-            target.remove(position + fuzz);
-        }
+		protected void applyFuzzyToAt(List target, int fuzz, int position) throws PatchFailedException {
+				int size = getSource().size();
+				for (int i = fuzz; i < size - fuzz; i++) {
+						target.remove(position + fuzz);
+				}
 
-        int i = fuzz;
-        for (T line : getTarget().getLines().subList(fuzz, getTarget().size() - fuzz)) {
-            target.add(position + i, line);
-            i++;
-        }
-    }
+				int i = fuzz;
+				for (T line : getTarget().getLines().subList(fuzz, getTarget().size() - fuzz)) {
+						target.add(position + i, line);
+						i++;
+				}
+		}
 
-    @Override
-    public String toString() {
-        return "[ChangeDelta, position: " + getSource().getPosition() + ", lines: "
-                + getSource().getLines() + " to " + getTarget().getLines() + "]";
-    }
+		@Override
+		public String toString() {
+				return "[ChangeDelta, position: " + getSource().getPosition() + ", lines: "
+								+ getSource().getLines() + " to " + getTarget().getLines() + "]";
+		}
 
-    @Override
-    public AbstractDelta withChunks(Chunk original, Chunk revised) {
-        return new ChangeDelta(original, revised);
-    }
+		@Override
+		public AbstractDelta withChunks(Chunk original, Chunk revised) {
+				return new ChangeDelta(original, revised);
+		}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
index 50054074..b5b2f312 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
@@ -37,159 +37,158 @@
  */
 public final class Chunk implements Serializable {
 
-    private final int position;
-    private List lines;
-    private final List changePosition;
-
-    /**
-     * Creates a chunk and saves a copy of affected lines
-     *
-     * @param position the start position
-     * @param lines the affected lines
-     * @param changePosition the positions of changed lines
-     */
-    public Chunk(int position, List lines, List changePosition) {
-        this.position = position;
-        this.lines = new ArrayList<>(lines);
-        this.changePosition = changePosition != null ? new ArrayList<>(changePosition) : null;
-    }
-
-    /**
-     * Creates a chunk and saves a copy of affected lines
-     *
-     * @param position the start position
-     * @param lines the affected lines
-     */
-    public Chunk(int position, List lines) {
-        this(position, lines, null);
-    }
-
-    /**
-     * Creates a chunk and saves a copy of affected lines
-     *
-     * @param position the start position
-     * @param lines the affected lines
-     * @param changePosition the positions of changed lines
-     */
-    public Chunk(int position, T[] lines, List changePosition) {
-        this.position = position;
-        this.lines = Arrays.asList(lines);
-        this.changePosition = changePosition != null ? new ArrayList<>(changePosition) : null;
-    }
-
-    /**
-     * Creates a chunk and saves a copy of affected lines
-     *
-     * @param position the start position
-     * @param lines the affected lines
-     */
-    public Chunk(int position, T[] lines) {
-        this(position, lines, null);
-    }
-
-    /**
-     * Verifies that this chunk's saved text matches the corresponding text in
-     * the given sequence.
-     *
-     * @param target the sequence to verify against.
-     * @throws com.github.difflib.patch.PatchFailedException
-     */
-    public VerifyChunk verifyChunk(List target) throws PatchFailedException {
-        return verifyChunk(target, 0, getPosition());
-    }
-
-    /**
-     * Verifies that this chunk's saved text matches the corresponding text in
-     * the given sequence.
-     *
-     * @param target the sequence to verify against.
-     * @param fuzz the count of ignored prefix/suffix
-     * @param position the position of target
-     * @throws com.github.difflib.patch.PatchFailedException
-     */
-    public VerifyChunk verifyChunk(List target, int fuzz, int position) throws PatchFailedException {
-        //noinspection UnnecessaryLocalVariable
-        int startIndex = fuzz;
-        int lastIndex = size() - fuzz;
-        int last = position + size() - 1;
-
-        if (position + fuzz > target.size() || last - fuzz > target.size()) {
-            return VerifyChunk.POSITION_OUT_OF_TARGET;
-        }
-        for (int i = startIndex; i < lastIndex; i++) {
-            if (!target.get(position + i).equals(lines.get(i))) {
-                return VerifyChunk.CONTENT_DOES_NOT_MATCH_TARGET;
-            }
-        }
-        return VerifyChunk.OK;
-    }
-
-    /**
-     * @return the start position of chunk in the text
-     */
-    public int getPosition() {
-        return position;
-    }
-
-    public void setLines(List lines) {
-        this.lines = lines;
-    }
-
-    /**
-     * @return the affected lines
-     */
-    public List getLines() {
-        return lines;
-    }
-
-    /**
-     * @return the positions of changed lines of chunk in the text
-     */
-    public List getChangePosition() {
-        return changePosition;
-    }
-
-    public int size() {
-        return lines.size();
-    }
-
-    /**
-     * Returns the index of the last line of the chunk.
-     */
-    public int last() {
-        return getPosition() + size() - 1;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(lines, position, size());
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        Chunk other = (Chunk) obj;
-        if (lines == null) {
-            if (other.lines != null) {
-                return false;
-            }
-        } else if (!lines.equals(other.lines)) {
-            return false;
-        }
-        return position == other.position;
-    }
-
-    @Override
-    public String toString() {
-        return "[position: " + position + ", size: " + size() + ", lines: " + lines + "]";
-    }
-
+		private final int position;
+		private List lines;
+		private final List changePosition;
+
+		/**
+		 * Creates a chunk and saves a copy of affected lines
+		 *
+		 * @param position the start position
+		 * @param lines the affected lines
+		 * @param changePosition the positions of changed lines
+		 */
+		public Chunk(int position, List lines, List changePosition) {
+				this.position = position;
+				this.lines = new ArrayList<>(lines);
+				this.changePosition = changePosition != null ? new ArrayList<>(changePosition) : null;
+		}
+
+		/**
+		 * Creates a chunk and saves a copy of affected lines
+		 *
+		 * @param position the start position
+		 * @param lines the affected lines
+		 */
+		public Chunk(int position, List lines) {
+				this(position, lines, null);
+		}
+
+		/**
+		 * Creates a chunk and saves a copy of affected lines
+		 *
+		 * @param position the start position
+		 * @param lines the affected lines
+		 * @param changePosition the positions of changed lines
+		 */
+		public Chunk(int position, T[] lines, List changePosition) {
+				this.position = position;
+				this.lines = Arrays.asList(lines);
+				this.changePosition = changePosition != null ? new ArrayList<>(changePosition) : null;
+		}
+
+		/**
+		 * Creates a chunk and saves a copy of affected lines
+		 *
+		 * @param position the start position
+		 * @param lines the affected lines
+		 */
+		public Chunk(int position, T[] lines) {
+				this(position, lines, null);
+		}
+
+		/**
+		 * Verifies that this chunk's saved text matches the corresponding text in
+		 * the given sequence.
+		 *
+		 * @param target the sequence to verify against.
+		 * @throws com.github.difflib.patch.PatchFailedException
+		 */
+		public VerifyChunk verifyChunk(List target) throws PatchFailedException {
+				return verifyChunk(target, 0, getPosition());
+		}
+
+		/**
+		 * Verifies that this chunk's saved text matches the corresponding text in
+		 * the given sequence.
+		 *
+		 * @param target the sequence to verify against.
+		 * @param fuzz the count of ignored prefix/suffix
+		 * @param position the position of target
+		 * @throws com.github.difflib.patch.PatchFailedException
+		 */
+		public VerifyChunk verifyChunk(List target, int fuzz, int position) throws PatchFailedException {
+				//noinspection UnnecessaryLocalVariable
+				int startIndex = fuzz;
+				int lastIndex = size() - fuzz;
+				int last = position + size() - 1;
+
+				if (position + fuzz > target.size() || last - fuzz > target.size()) {
+						return VerifyChunk.POSITION_OUT_OF_TARGET;
+				}
+				for (int i = startIndex; i < lastIndex; i++) {
+						if (!target.get(position + i).equals(lines.get(i))) {
+								return VerifyChunk.CONTENT_DOES_NOT_MATCH_TARGET;
+						}
+				}
+				return VerifyChunk.OK;
+		}
+
+		/**
+		 * @return the start position of chunk in the text
+		 */
+		public int getPosition() {
+				return position;
+		}
+
+		public void setLines(List lines) {
+				this.lines = lines;
+		}
+
+		/**
+		 * @return the affected lines
+		 */
+		public List getLines() {
+				return lines;
+		}
+
+		/**
+		 * @return the positions of changed lines of chunk in the text
+		 */
+		public List getChangePosition() {
+				return changePosition;
+		}
+
+		public int size() {
+				return lines.size();
+		}
+
+		/**
+		 * Returns the index of the last line of the chunk.
+		 */
+		public int last() {
+				return getPosition() + size() - 1;
+		}
+
+		@Override
+		public int hashCode() {
+				return Objects.hash(lines, position, size());
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+				if (this == obj) {
+						return true;
+				}
+				if (obj == null) {
+						return false;
+				}
+				if (getClass() != obj.getClass()) {
+						return false;
+				}
+				Chunk other = (Chunk) obj;
+				if (lines == null) {
+						if (other.lines != null) {
+								return false;
+						}
+				} else if (!lines.equals(other.lines)) {
+						return false;
+				}
+				return position == other.position;
+		}
+
+		@Override
+		public String toString() {
+				return "[position: " + position + ", size: " + size() + ", lines: " + lines + "]";
+		}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/ConflictOutput.java b/java-diff-utils/src/main/java/com/github/difflib/patch/ConflictOutput.java
index 2dfff6a5..3f32ed2d 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/ConflictOutput.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/ConflictOutput.java
@@ -8,7 +8,7 @@
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+		http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,5 +29,6 @@
 @FunctionalInterface
 public interface ConflictOutput extends Serializable {
 
-    public void processConflict(VerifyChunk verifyChunk, AbstractDelta delta, List result) throws PatchFailedException;
+		public void processConflict(VerifyChunk verifyChunk, AbstractDelta delta, List result)
+						throws PatchFailedException;
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java
index 890b8575..8a6cda37 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java
@@ -25,42 +25,42 @@
  */
 public final class DeleteDelta extends AbstractDelta {
 
-    /**
-     * 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}.
-     */
-    public DeleteDelta(Chunk original, Chunk revised) {
-        super(DeltaType.DELETE, original, revised);
-    }
+		/**
+		 * 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}.
+		 */
+		public DeleteDelta(Chunk original, Chunk revised) {
+				super(DeltaType.DELETE, original, revised);
+		}
 
-    @Override
-    protected void applyTo(List target) throws PatchFailedException {
-        int position = getSource().getPosition();
-        int size = getSource().size();
-        for (int i = 0; i < size; i++) {
-            target.remove(position);
-        }
-    }
+		@Override
+		protected void applyTo(List target) throws PatchFailedException {
+				int position = getSource().getPosition();
+				int size = getSource().size();
+				for (int i = 0; i < size; i++) {
+						target.remove(position);
+				}
+		}
 
-    @Override
-    protected void restore(List target) {
-        int position = this.getTarget().getPosition();
-        List lines = this.getSource().getLines();
-        for (int i = 0; i < lines.size(); i++) {
-            target.add(position + i, lines.get(i));
-        }
-    }
+		@Override
+		protected void restore(List target) {
+				int position = this.getTarget().getPosition();
+				List lines = this.getSource().getLines();
+				for (int i = 0; i < lines.size(); i++) {
+						target.add(position + i, lines.get(i));
+				}
+		}
 
-    @Override
-    public String toString() {
-        return "[DeleteDelta, position: " + getSource().getPosition() + ", lines: "
-                + getSource().getLines() + "]";
-    }
-    
-    @Override
-    public AbstractDelta withChunks(Chunk original, Chunk revised) {
-        return new DeleteDelta(original, revised);
-    }
+		@Override
+		public String toString() {
+				return "[DeleteDelta, position: " + getSource().getPosition() + ", lines: "
+								+ getSource().getLines() + "]";
+		}
+
+		@Override
+		public AbstractDelta withChunks(Chunk original, Chunk revised) {
+				return new DeleteDelta(original, revised);
+		}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/DeltaType.java b/java-diff-utils/src/main/java/com/github/difflib/patch/DeltaType.java
index 666e803a..51405c41 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/DeltaType.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/DeltaType.java
@@ -16,35 +16,35 @@
 package com.github.difflib.patch;
 
 /**
- * Specifies the type of the delta. There are three types of modifications from  
- * the original to get the revised text. 
- * 
+ * Specifies the type of the delta. There are three types of modifications from
+ * the original to get the revised text.
+ *
  * CHANGE: a block of data of the original is replaced by another block of data.
  * DELETE: a block of data of the original is removed
  * INSERT: at a position of the original a block of data is inserted
- * 
- * to be complete there is also 
- * 
+ *
+ * to be complete there is also
+ *
  * EQUAL: a block of data of original and the revised text is equal
- * 
+ *
  * which is no change at all.
  *
  */
 public enum DeltaType {
-    /**
-     * A change in the original.
-     */
-    CHANGE,
-    /**
-     * A delete from the original.
-     */
-    DELETE,
-    /**
-     * An insert into the original.
-     */
-    INSERT,
-    /**
-     * An do nothing.
-     */
-    EQUAL
+		/**
+		 * A change in the original.
+		 */
+		CHANGE,
+		/**
+		 * A delete from the original.
+		 */
+		DELETE,
+		/**
+		 * An insert into the original.
+		 */
+		INSERT,
+		/**
+		 * An do nothing.
+		 */
+		EQUAL
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/DiffException.java b/java-diff-utils/src/main/java/com/github/difflib/patch/DiffException.java
index da01d621..005d7a5b 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/DiffException.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/DiffException.java
@@ -22,12 +22,11 @@
  */
 public class DiffException extends Exception {
 
-    private static final long serialVersionUID = 1L;
+		private static final long serialVersionUID = 1L;
 
-    public DiffException() {
-    }
+		public DiffException() {}
 
-    public DiffException(String msg) {
-        super(msg);
-    }
+		public DiffException(String msg) {
+				super(msg);
+		}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java
index 17fdadc6..64f05685 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java
@@ -23,34 +23,32 @@
  */
 public class EqualDelta extends AbstractDelta {
 
-    public EqualDelta(Chunk source, Chunk target) {
-        super(DeltaType.EQUAL, source, target);
-    }
-
-    @Override
-    protected void applyTo(List target) throws PatchFailedException {
-    }
-
-    @Override
-    protected void restore(List target) {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void applyFuzzyToAt(List target, int fuzz, int delta) {
-        // equals so no operations
-    }
-
-    @Override
-    public String toString() {
-        return "[EqualDelta, position: " + getSource().getPosition() + ", lines: "
-                + getSource().getLines() + "]";
-    }
-    
-    @Override
-    public AbstractDelta withChunks(Chunk original, Chunk revised) {
-        return new EqualDelta(original, revised);
-    }
+		public EqualDelta(Chunk source, Chunk target) {
+				super(DeltaType.EQUAL, source, target);
+		}
+
+		@Override
+		protected void applyTo(List target) throws PatchFailedException {}
+
+		@Override
+		protected void restore(List target) {}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		protected void applyFuzzyToAt(List target, int fuzz, int delta) {
+				// equals so no operations
+		}
+
+		@Override
+		public String toString() {
+				return "[EqualDelta, position: " + getSource().getPosition() + ", lines: "
+								+ getSource().getLines() + "]";
+		}
+
+		@Override
+		public AbstractDelta withChunks(Chunk original, Chunk revised) {
+				return new EqualDelta(original, revised);
+		}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java
index 6cff9103..65d447a8 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java
@@ -25,42 +25,42 @@
  */
 public final class InsertDelta extends AbstractDelta {
 
-    /**
-     * Creates an insert 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}.
-     */
-    public InsertDelta(Chunk original, Chunk revised) {
-        super(DeltaType.INSERT, original, revised);
-    }
+		/**
+		 * Creates an insert 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}.
+		 */
+		public InsertDelta(Chunk original, Chunk revised) {
+				super(DeltaType.INSERT, original, revised);
+		}
 
-    @Override
-    protected void applyTo(List target) throws PatchFailedException {
-        int position = this.getSource().getPosition();
-        List lines = this.getTarget().getLines();
-        for (int i = 0; i < lines.size(); i++) {
-            target.add(position + i, lines.get(i));
-        }
-    }
+		@Override
+		protected void applyTo(List target) throws PatchFailedException {
+				int position = this.getSource().getPosition();
+				List lines = this.getTarget().getLines();
+				for (int i = 0; i < lines.size(); i++) {
+						target.add(position + i, lines.get(i));
+				}
+		}
 
-    @Override
-    protected void restore(List target) {
-        int position = getTarget().getPosition();
-        int size = getTarget().size();
-        for (int i = 0; i < size; i++) {
-            target.remove(position);
-        }
-    }
+		@Override
+		protected void restore(List target) {
+				int position = getTarget().getPosition();
+				int size = getTarget().size();
+				for (int i = 0; i < size; i++) {
+						target.remove(position);
+				}
+		}
 
-    @Override
-    public String toString() {
-        return "[InsertDelta, position: " + getSource().getPosition()
-                + ", lines: " + getTarget().getLines() + "]";
-    }
-    
-    @Override
-    public AbstractDelta withChunks(Chunk original, Chunk revised) {
-        return new InsertDelta(original, revised);
-    }
+		@Override
+		public String toString() {
+				return "[InsertDelta, position: " + getSource().getPosition() + ", lines: "
+								+ getTarget().getLines() + "]";
+		}
+
+		@Override
+		public AbstractDelta withChunks(Chunk original, Chunk revised) {
+				return new InsertDelta(original, revised);
+		}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
index 305f2de7..6a54d820 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
@@ -8,7 +8,7 @@
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+		http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,8 +20,8 @@
 package com.github.difflib.patch;
 
 import static java.util.Comparator.comparing;
-import com.github.difflib.algorithm.Change;
 
+import com.github.difflib.algorithm.Change;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -37,308 +37,313 @@
  */
 public final class Patch implements Serializable {
 
-    private final List> deltas;
-
-    public Patch() {
-        this(10);
-    }
-
-    public Patch(int estimatedPatchSize) {
-        deltas = new ArrayList<>(estimatedPatchSize);
-    }
-
-    /**
-     * Creates a new list, the patch is being applied to.
-     *
-     * @param target The list to apply the changes to.
-     * @return A new list containing the applied patch.
-     * @throws PatchFailedException if the patch cannot be applied
-     */
-    public List applyTo(List target) throws PatchFailedException {
-        List result = new ArrayList<>(target);
-        applyToExisting(result);
-        return result;
-    }
-
-    /**
-     * Applies the patch to the supplied list.
-     *
-     * @param target The list to apply the changes to. This list has to be modifiable,
-     *               otherwise exceptions may be thrown, depending on the used type of list.
-     * @throws PatchFailedException if the patch cannot be applied
-     * @throws RuntimeException (or similar) if the list is not modifiable.
-     */
-    public void applyToExisting(List target) throws PatchFailedException {
-        ListIterator> it = getDeltas().listIterator(deltas.size());
-        while (it.hasPrevious()) {
-            AbstractDelta delta = it.previous();
-            VerifyChunk valid = delta.verifyAndApplyTo(target);
-            if (valid != VerifyChunk.OK) {
-                conflictOutput.processConflict(valid, delta, target);
-            }
-        }
-    }
-
-    private static class PatchApplyingContext {
-        public final List result;
-        public final int maxFuzz;
-
-        // the position last patch applied to.
-        public int lastPatchEnd = -1;
-
-        ///// passing values from find to apply
-        public int currentFuzz = 0;
-
-        public int defaultPosition;
-        public boolean beforeOutRange = false;
-        public boolean afterOutRange = false;
-
-        private PatchApplyingContext(List result, int maxFuzz) {
-            this.result = result;
-            this.maxFuzz = maxFuzz;
-        }
-    }
-
-    public List applyFuzzy(List target, int maxFuzz) throws PatchFailedException {
-        PatchApplyingContext ctx = new PatchApplyingContext<>(new ArrayList<>(target), maxFuzz);
-
-        // the difference between patch's position and actually applied position
-        int lastPatchDelta = 0;
-
-        for (AbstractDelta delta : getDeltas()) {
-            ctx.defaultPosition = delta.getSource().getPosition() + lastPatchDelta;
-            int patchPosition = findPositionFuzzy(ctx, delta);
-            if (0 <= patchPosition) {
-                delta.applyFuzzyToAt(ctx.result, ctx.currentFuzz, patchPosition);
-                lastPatchDelta = patchPosition - delta.getSource().getPosition();
-                ctx.lastPatchEnd = delta.getSource().last() + lastPatchDelta;
-            } else {
-                conflictOutput.processConflict(VerifyChunk.CONTENT_DOES_NOT_MATCH_TARGET, delta, ctx.result);
-            }
-        }
-
-        return ctx.result;
-    }
-
-    // negative for not found
-    private int findPositionFuzzy(PatchApplyingContext ctx, AbstractDelta delta) throws PatchFailedException {
-        for (int fuzz = 0; fuzz <= ctx.maxFuzz; fuzz++) {
-            ctx.currentFuzz = fuzz;
-            int foundPosition = findPositionWithFuzz(ctx, delta, fuzz);
-            if (foundPosition >= 0) {
-                return foundPosition;
-            }
-        }
-        return -1;
-    }
-
-    // negative for not found
-    private int findPositionWithFuzz(PatchApplyingContext ctx, AbstractDelta delta, int fuzz) throws PatchFailedException {
-        if (delta.getSource().verifyChunk(ctx.result, fuzz, ctx.defaultPosition) == VerifyChunk.OK) {
-            return ctx.defaultPosition;
-        }
-
-        ctx.beforeOutRange = false;
-        ctx.afterOutRange = false;
-
-        // moreDelta >= 0: just for overflow guard, not a normal condition
-        //noinspection OverflowingLoopIndex
-        for (int moreDelta = 0; moreDelta >= 0; moreDelta++) {
-            int pos = findPositionWithFuzzAndMoreDelta(ctx, delta, fuzz, moreDelta);
-            if (pos >= 0) {
-                return pos;
-            }
-            if (ctx.beforeOutRange && ctx.afterOutRange) {
-                break;
-            }
-        }
-
-        return -1;
-    }
-
-    // negative for not found
-    private int findPositionWithFuzzAndMoreDelta(PatchApplyingContext ctx, AbstractDelta delta, int fuzz, int moreDelta) throws PatchFailedException {
-        // range check: can't apply before end of last patch
-        if (!ctx.beforeOutRange) {
-            int beginAt = ctx.defaultPosition - moreDelta + fuzz;
-            // We can't apply patch before end of last patch.
-            if (beginAt <= ctx.lastPatchEnd) {
-                ctx.beforeOutRange = true;
-            }
-        }
-        // range check: can't apply after end of result
-        if (!ctx.afterOutRange) {
-            int beginAt = ctx.defaultPosition + moreDelta + delta.getSource().size() - fuzz;
-            // We can't apply patch before end of last patch.
-            if (ctx.result.size() < beginAt) {
-                ctx.afterOutRange = true;
-            }
-        }
-
-        if (!ctx.beforeOutRange) {
-            VerifyChunk before = delta.getSource().verifyChunk(ctx.result, fuzz, ctx.defaultPosition - moreDelta);
-            if (before == VerifyChunk.OK) {
-                return ctx.defaultPosition - moreDelta;
-            }
-        }
-        if (!ctx.afterOutRange) {
-            VerifyChunk after = delta.getSource().verifyChunk(ctx.result, fuzz, ctx.defaultPosition + moreDelta);
-            if (after == VerifyChunk.OK) {
-                return ctx.defaultPosition + moreDelta;
-            }
-        }
-        return -1;
-    }
-
-    /**
-     * Standard Patch behaviour to throw an exception for pathching conflicts.
-     */
-    public final ConflictOutput CONFLICT_PRODUCES_EXCEPTION = (VerifyChunk verifyChunk, AbstractDelta delta, List result) -> {
-        throw new PatchFailedException("could not apply patch due to " + verifyChunk.toString());
-    };
-
-    /**
-     * Git like merge conflict output.
-     */
-    public static final ConflictOutput CONFLICT_PRODUCES_MERGE_CONFLICT = (VerifyChunk verifyChunk, AbstractDelta delta, List result) -> {
-        if (result.size() > delta.getSource().getPosition()) {
-            List orgData = new ArrayList<>();
-
-            for (int i = 0; i < delta.getSource().size(); i++) {
-                orgData.add(result.get(delta.getSource().getPosition()));
-                result.remove(delta.getSource().getPosition());
-            }
-
-            orgData.add(0, "<<<<<< HEAD");
-            orgData.add("======");
-            orgData.addAll(delta.getSource().getLines());
-            orgData.add(">>>>>>> PATCH");
-
-            result.addAll(delta.getSource().getPosition(), orgData);
-
-        } else {
-            throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-        }
-    };
-
-    private ConflictOutput conflictOutput = CONFLICT_PRODUCES_EXCEPTION;
-
-    /**
-     * Alter normal conflict output behaviour to e.g. include some conflict
-     * statements in the result, like git does it.
-     */
-    public Patch withConflictOutput(ConflictOutput conflictOutput) {
-        this.conflictOutput = conflictOutput;
-        return this;
-    }
-
-    /**
-     * Creates a new list, containing the restored state of the given list.
-     * Opposite to {@link #applyTo(List)} method.
-     *
-     * @param target The list to copy and apply changes to.
-     * @return A new list, containing the restored state.
-     */
-    public List restore(List target) {
-        List result = new ArrayList<>(target);
-        restoreToExisting(result);
-        return result;
-    }
-
-
-    /**
-     * Restores all changes within the given list.
-     * Opposite to {@link #applyToExisting(List)} method.
-     *
-     * @param target The list to restore changes in. This list has to be modifiable,
-     *               otherwise exceptions may be thrown, depending on the used type of list.
-     * @throws RuntimeException (or similar) if the list is not modifiable.
-     */
-    public void restoreToExisting(List target) {
-        ListIterator> it = getDeltas().listIterator(deltas.size());
-        while (it.hasPrevious()) {
-            AbstractDelta delta = it.previous();
-            delta.restore(target);
-        }
-    }
-
-    /**
-     * Add the given delta to this patch
-     *
-     * @param delta the given delta
-     */
-    public void addDelta(AbstractDelta delta) {
-        deltas.add(delta);
-    }
-
-    /**
-     * Get the list of computed deltas
-     *
-     * @return the deltas
-     */
-    public List> getDeltas() {
-        deltas.sort(comparing(d -> d.getSource().getPosition()));
-        return deltas;
-    }
-
-    @Override
-    public String toString() {
-        return "Patch{" + "deltas=" + deltas + '}';
-    }
-
-    public static  Patch generate(List original, List revised, List changes) {
-        return generate(original, revised, changes, false);
-    }
-
-    private static  Chunk buildChunk(int start, int end, List data) {
-        return new Chunk<>(start, new ArrayList<>(data.subList(start, end)));
-    }
-
-    public static  Patch generate(List original, List revised, List _changes, boolean includeEquals) {
-        Patch patch = new Patch<>(_changes.size());
-        int startOriginal = 0;
-        int startRevised = 0;
-
-        List changes = _changes;
-
-        if (includeEquals) {
-            changes = new ArrayList(_changes);
-            Collections.sort(changes, comparing(d -> d.startOriginal));
-        }
-
-        for (Change change : changes) {
-
-            if (includeEquals && startOriginal < change.startOriginal) {
-                patch.addDelta(new EqualDelta(
-                        buildChunk(startOriginal, change.startOriginal, original),
-                        buildChunk(startRevised, change.startRevised, revised)));
-            }
-
-            Chunk orgChunk = buildChunk(change.startOriginal, change.endOriginal, original);
-            Chunk revChunk = buildChunk(change.startRevised, change.endRevised, revised);
-            switch (change.deltaType) {
-                case DELETE:
-                    patch.addDelta(new DeleteDelta<>(orgChunk, revChunk));
-                    break;
-                case INSERT:
-                    patch.addDelta(new InsertDelta<>(orgChunk, revChunk));
-                    break;
-                case CHANGE:
-                    patch.addDelta(new ChangeDelta<>(orgChunk, revChunk));
-                    break;
-                default:
-            }
-
-            startOriginal = change.endOriginal;
-            startRevised = change.endRevised;
-        }
-
-        if (includeEquals && startOriginal < original.size()) {
-            patch.addDelta(new EqualDelta(
-                    buildChunk(startOriginal, original.size(), original),
-                    buildChunk(startRevised, revised.size(), revised)));
-        }
-
-        return patch;
-    }
+		private final List> deltas;
+
+		public Patch() {
+				this(10);
+		}
+
+		public Patch(int estimatedPatchSize) {
+				deltas = new ArrayList<>(estimatedPatchSize);
+		}
+
+		/**
+		 * Creates a new list, the patch is being applied to.
+		 *
+		 * @param target The list to apply the changes to.
+		 * @return A new list containing the applied patch.
+		 * @throws PatchFailedException if the patch cannot be applied
+		 */
+		public List applyTo(List target) throws PatchFailedException {
+				List result = new ArrayList<>(target);
+				applyToExisting(result);
+				return result;
+		}
+
+		/**
+		 * Applies the patch to the supplied list.
+		 *
+		 * @param target The list to apply the changes to. This list has to be modifiable,
+		 *               otherwise exceptions may be thrown, depending on the used type of list.
+		 * @throws PatchFailedException if the patch cannot be applied
+		 * @throws RuntimeException (or similar) if the list is not modifiable.
+		 */
+		public void applyToExisting(List target) throws PatchFailedException {
+				ListIterator> it = getDeltas().listIterator(deltas.size());
+				while (it.hasPrevious()) {
+						AbstractDelta delta = it.previous();
+						VerifyChunk valid = delta.verifyAndApplyTo(target);
+						if (valid != VerifyChunk.OK) {
+								conflictOutput.processConflict(valid, delta, target);
+						}
+				}
+		}
+
+		private static class PatchApplyingContext {
+				public final List result;
+				public final int maxFuzz;
+
+				// the position last patch applied to.
+				public int lastPatchEnd = -1;
+
+				///// passing values from find to apply
+				public int currentFuzz = 0;
+
+				public int defaultPosition;
+				public boolean beforeOutRange = false;
+				public boolean afterOutRange = false;
+
+				private PatchApplyingContext(List result, int maxFuzz) {
+						this.result = result;
+						this.maxFuzz = maxFuzz;
+				}
+		}
+
+		public List applyFuzzy(List target, int maxFuzz) throws PatchFailedException {
+				PatchApplyingContext ctx = new PatchApplyingContext<>(new ArrayList<>(target), maxFuzz);
+
+				// the difference between patch's position and actually applied position
+				int lastPatchDelta = 0;
+
+				for (AbstractDelta delta : getDeltas()) {
+						ctx.defaultPosition = delta.getSource().getPosition() + lastPatchDelta;
+						int patchPosition = findPositionFuzzy(ctx, delta);
+						if (0 <= patchPosition) {
+								delta.applyFuzzyToAt(ctx.result, ctx.currentFuzz, patchPosition);
+								lastPatchDelta = patchPosition - delta.getSource().getPosition();
+								ctx.lastPatchEnd = delta.getSource().last() + lastPatchDelta;
+						} else {
+								conflictOutput.processConflict(VerifyChunk.CONTENT_DOES_NOT_MATCH_TARGET, delta, ctx.result);
+						}
+				}
+
+				return ctx.result;
+		}
+
+		// negative for not found
+		private int findPositionFuzzy(PatchApplyingContext ctx, AbstractDelta delta) throws PatchFailedException {
+				for (int fuzz = 0; fuzz <= ctx.maxFuzz; fuzz++) {
+						ctx.currentFuzz = fuzz;
+						int foundPosition = findPositionWithFuzz(ctx, delta, fuzz);
+						if (foundPosition >= 0) {
+								return foundPosition;
+						}
+				}
+				return -1;
+		}
+
+		// negative for not found
+		private int findPositionWithFuzz(PatchApplyingContext ctx, AbstractDelta delta, int fuzz)
+						throws PatchFailedException {
+				if (delta.getSource().verifyChunk(ctx.result, fuzz, ctx.defaultPosition) == VerifyChunk.OK) {
+						return ctx.defaultPosition;
+				}
+
+				ctx.beforeOutRange = false;
+				ctx.afterOutRange = false;
+
+				// moreDelta >= 0: just for overflow guard, not a normal condition
+				//noinspection OverflowingLoopIndex
+				for (int moreDelta = 0; moreDelta >= 0; moreDelta++) {
+						int pos = findPositionWithFuzzAndMoreDelta(ctx, delta, fuzz, moreDelta);
+						if (pos >= 0) {
+								return pos;
+						}
+						if (ctx.beforeOutRange && ctx.afterOutRange) {
+								break;
+						}
+				}
+
+				return -1;
+		}
+
+		// negative for not found
+		private int findPositionWithFuzzAndMoreDelta(
+						PatchApplyingContext ctx, AbstractDelta delta, int fuzz, int moreDelta) throws PatchFailedException {
+				// range check: can't apply before end of last patch
+				if (!ctx.beforeOutRange) {
+						int beginAt = ctx.defaultPosition - moreDelta + fuzz;
+						// We can't apply patch before end of last patch.
+						if (beginAt <= ctx.lastPatchEnd) {
+								ctx.beforeOutRange = true;
+						}
+				}
+				// range check: can't apply after end of result
+				if (!ctx.afterOutRange) {
+						int beginAt = ctx.defaultPosition + moreDelta + delta.getSource().size() - fuzz;
+						// We can't apply patch before end of last patch.
+						if (ctx.result.size() < beginAt) {
+								ctx.afterOutRange = true;
+						}
+				}
+
+				if (!ctx.beforeOutRange) {
+						VerifyChunk before = delta.getSource().verifyChunk(ctx.result, fuzz, ctx.defaultPosition - moreDelta);
+						if (before == VerifyChunk.OK) {
+								return ctx.defaultPosition - moreDelta;
+						}
+				}
+				if (!ctx.afterOutRange) {
+						VerifyChunk after = delta.getSource().verifyChunk(ctx.result, fuzz, ctx.defaultPosition + moreDelta);
+						if (after == VerifyChunk.OK) {
+								return ctx.defaultPosition + moreDelta;
+						}
+				}
+				return -1;
+		}
+
+		/**
+		 * Standard Patch behaviour to throw an exception for pathching conflicts.
+		 */
+		public final ConflictOutput CONFLICT_PRODUCES_EXCEPTION =
+						(VerifyChunk verifyChunk, AbstractDelta delta, List result) -> {
+								throw new PatchFailedException("could not apply patch due to " + verifyChunk.toString());
+						};
+
+		/**
+		 * Git like merge conflict output.
+		 */
+		public static final ConflictOutput CONFLICT_PRODUCES_MERGE_CONFLICT =
+						(VerifyChunk verifyChunk, AbstractDelta delta, List result) -> {
+								if (result.size() > delta.getSource().getPosition()) {
+										List orgData = new ArrayList<>();
+
+										for (int i = 0; i < delta.getSource().size(); i++) {
+												orgData.add(result.get(delta.getSource().getPosition()));
+												result.remove(delta.getSource().getPosition());
+										}
+
+										orgData.add(0, "<<<<<< HEAD");
+										orgData.add("======");
+										orgData.addAll(delta.getSource().getLines());
+										orgData.add(">>>>>>> PATCH");
+
+										result.addAll(delta.getSource().getPosition(), orgData);
+
+								} else {
+										throw new UnsupportedOperationException(
+														"Not supported yet."); // To change body of generated methods, choose Tools | Templates.
+								}
+						};
+
+		private ConflictOutput conflictOutput = CONFLICT_PRODUCES_EXCEPTION;
+
+		/**
+		 * Alter normal conflict output behaviour to e.g. include some conflict
+		 * statements in the result, like git does it.
+		 */
+		public Patch withConflictOutput(ConflictOutput conflictOutput) {
+				this.conflictOutput = conflictOutput;
+				return this;
+		}
+
+		/**
+		 * Creates a new list, containing the restored state of the given list.
+		 * Opposite to {@link #applyTo(List)} method.
+		 *
+		 * @param target The list to copy and apply changes to.
+		 * @return A new list, containing the restored state.
+		 */
+		public List restore(List target) {
+				List result = new ArrayList<>(target);
+				restoreToExisting(result);
+				return result;
+		}
+
+		/**
+		 * Restores all changes within the given list.
+		 * Opposite to {@link #applyToExisting(List)} method.
+		 *
+		 * @param target The list to restore changes in. This list has to be modifiable,
+		 *               otherwise exceptions may be thrown, depending on the used type of list.
+		 * @throws RuntimeException (or similar) if the list is not modifiable.
+		 */
+		public void restoreToExisting(List target) {
+				ListIterator> it = getDeltas().listIterator(deltas.size());
+				while (it.hasPrevious()) {
+						AbstractDelta delta = it.previous();
+						delta.restore(target);
+				}
+		}
+
+		/**
+		 * Add the given delta to this patch
+		 *
+		 * @param delta the given delta
+		 */
+		public void addDelta(AbstractDelta delta) {
+				deltas.add(delta);
+		}
+
+		/**
+		 * Get the list of computed deltas
+		 *
+		 * @return the deltas
+		 */
+		public List> getDeltas() {
+				deltas.sort(comparing(d -> d.getSource().getPosition()));
+				return deltas;
+		}
+
+		@Override
+		public String toString() {
+				return "Patch{" + "deltas=" + deltas + '}';
+		}
+
+		public static  Patch generate(List original, List revised, List changes) {
+				return generate(original, revised, changes, false);
+		}
+
+		private static  Chunk buildChunk(int start, int end, List data) {
+				return new Chunk<>(start, new ArrayList<>(data.subList(start, end)));
+		}
+
+		public static  Patch generate(
+						List original, List revised, List _changes, boolean includeEquals) {
+				Patch patch = new Patch<>(_changes.size());
+				int startOriginal = 0;
+				int startRevised = 0;
+
+				List changes = _changes;
+
+				if (includeEquals) {
+						changes = new ArrayList(_changes);
+						Collections.sort(changes, comparing(d -> d.startOriginal));
+				}
+
+				for (Change change : changes) {
+
+						if (includeEquals && startOriginal < change.startOriginal) {
+								patch.addDelta(new EqualDelta(
+												buildChunk(startOriginal, change.startOriginal, original),
+												buildChunk(startRevised, change.startRevised, revised)));
+						}
+
+						Chunk orgChunk = buildChunk(change.startOriginal, change.endOriginal, original);
+						Chunk revChunk = buildChunk(change.startRevised, change.endRevised, revised);
+						switch (change.deltaType) {
+								case DELETE:
+										patch.addDelta(new DeleteDelta<>(orgChunk, revChunk));
+										break;
+								case INSERT:
+										patch.addDelta(new InsertDelta<>(orgChunk, revChunk));
+										break;
+								case CHANGE:
+										patch.addDelta(new ChangeDelta<>(orgChunk, revChunk));
+										break;
+								default:
+						}
+
+						startOriginal = change.endOriginal;
+						startRevised = change.endRevised;
+				}
+
+				if (includeEquals && startOriginal < original.size()) {
+						patch.addDelta(new EqualDelta(
+										buildChunk(startOriginal, original.size(), original),
+										buildChunk(startRevised, revised.size(), revised)));
+				}
+
+				return patch;
+		}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/PatchFailedException.java b/java-diff-utils/src/main/java/com/github/difflib/patch/PatchFailedException.java
index 7521c892..c6673573 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/PatchFailedException.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/PatchFailedException.java
@@ -22,12 +22,11 @@
  */
 public class PatchFailedException extends DiffException {
 
-    private static final long serialVersionUID = 1L;
+		private static final long serialVersionUID = 1L;
 
-    public PatchFailedException() {
-    }
+		public PatchFailedException() {}
 
-    public PatchFailedException(String msg) {
-        super(msg);
-    }
+		public PatchFailedException(String msg) {
+				super(msg);
+		}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/VerifyChunk.java b/java-diff-utils/src/main/java/com/github/difflib/patch/VerifyChunk.java
index 076f633a..c8839b91 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/VerifyChunk.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/VerifyChunk.java
@@ -20,7 +20,7 @@
  * @author tw
  */
 public enum VerifyChunk {
-    OK,
-    POSITION_OUT_OF_TARGET,
-    CONTENT_DOES_NOT_MATCH_TARGET
+		OK,
+		POSITION_OUT_OF_TARGET,
+		CONTENT_DOES_NOT_MATCH_TARGET
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRow.java b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRow.java
index 95908393..6ba79beb 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRow.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRow.java
@@ -25,91 +25,94 @@
  */
 public final class DiffRow implements Serializable {
 
-    private Tag tag;
-    private final String oldLine;
-    private final String newLine;
+		private Tag tag;
+		private final String oldLine;
+		private final String newLine;
 
-    public DiffRow(Tag tag, String oldLine, String newLine) {
-        this.tag = tag;
-        this.oldLine = oldLine;
-        this.newLine = newLine;
-    }
+		public DiffRow(Tag tag, String oldLine, String newLine) {
+				this.tag = tag;
+				this.oldLine = oldLine;
+				this.newLine = newLine;
+		}
 
-    public enum Tag {
-        INSERT, DELETE, CHANGE, EQUAL
-    }
+		public enum Tag {
+				INSERT,
+				DELETE,
+				CHANGE,
+				EQUAL
+		}
 
-    /**
-     * @return the tag
-     */
-    public Tag getTag() {
-        return tag;
-    }
+		/**
+		 * @return the tag
+		 */
+		public Tag getTag() {
+				return tag;
+		}
 
-    /**
-     * @param tag the tag to set
-     */
-    public void setTag(Tag tag) {
-        this.tag = tag;
-    }
+		/**
+		 * @param tag the tag to set
+		 */
+		public void setTag(Tag tag) {
+				this.tag = tag;
+		}
 
-    /**
-     * @return the oldLine
-     */
-    public String getOldLine() {
-        return oldLine;
-    }
+		/**
+		 * @return the oldLine
+		 */
+		public String getOldLine() {
+				return oldLine;
+		}
 
-    /**
-     * @return the newLine
-     */
-    public String getNewLine() {
-        return newLine;
-    }
+		/**
+		 * @return the newLine
+		 */
+		public String getNewLine() {
+				return newLine;
+		}
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(newLine, oldLine, tag);
-    }
+		@Override
+		public int hashCode() {
+				return Objects.hash(newLine, oldLine, tag);
+		}
 
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        DiffRow other = (DiffRow) obj;
-        if (newLine == null) {
-            if (other.newLine != null) {
-                return false;
-            }
-        } else if (!newLine.equals(other.newLine)) {
-            return false;
-        }
-        if (oldLine == null) {
-            if (other.oldLine != null) {
-                return false;
-            }
-        } else if (!oldLine.equals(other.oldLine)) {
-            return false;
-        }
-        if (tag == null) {
-            if (other.tag != null) {
-                return false;
-            }
-        } else if (!tag.equals(other.tag)) {
-            return false;
-        }
-        return true;
-    }
+		@Override
+		public boolean equals(Object obj) {
+				if (this == obj) {
+						return true;
+				}
+				if (obj == null) {
+						return false;
+				}
+				if (getClass() != obj.getClass()) {
+						return false;
+				}
+				DiffRow other = (DiffRow) obj;
+				if (newLine == null) {
+						if (other.newLine != null) {
+								return false;
+						}
+				} else if (!newLine.equals(other.newLine)) {
+						return false;
+				}
+				if (oldLine == null) {
+						if (other.oldLine != null) {
+								return false;
+						}
+				} else if (!oldLine.equals(other.oldLine)) {
+						return false;
+				}
+				if (tag == null) {
+						if (other.tag != null) {
+								return false;
+						}
+				} else if (!tag.equals(other.tag)) {
+						return false;
+				}
+				return true;
+		}
 
-    @Override
-    public String toString() {
-        return "[" + this.tag + "," + this.oldLine + "," + this.newLine + "]";
-    }
+		@Override
+		public String toString() {
+				return "[" + this.tag + "," + this.oldLine + "," + this.newLine + "]";
+		}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
index 9ec50a84..e7e09ac5 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
@@ -15,6 +15,8 @@
  */
 package com.github.difflib.text;
 
+import static java.util.stream.Collectors.toList;
+
 import com.github.difflib.DiffUtils;
 import com.github.difflib.patch.AbstractDelta;
 import com.github.difflib.patch.ChangeDelta;
@@ -32,7 +34,6 @@
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import static java.util.stream.Collectors.toList;
 
 /**
  * This class for generating DiffRows for side-by-sidy view. You can customize
@@ -51,656 +52,693 @@
  */
 public final class DiffRowGenerator {
 
-    public static final BiPredicate DEFAULT_EQUALIZER = Object::equals;
-
-    public static final BiPredicate IGNORE_WHITESPACE_EQUALIZER = (original, revised)
-            -> adjustWhitespace(original).equals(adjustWhitespace(revised));
-
-    public static final Function LINE_NORMALIZER_FOR_HTML = StringUtils::normalize;
-
-    /**
-     * Splitting lines by character to achieve char by char diff checking.
-     */
-    public static final Function> SPLITTER_BY_CHARACTER = line -> {
-        List list = new ArrayList<>(line.length());
-        for (Character character : line.toCharArray()) {
-            list.add(character.toString());
-        }
-        return list;
-    };
-
-    public static final Pattern SPLIT_BY_WORD_PATTERN = Pattern.compile("\\s+|[,.\\[\\](){}/\\\\*+\\-#<>;:&\\']+");
-
-    /**
-     * Splitting lines by word to achieve word by word diff checking.
-     */
-    public static final Function> SPLITTER_BY_WORD = line -> splitStringPreserveDelimiter(line, SPLIT_BY_WORD_PATTERN);
-    public static final Pattern WHITESPACE_PATTERN = Pattern.compile("\\s+");
-
-    public static final Function>> DEFAULT_INLINE_DELTA_MERGER = InlineDeltaMergeInfo::getDeltas;
-
-    /**
-     * Merge diffs which are separated by equalities consisting of whitespace only.
-     */
-    public static final Function>> WHITESPACE_EQUALITIES_MERGER = deltaMergeInfo -> DeltaMergeUtils
-            .mergeInlineDeltas(deltaMergeInfo, equalities -> equalities.stream().allMatch(s -> s==null || s.replaceAll("\\s+", "").equals("")));
-
-    public static Builder create() {
-        return new Builder();
-    }
-
-    private static String adjustWhitespace(String raw) {
-        return WHITESPACE_PATTERN.matcher(raw.trim()).replaceAll(" ");
-    }
-
-    protected final static List splitStringPreserveDelimiter(String str, Pattern SPLIT_PATTERN) {
-        List list = new ArrayList<>();
-        if (str != null) {
-            Matcher matcher = SPLIT_PATTERN.matcher(str);
-            int pos = 0;
-            while (matcher.find()) {
-                if (pos < matcher.start()) {
-                    list.add(str.substring(pos, matcher.start()));
-                }
-                list.add(matcher.group());
-                pos = matcher.end();
-            }
-            if (pos < str.length()) {
-                list.add(str.substring(pos));
-            }
-        }
-        return list;
-    }
-
-    /**
-     * Wrap the elements in the sequence with the given tag
-     *
-     * @param startPosition the position from which tag should start. The
-     * counting start from a zero.
-     * @param endPosition the position before which tag should should be closed.
-     * @param tagGenerator the tag generator
-     */
-    static void wrapInTag(List sequence, int startPosition,
-            int endPosition, Tag tag, BiFunction tagGenerator,
-            Function processDiffs, boolean replaceLinefeedWithSpace) {
-        int endPos = endPosition;
-
-        while (endPos >= startPosition) {
-
-            //search position for end tag
-            while (endPos > startPosition) {
-                if (!"\n".equals(sequence.get(endPos - 1))) {
-                    break;
-                } else if (replaceLinefeedWithSpace) {
-                    sequence.set(endPos - 1, " ");
-                    break;
-                }
-                endPos--;
-            }
-
-            if (endPos == startPosition) {
-                break;
-            }
-
-            sequence.add(endPos, tagGenerator.apply(tag, false));
-            if (processDiffs != null) {
-                sequence.set(endPos - 1,
-                        processDiffs.apply(sequence.get(endPos - 1)));
-            }
-            endPos--;
-
-            //search position for end tag
-            while (endPos > startPosition) {
-                if ("\n".equals(sequence.get(endPos - 1))) {
-                    if (replaceLinefeedWithSpace) {
-                        sequence.set(endPos - 1, " ");
-                    } else {
-                        break;
-                    }
-                }
-                if (processDiffs != null) {
-                    sequence.set(endPos - 1,
-                            processDiffs.apply(sequence.get(endPos - 1)));
-                }
-                endPos--;
-            }
-
-            sequence.add(endPos, tagGenerator.apply(tag, true));
-            endPos--;
-        }
-    }
-
-    private final int columnWidth;
-    private final BiPredicate equalizer;
-    private final boolean ignoreWhiteSpaces;
-    private final Function> inlineDiffSplitter;
-    private final boolean mergeOriginalRevised;
-    private final BiFunction newTag;
-    private final BiFunction oldTag;
-    private final boolean reportLinesUnchanged;
-    private final Function lineNormalizer;
-    private final Function processDiffs;
-    private final Function>> inlineDeltaMerger;
-
-    private final boolean showInlineDiffs;
-    private final boolean replaceOriginalLinefeedInChangesWithSpaces;
-    private final boolean decompressDeltas;
-
-    private DiffRowGenerator(Builder builder) {
-        showInlineDiffs = builder.showInlineDiffs;
-        ignoreWhiteSpaces = builder.ignoreWhiteSpaces;
-        oldTag = builder.oldTag;
-        newTag = builder.newTag;
-        columnWidth = builder.columnWidth;
-        mergeOriginalRevised = builder.mergeOriginalRevised;
-        inlineDiffSplitter = builder.inlineDiffSplitter;
-        decompressDeltas = builder.decompressDeltas;
-
-        if (builder.equalizer != null) {
-            equalizer = builder.equalizer;
-        } else {
-            equalizer = ignoreWhiteSpaces ? IGNORE_WHITESPACE_EQUALIZER : DEFAULT_EQUALIZER;
-        }
-
-        reportLinesUnchanged = builder.reportLinesUnchanged;
-        lineNormalizer = builder.lineNormalizer;
-        processDiffs = builder.processDiffs;
-        inlineDeltaMerger = builder.inlineDeltaMerger;
-
-        replaceOriginalLinefeedInChangesWithSpaces = builder.replaceOriginalLinefeedInChangesWithSpaces;
-
-        Objects.requireNonNull(inlineDiffSplitter);
-        Objects.requireNonNull(lineNormalizer);
-        Objects.requireNonNull(inlineDeltaMerger);
-    }
-
-    /**
-     * Get the DiffRows describing the difference between original and revised
-     * texts using the given patch. Useful for displaying side-by-side diff.
-     *
-     * @param original the original text
-     * @param revised the revised text
-     * @return the DiffRows between original and revised texts
-     */
-    public List generateDiffRows(List original, List revised) {
-        return generateDiffRows(original, DiffUtils.diff(original, revised, equalizer));
-    }
-
-    /**
-     * Generates the DiffRows describing the difference between original and
-     * revised texts using the given patch. Useful for displaying side-by-side
-     * diff.
-     *
-     * @param original the original text
-     * @param patch the given patch
-     * @return the DiffRows between original and revised texts
-     */
-    public List generateDiffRows(final List original, Patch patch) {
-        List diffRows = new ArrayList<>();
-        int endPos = 0;
-        final List> deltaList = patch.getDeltas();
-
-        if (decompressDeltas) {
-            for (AbstractDelta originalDelta : deltaList) {
-                for (AbstractDelta delta : decompressDeltas(originalDelta)) {
-                    endPos = transformDeltaIntoDiffRow(original, endPos, diffRows, delta);
-                }
-            }
-        } else {
-            for (AbstractDelta delta : deltaList) {
-                endPos = transformDeltaIntoDiffRow(original, endPos, diffRows, delta);
-            }
-        }
-
-        // Copy the final matching chunk if any.
-        for (String line : original.subList(endPos, original.size())) {
-            diffRows.add(buildDiffRow(Tag.EQUAL, line, line));
-        }
-        return diffRows;
-    }
-
-    /**
-     * Transforms one patch delta into a DiffRow object.
-     */
-    private int transformDeltaIntoDiffRow(final List original, int endPos, List diffRows, AbstractDelta delta) {
-        Chunk orig = delta.getSource();
-        Chunk rev = delta.getTarget();
-
-        for (String line : original.subList(endPos, orig.getPosition())) {
-            diffRows.add(buildDiffRow(Tag.EQUAL, line, line));
-        }
-
-        switch (delta.getType()) {
-            case INSERT:
-                for (String line : rev.getLines()) {
-                    diffRows.add(buildDiffRow(Tag.INSERT, "", line));
-                }
-                break;
-            case DELETE:
-                for (String line : orig.getLines()) {
-                    diffRows.add(buildDiffRow(Tag.DELETE, line, ""));
-                }
-                break;
-            default:
-                if (showInlineDiffs) {
-                    diffRows.addAll(generateInlineDiffs(delta));
-                } else {
-                    for (int j = 0; j < Math.max(orig.size(), rev.size()); j++) {
-                        diffRows.add(buildDiffRow(Tag.CHANGE,
-                                orig.getLines().size() > j ? orig.getLines().get(j) : "",
-                                rev.getLines().size() > j ? rev.getLines().get(j) : ""));
-                    }
-                }
-        }
-
-        return orig.last() + 1;
-    }
-
-    /**
-     * Decompresses ChangeDeltas with different source and target size to a
-     * ChangeDelta with same size and a following InsertDelta or DeleteDelta.
-     * With this problems of building DiffRows getting smaller.
-     *
-     * @param deltaList
-     */
-    private List> decompressDeltas(AbstractDelta delta) {
-        if (delta.getType() == DeltaType.CHANGE && delta.getSource().size() != delta.getTarget().size()) {
-            List> deltas = new ArrayList<>();
-            //System.out.println("decompress this " + delta);
-
-            int minSize = Math.min(delta.getSource().size(), delta.getTarget().size());
-            Chunk orig = delta.getSource();
-            Chunk rev = delta.getTarget();
-
-            deltas.add(new ChangeDelta(
-                    new Chunk<>(orig.getPosition(), orig.getLines().subList(0, minSize)),
-                    new Chunk<>(rev.getPosition(), rev.getLines().subList(0, minSize))));
-
-            if (orig.getLines().size() < rev.getLines().size()) {
-                deltas.add(new InsertDelta(
-                        new Chunk<>(orig.getPosition() + minSize, Collections.emptyList()),
-                        new Chunk<>(rev.getPosition() + minSize, rev.getLines().subList(minSize, rev.getLines().size()))));
-            } else {
-                deltas.add(new DeleteDelta(
-                        new Chunk<>(orig.getPosition() + minSize, orig.getLines().subList(minSize, orig.getLines().size())),
-                        new Chunk<>(rev.getPosition() + minSize, Collections.emptyList())));
-            }
-            return deltas;
-        }
-
-        return Collections.singletonList(delta);
-    }
-
-    private DiffRow buildDiffRow(Tag type, String orgline, String newline) {
-        if (reportLinesUnchanged) {
-            return new DiffRow(type, orgline, newline);
-        } else {
-            String wrapOrg = preprocessLine(orgline);
-            if (Tag.DELETE == type) {
-                if (mergeOriginalRevised || showInlineDiffs) {
-                    wrapOrg = oldTag.apply(type, true) + wrapOrg + oldTag.apply(type, false);
-                }
-            }
-            String wrapNew = preprocessLine(newline);
-            if (Tag.INSERT == type) {
-                if (mergeOriginalRevised) {
-                    wrapOrg = newTag.apply(type, true) + wrapNew + newTag.apply(type, false);
-                } else if (showInlineDiffs) {
-                    wrapNew = newTag.apply(type, true) + wrapNew + newTag.apply(type, false);
-                }
-            }
-            return new DiffRow(type, wrapOrg, wrapNew);
-        }
-    }
-
-    private DiffRow buildDiffRowWithoutNormalizing(Tag type, String orgline, String newline) {
-        return new DiffRow(type,
-                StringUtils.wrapText(orgline, columnWidth),
-                StringUtils.wrapText(newline, columnWidth));
-    }
-
-    List normalizeLines(List list) {
-        return reportLinesUnchanged
-                ? list
-                : list.stream()
-                        .map(lineNormalizer::apply)
-                        .collect(toList());
-    }
-
-    /**
-     * Add the inline diffs for given delta
-     *
-     * @param delta the given delta
-     */
-    private List generateInlineDiffs(AbstractDelta delta) {
-        List orig = normalizeLines(delta.getSource().getLines());
-        List rev = normalizeLines(delta.getTarget().getLines());
-        List origList;
-        List revList;
-        String joinedOrig = String.join("\n", orig);
-        String joinedRev = String.join("\n", rev);
-
-        origList = inlineDiffSplitter.apply(joinedOrig);
-        revList = inlineDiffSplitter.apply(joinedRev);
-
-        List> originalInlineDeltas = DiffUtils.diff(origList, revList, equalizer)
-                .getDeltas();
-        List> inlineDeltas = inlineDeltaMerger
-                .apply(new InlineDeltaMergeInfo(originalInlineDeltas, origList, revList));
-
-        Collections.reverse(inlineDeltas);
-        for (AbstractDelta inlineDelta : inlineDeltas) {
-            Chunk inlineOrig = inlineDelta.getSource();
-            Chunk inlineRev = inlineDelta.getTarget();
-            if (inlineDelta.getType() == DeltaType.DELETE) {
-                wrapInTag(origList, inlineOrig.getPosition(), inlineOrig
-                        .getPosition()
-                        + inlineOrig.size(), Tag.DELETE, oldTag, processDiffs, replaceOriginalLinefeedInChangesWithSpaces && mergeOriginalRevised);
-            } else if (inlineDelta.getType() == DeltaType.INSERT) {
-                if (mergeOriginalRevised) {
-                    origList.addAll(inlineOrig.getPosition(),
-                            revList.subList(inlineRev.getPosition(),
-                                    inlineRev.getPosition() + inlineRev.size()));
-                    wrapInTag(origList, inlineOrig.getPosition(),
-                            inlineOrig.getPosition() + inlineRev.size(),
-                            Tag.INSERT, newTag, processDiffs, false);
-                } else {
-                    wrapInTag(revList, inlineRev.getPosition(),
-                            inlineRev.getPosition() + inlineRev.size(),
-                            Tag.INSERT, newTag, processDiffs, false);
-                }
-            } else if (inlineDelta.getType() == DeltaType.CHANGE) {
-                if (mergeOriginalRevised) {
-                    origList.addAll(inlineOrig.getPosition() + inlineOrig.size(),
-                            revList.subList(inlineRev.getPosition(),
-                                    inlineRev.getPosition() + inlineRev.size()));
-                    wrapInTag(origList, inlineOrig.getPosition() + inlineOrig.size(),
-                            inlineOrig.getPosition() + inlineOrig.size() + inlineRev.size(),
-                            Tag.CHANGE, newTag, processDiffs, false);
-                } else {
-                    wrapInTag(revList, inlineRev.getPosition(),
-                            inlineRev.getPosition() + inlineRev.size(),
-                            Tag.CHANGE, newTag, processDiffs, false);
-                }
-                wrapInTag(origList, inlineOrig.getPosition(),
-                        inlineOrig.getPosition() + inlineOrig.size(),
-                        Tag.CHANGE, oldTag, processDiffs, replaceOriginalLinefeedInChangesWithSpaces && mergeOriginalRevised);
-            }
-        }
-        StringBuilder origResult = new StringBuilder();
-        StringBuilder revResult = new StringBuilder();
-        for (String character : origList) {
-            origResult.append(character);
-        }
-        for (String character : revList) {
-            revResult.append(character);
-        }
-
-        List original = Arrays.asList(origResult.toString().split("\n"));
-        List revised = Arrays.asList(revResult.toString().split("\n"));
-        List diffRows = new ArrayList<>();
-        for (int j = 0; j < Math.max(original.size(), revised.size()); j++) {
-            diffRows.
-                    add(buildDiffRowWithoutNormalizing(Tag.CHANGE,
-                            original.size() > j ? original.get(j) : "",
-                            revised.size() > j ? revised.get(j) : ""));
-        }
-        return diffRows;
-    }
-
-    private String preprocessLine(String line) {
-        if (columnWidth == 0) {
-            return lineNormalizer.apply(line);
-        } else {
-            return StringUtils.wrapText(lineNormalizer.apply(line), columnWidth);
-        }
-    }
-
-    /**
-     * This class used for building the DiffRowGenerator.
-     *
-     * @author dmitry
-     *
-     */
-    public static class Builder {
-
-        private boolean showInlineDiffs = false;
-        private boolean ignoreWhiteSpaces = false;
-        private boolean decompressDeltas = true;
-
-        private BiFunction oldTag
-                = (tag, f) -> f ? "" : "";
-        private BiFunction newTag
-                = (tag, f) -> f ? "" : "";
-
-        private int columnWidth = 0;
-        private boolean mergeOriginalRevised = false;
-        private boolean reportLinesUnchanged = false;
-        private Function> inlineDiffSplitter = SPLITTER_BY_CHARACTER;
-        private Function lineNormalizer = LINE_NORMALIZER_FOR_HTML;
-        private Function processDiffs = null;
-        private BiPredicate equalizer = null;
-        private boolean replaceOriginalLinefeedInChangesWithSpaces = false;
-        private Function>> inlineDeltaMerger = DEFAULT_INLINE_DELTA_MERGER;
-
-        private Builder() {
-        }
-
-        /**
-         * Show inline diffs in generating diff rows or not.
-         *
-         * @param val the value to set. Default: false.
-         * @return builder with configured showInlineDiff parameter
-         */
-        public Builder showInlineDiffs(boolean val) {
-            showInlineDiffs = val;
-            return this;
-        }
-
-        /**
-         * Ignore white spaces in generating diff rows or not.
-         *
-         * @param val the value to set. Default: true.
-         * @return builder with configured ignoreWhiteSpaces parameter
-         */
-        public Builder ignoreWhiteSpaces(boolean val) {
-            ignoreWhiteSpaces = val;
-            return this;
-        }
-
-        /**
-         * Report all lines without markup on the old or new text.
-         *
-         * @param val the value to set. Default: false.
-         * @return builder with configured reportLinesUnchanged parameter
-         */
-        public Builder reportLinesUnchanged(final boolean val) {
-            reportLinesUnchanged = val;
-            return this;
-        }
-
-        /**
-         * Generator for Old-Text-Tags.
-         *
-         * @param generator the tag generator
-         * @return builder with configured ignoreBlankLines parameter
-         */
-        public Builder oldTag(BiFunction generator) {
-            this.oldTag = generator;
-            return this;
-        }
-
-        /**
-         * Generator for Old-Text-Tags.
-         *
-         * @param generator the tag generator
-         * @return builder with configured ignoreBlankLines parameter
-         */
-        public Builder oldTag(Function generator) {
-            this.oldTag = (tag, f) -> generator.apply(f);
-            return this;
-        }
-
-        /**
-         * Generator for New-Text-Tags.
-         *
-         * @param generator
-         * @return
-         */
-        public Builder newTag(BiFunction generator) {
-            this.newTag = generator;
-            return this;
-        }
-
-        /**
-         * Generator for New-Text-Tags.
-         *
-         * @param generator
-         * @return
-         */
-        public Builder newTag(Function generator) {
-            this.newTag = (tag, f) -> generator.apply(f);
-            return this;
-        }
-
-        /**
-         * Processor for diffed text parts. Here e.g. whitecharacters could be
-         * replaced by something visible.
-         *
-         * @param processDiffs
-         * @return
-         */
-        public Builder processDiffs(Function processDiffs) {
-            this.processDiffs = processDiffs;
-            return this;
-        }
-
-        /**
-         * Set the column width of generated lines of original and revised
-         * texts.
-         *
-         * @param width the width to set. Making it < 0 doesn't make any
-         * sense. Default 80.
-         * @return builder with config of column width
-         */
-        public Builder columnWidth(int width) {
-            if (width >= 0) {
-                columnWidth = width;
-            }
-            return this;
-        }
-
-        /**
-         * Build the DiffRowGenerator. If some parameters is not set, the
-         * default values are used.
-         *
-         * @return the customized DiffRowGenerator
-         */
-        public DiffRowGenerator build() {
-            return new DiffRowGenerator(this);
-        }
-
-        /**
-         * Merge the complete result within the original text. This makes sense
-         * for one line display.
-         *
-         * @param mergeOriginalRevised
-         * @return
-         */
-        public Builder mergeOriginalRevised(boolean mergeOriginalRevised) {
-            this.mergeOriginalRevised = mergeOriginalRevised;
-            return this;
-        }
-
-        /**
-         * Deltas could be in a state, that would produce some unreasonable
-         * results within an inline diff. So the deltas are decompressed into
-         * smaller parts and rebuild. But this could result in more differences.
-         *
-         * @param decompressDeltas
-         * @return
-         */
-        public Builder decompressDeltas(boolean decompressDeltas) {
-            this.decompressDeltas = decompressDeltas;
-            return this;
-        }
-
-        /**
-         * Per default each character is separatly processed. This variant
-         * introduces processing by word, which does not deliver in word
-         * changes. Therefore the whole word will be tagged as changed:
-         *
-         * 
-         * false:    (aBa : aba) --  changed: a(B)a : a(b)a
-         * true:     (aBa : aba) --  changed: (aBa) : (aba)
-         * 

-         */
-        public Builder inlineDiffByWord(boolean inlineDiffByWord) {
-            inlineDiffSplitter = inlineDiffByWord ? SPLITTER_BY_WORD : SPLITTER_BY_CHARACTER;
-            return this;
-        }
-
-        /**
-         * To provide some customized splitting a splitter can be provided. Here
-         * someone could think about sentence splitter, comma splitter or stuff
-         * like that.
-         *
-         * @param inlineDiffSplitter
-         * @return
-         */
-        public Builder inlineDiffBySplitter(Function> inlineDiffSplitter) {
-            this.inlineDiffSplitter = inlineDiffSplitter;
-            return this;
-        }
-
-        /**
-         * By default DiffRowGenerator preprocesses lines for HTML output. Tabs
-         * and special HTML characters like "<" are replaced with its encoded
-         * value. To change this you can provide a customized line normalizer
-         * here.
-         *
-         * @param lineNormalizer
-         * @return
-         */
-        public Builder lineNormalizer(Function lineNormalizer) {
-            this.lineNormalizer = lineNormalizer;
-            return this;
-        }
-
-        /**
-         * Provide an equalizer for diff processing.
-         *
-         * @param equalizer equalizer for diff processing.
-         * @return builder with configured equalizer parameter
-         */
-        public Builder equalizer(BiPredicate equalizer) {
-            this.equalizer = equalizer;
-            return this;
-        }
-
-        /**
-         * Sometimes it happens that a change contains multiple lines. If there
-         * is no correspondence in old and new. To keep the merged line more
-         * readable the linefeeds could be replaced by spaces.
-         *
-         * @param replace
-         * @return
-         */
-        public Builder replaceOriginalLinefeedInChangesWithSpaces(boolean replace) {
-            this.replaceOriginalLinefeedInChangesWithSpaces = replace;
-            return this;
-        }
-
-        /**
-         * Provide an inline delta merger for use case specific delta optimizations.
-         *
-         * @param inlineDeltaMerger
-         * @return
-         */
-        public Builder inlineDeltaMerger(
-                Function>> inlineDeltaMerger) {
-            this.inlineDeltaMerger = inlineDeltaMerger;
-            return this;
-        }
-    }
+		public static final BiPredicate DEFAULT_EQUALIZER = Object::equals;
+
+		public static final BiPredicate IGNORE_WHITESPACE_EQUALIZER =
+						(original, revised) -> adjustWhitespace(original).equals(adjustWhitespace(revised));
+
+		public static final Function LINE_NORMALIZER_FOR_HTML = StringUtils::normalize;
+
+		/**
+		 * Splitting lines by character to achieve char by char diff checking.
+		 */
+		public static final Function> SPLITTER_BY_CHARACTER = line -> {
+				List list = new ArrayList<>(line.length());
+				for (Character character : line.toCharArray()) {
+						list.add(character.toString());
+				}
+				return list;
+		};
+
+		public static final Pattern SPLIT_BY_WORD_PATTERN = Pattern.compile("\\s+|[,.\\[\\](){}/\\\\*+\\-#<>;:&\\']+");
+
+		/**
+		 * Splitting lines by word to achieve word by word diff checking.
+		 */
+		public static final Function> SPLITTER_BY_WORD =
+						line -> splitStringPreserveDelimiter(line, SPLIT_BY_WORD_PATTERN);
+
+		public static final Pattern WHITESPACE_PATTERN = Pattern.compile("\\s+");
+
+		public static final Function>> DEFAULT_INLINE_DELTA_MERGER =
+						InlineDeltaMergeInfo::getDeltas;
+
+		/**
+		 * Merge diffs which are separated by equalities consisting of whitespace only.
+		 */
+		public static final Function>> WHITESPACE_EQUALITIES_MERGER =
+						deltaMergeInfo -> DeltaMergeUtils.mergeInlineDeltas(deltaMergeInfo, equalities -> equalities.stream()
+										.allMatch(s -> s == null || s.replaceAll("\\s+", "").equals("")));
+
+		public static Builder create() {
+				return new Builder();
+		}
+
+		private static String adjustWhitespace(String raw) {
+				return WHITESPACE_PATTERN.matcher(raw.trim()).replaceAll(" ");
+		}
+
+		protected static final List splitStringPreserveDelimiter(String str, Pattern SPLIT_PATTERN) {
+				List list = new ArrayList<>();
+				if (str != null) {
+						Matcher matcher = SPLIT_PATTERN.matcher(str);
+						int pos = 0;
+						while (matcher.find()) {
+								if (pos < matcher.start()) {
+										list.add(str.substring(pos, matcher.start()));
+								}
+								list.add(matcher.group());
+								pos = matcher.end();
+						}
+						if (pos < str.length()) {
+								list.add(str.substring(pos));
+						}
+				}
+				return list;
+		}
+
+		/**
+		 * Wrap the elements in the sequence with the given tag
+		 *
+		 * @param startPosition the position from which tag should start. The
+		 * counting start from a zero.
+		 * @param endPosition the position before which tag should should be closed.
+		 * @param tagGenerator the tag generator
+		 */
+		static void wrapInTag(
+						List sequence,
+						int startPosition,
+						int endPosition,
+						Tag tag,
+						BiFunction tagGenerator,
+						Function processDiffs,
+						boolean replaceLinefeedWithSpace) {
+				int endPos = endPosition;
+
+				while (endPos >= startPosition) {
+
+						// search position for end tag
+						while (endPos > startPosition) {
+								if (!"\n".equals(sequence.get(endPos - 1))) {
+										break;
+								} else if (replaceLinefeedWithSpace) {
+										sequence.set(endPos - 1, " ");
+										break;
+								}
+								endPos--;
+						}
+
+						if (endPos == startPosition) {
+								break;
+						}
+
+						sequence.add(endPos, tagGenerator.apply(tag, false));
+						if (processDiffs != null) {
+								sequence.set(endPos - 1, processDiffs.apply(sequence.get(endPos - 1)));
+						}
+						endPos--;
+
+						// search position for end tag
+						while (endPos > startPosition) {
+								if ("\n".equals(sequence.get(endPos - 1))) {
+										if (replaceLinefeedWithSpace) {
+												sequence.set(endPos - 1, " ");
+										} else {
+												break;
+										}
+								}
+								if (processDiffs != null) {
+										sequence.set(endPos - 1, processDiffs.apply(sequence.get(endPos - 1)));
+								}
+								endPos--;
+						}
+
+						sequence.add(endPos, tagGenerator.apply(tag, true));
+						endPos--;
+				}
+		}
+
+		private final int columnWidth;
+		private final BiPredicate equalizer;
+		private final boolean ignoreWhiteSpaces;
+		private final Function> inlineDiffSplitter;
+		private final boolean mergeOriginalRevised;
+		private final BiFunction newTag;
+		private final BiFunction oldTag;
+		private final boolean reportLinesUnchanged;
+		private final Function lineNormalizer;
+		private final Function processDiffs;
+		private final Function>> inlineDeltaMerger;
+
+		private final boolean showInlineDiffs;
+		private final boolean replaceOriginalLinefeedInChangesWithSpaces;
+		private final boolean decompressDeltas;
+
+		private DiffRowGenerator(Builder builder) {
+				showInlineDiffs = builder.showInlineDiffs;
+				ignoreWhiteSpaces = builder.ignoreWhiteSpaces;
+				oldTag = builder.oldTag;
+				newTag = builder.newTag;
+				columnWidth = builder.columnWidth;
+				mergeOriginalRevised = builder.mergeOriginalRevised;
+				inlineDiffSplitter = builder.inlineDiffSplitter;
+				decompressDeltas = builder.decompressDeltas;
+
+				if (builder.equalizer != null) {
+						equalizer = builder.equalizer;
+				} else {
+						equalizer = ignoreWhiteSpaces ? IGNORE_WHITESPACE_EQUALIZER : DEFAULT_EQUALIZER;
+				}
+
+				reportLinesUnchanged = builder.reportLinesUnchanged;
+				lineNormalizer = builder.lineNormalizer;
+				processDiffs = builder.processDiffs;
+				inlineDeltaMerger = builder.inlineDeltaMerger;
+
+				replaceOriginalLinefeedInChangesWithSpaces = builder.replaceOriginalLinefeedInChangesWithSpaces;
+
+				Objects.requireNonNull(inlineDiffSplitter);
+				Objects.requireNonNull(lineNormalizer);
+				Objects.requireNonNull(inlineDeltaMerger);
+		}
+
+		/**
+		 * Get the DiffRows describing the difference between original and revised
+		 * texts using the given patch. Useful for displaying side-by-side diff.
+		 *
+		 * @param original the original text
+		 * @param revised the revised text
+		 * @return the DiffRows between original and revised texts
+		 */
+		public List generateDiffRows(List original, List revised) {
+				return generateDiffRows(original, DiffUtils.diff(original, revised, equalizer));
+		}
+
+		/**
+		 * Generates the DiffRows describing the difference between original and
+		 * revised texts using the given patch. Useful for displaying side-by-side
+		 * diff.
+		 *
+		 * @param original the original text
+		 * @param patch the given patch
+		 * @return the DiffRows between original and revised texts
+		 */
+		public List generateDiffRows(final List original, Patch patch) {
+				List diffRows = new ArrayList<>();
+				int endPos = 0;
+				final List> deltaList = patch.getDeltas();
+
+				if (decompressDeltas) {
+						for (AbstractDelta originalDelta : deltaList) {
+								for (AbstractDelta delta : decompressDeltas(originalDelta)) {
+										endPos = transformDeltaIntoDiffRow(original, endPos, diffRows, delta);
+								}
+						}
+				} else {
+						for (AbstractDelta delta : deltaList) {
+								endPos = transformDeltaIntoDiffRow(original, endPos, diffRows, delta);
+						}
+				}
+
+				// Copy the final matching chunk if any.
+				for (String line : original.subList(endPos, original.size())) {
+						diffRows.add(buildDiffRow(Tag.EQUAL, line, line));
+				}
+				return diffRows;
+		}
+
+		/**
+		 * Transforms one patch delta into a DiffRow object.
+		 */
+		private int transformDeltaIntoDiffRow(
+						final List original, int endPos, List diffRows, AbstractDelta delta) {
+				Chunk orig = delta.getSource();
+				Chunk rev = delta.getTarget();
+
+				for (String line : original.subList(endPos, orig.getPosition())) {
+						diffRows.add(buildDiffRow(Tag.EQUAL, line, line));
+				}
+
+				switch (delta.getType()) {
+						case INSERT:
+								for (String line : rev.getLines()) {
+										diffRows.add(buildDiffRow(Tag.INSERT, "", line));
+								}
+								break;
+						case DELETE:
+								for (String line : orig.getLines()) {
+										diffRows.add(buildDiffRow(Tag.DELETE, line, ""));
+								}
+								break;
+						default:
+								if (showInlineDiffs) {
+										diffRows.addAll(generateInlineDiffs(delta));
+								} else {
+										for (int j = 0; j < Math.max(orig.size(), rev.size()); j++) {
+												diffRows.add(buildDiffRow(
+																Tag.CHANGE,
+																orig.getLines().size() > j ? orig.getLines().get(j) : "",
+																rev.getLines().size() > j ? rev.getLines().get(j) : ""));
+										}
+								}
+				}
+
+				return orig.last() + 1;
+		}
+
+		/**
+		 * Decompresses ChangeDeltas with different source and target size to a
+		 * ChangeDelta with same size and a following InsertDelta or DeleteDelta.
+		 * With this problems of building DiffRows getting smaller.
+		 *
+		 * @param deltaList
+		 */
+		private List> decompressDeltas(AbstractDelta delta) {
+				if (delta.getType() == DeltaType.CHANGE
+								&& delta.getSource().size() != delta.getTarget().size()) {
+						List> deltas = new ArrayList<>();
+						// System.out.println("decompress this " + delta);
+
+						int minSize = Math.min(delta.getSource().size(), delta.getTarget().size());
+						Chunk orig = delta.getSource();
+						Chunk rev = delta.getTarget();
+
+						deltas.add(new ChangeDelta(
+										new Chunk<>(orig.getPosition(), orig.getLines().subList(0, minSize)),
+										new Chunk<>(rev.getPosition(), rev.getLines().subList(0, minSize))));
+
+						if (orig.getLines().size() < rev.getLines().size()) {
+								deltas.add(new InsertDelta(
+												new Chunk<>(orig.getPosition() + minSize, Collections.emptyList()),
+												new Chunk<>(
+																rev.getPosition() + minSize,
+																rev.getLines().subList(minSize, rev.getLines().size()))));
+						} else {
+								deltas.add(new DeleteDelta(
+												new Chunk<>(
+																orig.getPosition() + minSize,
+																orig.getLines().subList(minSize, orig.getLines().size())),
+												new Chunk<>(rev.getPosition() + minSize, Collections.emptyList())));
+						}
+						return deltas;
+				}
+
+				return Collections.singletonList(delta);
+		}
+
+		private DiffRow buildDiffRow(Tag type, String orgline, String newline) {
+				if (reportLinesUnchanged) {
+						return new DiffRow(type, orgline, newline);
+				} else {
+						String wrapOrg = preprocessLine(orgline);
+						if (Tag.DELETE == type) {
+								if (mergeOriginalRevised || showInlineDiffs) {
+										wrapOrg = oldTag.apply(type, true) + wrapOrg + oldTag.apply(type, false);
+								}
+						}
+						String wrapNew = preprocessLine(newline);
+						if (Tag.INSERT == type) {
+								if (mergeOriginalRevised) {
+										wrapOrg = newTag.apply(type, true) + wrapNew + newTag.apply(type, false);
+								} else if (showInlineDiffs) {
+										wrapNew = newTag.apply(type, true) + wrapNew + newTag.apply(type, false);
+								}
+						}
+						return new DiffRow(type, wrapOrg, wrapNew);
+				}
+		}
+
+		private DiffRow buildDiffRowWithoutNormalizing(Tag type, String orgline, String newline) {
+				return new DiffRow(
+								type, StringUtils.wrapText(orgline, columnWidth), StringUtils.wrapText(newline, columnWidth));
+		}
+
+		List normalizeLines(List list) {
+				return reportLinesUnchanged
+								? list
+								: list.stream().map(lineNormalizer::apply).collect(toList());
+		}
+
+		/**
+		 * Add the inline diffs for given delta
+		 *
+		 * @param delta the given delta
+		 */
+		private List generateInlineDiffs(AbstractDelta delta) {
+				List orig = normalizeLines(delta.getSource().getLines());
+				List rev = normalizeLines(delta.getTarget().getLines());
+				List origList;
+				List revList;
+				String joinedOrig = String.join("\n", orig);
+				String joinedRev = String.join("\n", rev);
+
+				origList = inlineDiffSplitter.apply(joinedOrig);
+				revList = inlineDiffSplitter.apply(joinedRev);
+
+				List> originalInlineDeltas =
+								DiffUtils.diff(origList, revList, equalizer).getDeltas();
+				List> inlineDeltas =
+								inlineDeltaMerger.apply(new InlineDeltaMergeInfo(originalInlineDeltas, origList, revList));
+
+				Collections.reverse(inlineDeltas);
+				for (AbstractDelta inlineDelta : inlineDeltas) {
+						Chunk inlineOrig = inlineDelta.getSource();
+						Chunk inlineRev = inlineDelta.getTarget();
+						if (inlineDelta.getType() == DeltaType.DELETE) {
+								wrapInTag(
+												origList,
+												inlineOrig.getPosition(),
+												inlineOrig.getPosition() + inlineOrig.size(),
+												Tag.DELETE,
+												oldTag,
+												processDiffs,
+												replaceOriginalLinefeedInChangesWithSpaces && mergeOriginalRevised);
+						} else if (inlineDelta.getType() == DeltaType.INSERT) {
+								if (mergeOriginalRevised) {
+										origList.addAll(
+														inlineOrig.getPosition(),
+														revList.subList(inlineRev.getPosition(), inlineRev.getPosition() + inlineRev.size()));
+										wrapInTag(
+														origList,
+														inlineOrig.getPosition(),
+														inlineOrig.getPosition() + inlineRev.size(),
+														Tag.INSERT,
+														newTag,
+														processDiffs,
+														false);
+								} else {
+										wrapInTag(
+														revList,
+														inlineRev.getPosition(),
+														inlineRev.getPosition() + inlineRev.size(),
+														Tag.INSERT,
+														newTag,
+														processDiffs,
+														false);
+								}
+						} else if (inlineDelta.getType() == DeltaType.CHANGE) {
+								if (mergeOriginalRevised) {
+										origList.addAll(
+														inlineOrig.getPosition() + inlineOrig.size(),
+														revList.subList(inlineRev.getPosition(), inlineRev.getPosition() + inlineRev.size()));
+										wrapInTag(
+														origList,
+														inlineOrig.getPosition() + inlineOrig.size(),
+														inlineOrig.getPosition() + inlineOrig.size() + inlineRev.size(),
+														Tag.CHANGE,
+														newTag,
+														processDiffs,
+														false);
+								} else {
+										wrapInTag(
+														revList,
+														inlineRev.getPosition(),
+														inlineRev.getPosition() + inlineRev.size(),
+														Tag.CHANGE,
+														newTag,
+														processDiffs,
+														false);
+								}
+								wrapInTag(
+												origList,
+												inlineOrig.getPosition(),
+												inlineOrig.getPosition() + inlineOrig.size(),
+												Tag.CHANGE,
+												oldTag,
+												processDiffs,
+												replaceOriginalLinefeedInChangesWithSpaces && mergeOriginalRevised);
+						}
+				}
+				StringBuilder origResult = new StringBuilder();
+				StringBuilder revResult = new StringBuilder();
+				for (String character : origList) {
+						origResult.append(character);
+				}
+				for (String character : revList) {
+						revResult.append(character);
+				}
+
+				List original = Arrays.asList(origResult.toString().split("\n"));
+				List revised = Arrays.asList(revResult.toString().split("\n"));
+				List diffRows = new ArrayList<>();
+				for (int j = 0; j < Math.max(original.size(), revised.size()); j++) {
+						diffRows.add(buildDiffRowWithoutNormalizing(
+										Tag.CHANGE, original.size() > j ? original.get(j) : "", revised.size() > j ? revised.get(j) : ""));
+				}
+				return diffRows;
+		}
+
+		private String preprocessLine(String line) {
+				if (columnWidth == 0) {
+						return lineNormalizer.apply(line);
+				} else {
+						return StringUtils.wrapText(lineNormalizer.apply(line), columnWidth);
+				}
+		}
+
+		/**
+		 * This class used for building the DiffRowGenerator.
+		 *
+		 * @author dmitry
+		 *
+		 */
+		public static class Builder {
+
+				private boolean showInlineDiffs = false;
+				private boolean ignoreWhiteSpaces = false;
+				private boolean decompressDeltas = true;
+
+				private BiFunction oldTag = (tag, f) -> f ? "" : "";
+				private BiFunction newTag = (tag, f) -> f ? "" : "";
+
+				private int columnWidth = 0;
+				private boolean mergeOriginalRevised = false;
+				private boolean reportLinesUnchanged = false;
+				private Function> inlineDiffSplitter = SPLITTER_BY_CHARACTER;
+				private Function lineNormalizer = LINE_NORMALIZER_FOR_HTML;
+				private Function processDiffs = null;
+				private BiPredicate equalizer = null;
+				private boolean replaceOriginalLinefeedInChangesWithSpaces = false;
+				private Function>> inlineDeltaMerger =
+								DEFAULT_INLINE_DELTA_MERGER;
+
+				private Builder() {}
+
+				/**
+				 * Show inline diffs in generating diff rows or not.
+				 *
+				 * @param val the value to set. Default: false.
+				 * @return builder with configured showInlineDiff parameter
+				 */
+				public Builder showInlineDiffs(boolean val) {
+						showInlineDiffs = val;
+						return this;
+				}
+
+				/**
+				 * Ignore white spaces in generating diff rows or not.
+				 *
+				 * @param val the value to set. Default: true.
+				 * @return builder with configured ignoreWhiteSpaces parameter
+				 */
+				public Builder ignoreWhiteSpaces(boolean val) {
+						ignoreWhiteSpaces = val;
+						return this;
+				}
+
+				/**
+				 * Report all lines without markup on the old or new text.
+				 *
+				 * @param val the value to set. Default: false.
+				 * @return builder with configured reportLinesUnchanged parameter
+				 */
+				public Builder reportLinesUnchanged(final boolean val) {
+						reportLinesUnchanged = val;
+						return this;
+				}
+
+				/**
+				 * Generator for Old-Text-Tags.
+				 *
+				 * @param generator the tag generator
+				 * @return builder with configured ignoreBlankLines parameter
+				 */
+				public Builder oldTag(BiFunction generator) {
+						this.oldTag = generator;
+						return this;
+				}
+
+				/**
+				 * Generator for Old-Text-Tags.
+				 *
+				 * @param generator the tag generator
+				 * @return builder with configured ignoreBlankLines parameter
+				 */
+				public Builder oldTag(Function generator) {
+						this.oldTag = (tag, f) -> generator.apply(f);
+						return this;
+				}
+
+				/**
+				 * Generator for New-Text-Tags.
+				 *
+				 * @param generator
+				 * @return
+				 */
+				public Builder newTag(BiFunction generator) {
+						this.newTag = generator;
+						return this;
+				}
+
+				/**
+				 * Generator for New-Text-Tags.
+				 *
+				 * @param generator
+				 * @return
+				 */
+				public Builder newTag(Function generator) {
+						this.newTag = (tag, f) -> generator.apply(f);
+						return this;
+				}
+
+				/**
+				 * Processor for diffed text parts. Here e.g. whitecharacters could be
+				 * replaced by something visible.
+				 *
+				 * @param processDiffs
+				 * @return
+				 */
+				public Builder processDiffs(Function processDiffs) {
+						this.processDiffs = processDiffs;
+						return this;
+				}
+
+				/**
+				 * Set the column width of generated lines of original and revised
+				 * texts.
+				 *
+				 * @param width the width to set. Making it < 0 doesn't make any
+				 * sense. Default 80.
+				 * @return builder with config of column width
+				 */
+				public Builder columnWidth(int width) {
+						if (width >= 0) {
+								columnWidth = width;
+						}
+						return this;
+				}
+
+				/**
+				 * Build the DiffRowGenerator. If some parameters is not set, the
+				 * default values are used.
+				 *
+				 * @return the customized DiffRowGenerator
+				 */
+				public DiffRowGenerator build() {
+						return new DiffRowGenerator(this);
+				}
+
+				/**
+				 * Merge the complete result within the original text. This makes sense
+				 * for one line display.
+				 *
+				 * @param mergeOriginalRevised
+				 * @return
+				 */
+				public Builder mergeOriginalRevised(boolean mergeOriginalRevised) {
+						this.mergeOriginalRevised = mergeOriginalRevised;
+						return this;
+				}
+
+				/**
+				 * Deltas could be in a state, that would produce some unreasonable
+				 * results within an inline diff. So the deltas are decompressed into
+				 * smaller parts and rebuild. But this could result in more differences.
+				 *
+				 * @param decompressDeltas
+				 * @return
+				 */
+				public Builder decompressDeltas(boolean decompressDeltas) {
+						this.decompressDeltas = decompressDeltas;
+						return this;
+				}
+
+				/**
+				 * Per default each character is separatly processed. This variant
+				 * introduces processing by word, which does not deliver in word
+				 * changes. Therefore the whole word will be tagged as changed:
+				 *
+				 * 
+				 * false:    (aBa : aba) --  changed: a(B)a : a(b)a
+				 * true:     (aBa : aba) --  changed: (aBa) : (aba)
+				 * 

+				 */
+				public Builder inlineDiffByWord(boolean inlineDiffByWord) {
+						inlineDiffSplitter = inlineDiffByWord ? SPLITTER_BY_WORD : SPLITTER_BY_CHARACTER;
+						return this;
+				}
+
+				/**
+				 * To provide some customized splitting a splitter can be provided. Here
+				 * someone could think about sentence splitter, comma splitter or stuff
+				 * like that.
+				 *
+				 * @param inlineDiffSplitter
+				 * @return
+				 */
+				public Builder inlineDiffBySplitter(Function> inlineDiffSplitter) {
+						this.inlineDiffSplitter = inlineDiffSplitter;
+						return this;
+				}
+
+				/**
+				 * By default DiffRowGenerator preprocesses lines for HTML output. Tabs
+				 * and special HTML characters like "<" are replaced with its encoded
+				 * value. To change this you can provide a customized line normalizer
+				 * here.
+				 *
+				 * @param lineNormalizer
+				 * @return
+				 */
+				public Builder lineNormalizer(Function lineNormalizer) {
+						this.lineNormalizer = lineNormalizer;
+						return this;
+				}
+
+				/**
+				 * Provide an equalizer for diff processing.
+				 *
+				 * @param equalizer equalizer for diff processing.
+				 * @return builder with configured equalizer parameter
+				 */
+				public Builder equalizer(BiPredicate equalizer) {
+						this.equalizer = equalizer;
+						return this;
+				}
+
+				/**
+				 * Sometimes it happens that a change contains multiple lines. If there
+				 * is no correspondence in old and new. To keep the merged line more
+				 * readable the linefeeds could be replaced by spaces.
+				 *
+				 * @param replace
+				 * @return
+				 */
+				public Builder replaceOriginalLinefeedInChangesWithSpaces(boolean replace) {
+						this.replaceOriginalLinefeedInChangesWithSpaces = replace;
+						return this;
+				}
+
+				/**
+				 * Provide an inline delta merger for use case specific delta optimizations.
+				 *
+				 * @param inlineDeltaMerger
+				 * @return
+				 */
+				public Builder inlineDeltaMerger(
+								Function>> inlineDeltaMerger) {
+						this.inlineDeltaMerger = inlineDeltaMerger;
+						return this;
+				}
+		}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/StringUtils.java b/java-diff-utils/src/main/java/com/github/difflib/text/StringUtils.java
index b7e35495..2a629b17 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/text/StringUtils.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/StringUtils.java
@@ -15,69 +15,66 @@
  */
 package com.github.difflib.text;
 
-import java.util.List;
 import static java.util.stream.Collectors.toList;
 
+import java.util.List;
+
 final class StringUtils {
 
-    /**
-     * Replaces all opening and closing tags with < or >.
-     *
-     * @param str
-     * @return str with some HTML meta characters escaped.
-     */
-    public static String htmlEntites(String str) {
-        return str.replace("<", "<").replace(">", ">");
-    }
+		/**
+		 * Replaces all opening and closing tags with < or >.
+		 *
+		 * @param str
+		 * @return str with some HTML meta characters escaped.
+		 */
+		public static String htmlEntites(String str) {
+				return str.replace("<", "<").replace(">", ">");
+		}
 
-    public static String normalize(String str) {
-        return htmlEntites(str).replace("\t", "    ");
-    }
+		public static String normalize(String str) {
+				return htmlEntites(str).replace("\t", "    ");
+		}
 
-    public static List wrapText(List list, int columnWidth) {
-        return list.stream()
-                .map(line -> wrapText(line, columnWidth))
-                .collect(toList());
-    }
+		public static List wrapText(List list, int columnWidth) {
+				return list.stream().map(line -> wrapText(line, columnWidth)).collect(toList());
+		}
 
-    /**
-     * Wrap the text with the given column width
-     *
-     * @param line the text
-     * @param columnWidth the given column
-     * @return the wrapped text
-     */
-    public static String wrapText(String line, int columnWidth) {
-        if (columnWidth < 0) {
-            throw new IllegalArgumentException("columnWidth may not be less 0");
-        }
-        if (columnWidth == 0) {
-            return line;
-        }
-        int length = line.length();
-        int delimiter = "
".length();
-        int widthIndex = columnWidth;
+		/**
+		 * Wrap the text with the given column width
+		 *
+		 * @param line the text
+		 * @param columnWidth the given column
+		 * @return the wrapped text
+		 */
+		public static String wrapText(String line, int columnWidth) {
+				if (columnWidth < 0) {
+						throw new IllegalArgumentException("columnWidth may not be less 0");
+				}
+				if (columnWidth == 0) {
+						return line;
+				}
+				int length = line.length();
+				int delimiter = "
".length();
+				int widthIndex = columnWidth;
 
-        StringBuilder b = new StringBuilder(line);
+				StringBuilder b = new StringBuilder(line);
 
-        for (int count = 0; length > widthIndex; count++) {
-            int breakPoint = widthIndex + delimiter * count;
-            if (Character.isHighSurrogate(b.charAt(breakPoint - 1)) &&
-                Character.isLowSurrogate(b.charAt(breakPoint))) {
-              // Shift a breakpoint that would split a supplemental code-point.
-              breakPoint += 1;
-              if (breakPoint == b.length()) {
-                // Break before instead of after if this is the last code-point.
-                breakPoint -= 2;
-              }
-            }
-            b.insert(breakPoint, "
");
-            widthIndex += columnWidth;
-        }
+				for (int count = 0; length > widthIndex; count++) {
+						int breakPoint = widthIndex + delimiter * count;
+						if (Character.isHighSurrogate(b.charAt(breakPoint - 1)) && Character.isLowSurrogate(b.charAt(breakPoint))) {
+								// Shift a breakpoint that would split a supplemental code-point.
+								breakPoint += 1;
+								if (breakPoint == b.length()) {
+										// Break before instead of after if this is the last code-point.
+										breakPoint -= 2;
+								}
+						}
+						b.insert(breakPoint, "
");
+						widthIndex += columnWidth;
+				}
 
-        return b.toString();
-    }
+				return b.toString();
+		}
 
-    private StringUtils() {
-    }
+		private StringUtils() {}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/deltamerge/DeltaMergeUtils.java b/java-diff-utils/src/main/java/com/github/difflib/text/deltamerge/DeltaMergeUtils.java
index b2580957..1e68a637 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/text/deltamerge/DeltaMergeUtils.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/deltamerge/DeltaMergeUtils.java
@@ -15,65 +15,66 @@
  */
 package com.github.difflib.text.deltamerge;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Predicate;
-
 import com.github.difflib.patch.AbstractDelta;
 import com.github.difflib.patch.ChangeDelta;
 import com.github.difflib.patch.Chunk;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Predicate;
 
 /**
  * Provides utility features for merge inline deltas
  *
  * @author Christian Meier
  */
-final public class DeltaMergeUtils {
+public final class DeltaMergeUtils {
 
-    public static List> mergeInlineDeltas(InlineDeltaMergeInfo deltaMergeInfo,
-            Predicate> replaceEquality) {
-        final List> originalDeltas = deltaMergeInfo.getDeltas();
-        if (originalDeltas.size() < 2) {
-            return originalDeltas;
-        }
+		public static List> mergeInlineDeltas(
+						InlineDeltaMergeInfo deltaMergeInfo, Predicate> replaceEquality) {
+				final List> originalDeltas = deltaMergeInfo.getDeltas();
+				if (originalDeltas.size() < 2) {
+						return originalDeltas;
+				}
 
-        final List> newDeltas = new ArrayList<>();
-        newDeltas.add(originalDeltas.get(0));
-        for (int i = 1; i < originalDeltas.size(); i++) {
-            final AbstractDelta previousDelta = newDeltas.get(newDeltas.size()-1);
-            final AbstractDelta currentDelta = originalDeltas.get(i);
+				final List> newDeltas = new ArrayList<>();
+				newDeltas.add(originalDeltas.get(0));
+				for (int i = 1; i < originalDeltas.size(); i++) {
+						final AbstractDelta previousDelta = newDeltas.get(newDeltas.size() - 1);
+						final AbstractDelta currentDelta = originalDeltas.get(i);
 
-            final List equalities = deltaMergeInfo.getOrigList().subList(
-                    previousDelta.getSource().getPosition() + previousDelta.getSource().size(),
-                    currentDelta.getSource().getPosition());
+						final List equalities = deltaMergeInfo
+										.getOrigList()
+										.subList(
+														previousDelta.getSource().getPosition()
+																		+ previousDelta.getSource().size(),
+														currentDelta.getSource().getPosition());
 
-            if (replaceEquality.test(equalities)) {
-                // Merge the previous delta, the equality and the current delta into one
-                // ChangeDelta and replace the previous delta by this new ChangeDelta.
-                final List allSourceLines = new ArrayList<>();
-                allSourceLines.addAll(previousDelta.getSource().getLines());
-                allSourceLines.addAll(equalities);
-                allSourceLines.addAll(currentDelta.getSource().getLines());
+						if (replaceEquality.test(equalities)) {
+								// Merge the previous delta, the equality and the current delta into one
+								// ChangeDelta and replace the previous delta by this new ChangeDelta.
+								final List allSourceLines = new ArrayList<>();
+								allSourceLines.addAll(previousDelta.getSource().getLines());
+								allSourceLines.addAll(equalities);
+								allSourceLines.addAll(currentDelta.getSource().getLines());
 
-                final List allTargetLines = new ArrayList<>();
-                allTargetLines.addAll(previousDelta.getTarget().getLines());
-                allTargetLines.addAll(equalities);
-                allTargetLines.addAll(currentDelta.getTarget().getLines());
+								final List allTargetLines = new ArrayList<>();
+								allTargetLines.addAll(previousDelta.getTarget().getLines());
+								allTargetLines.addAll(equalities);
+								allTargetLines.addAll(currentDelta.getTarget().getLines());
 
-                final ChangeDelta replacement = new ChangeDelta<>(
-                        new Chunk<>(previousDelta.getSource().getPosition(), allSourceLines),
-                        new Chunk<>(previousDelta.getTarget().getPosition(), allTargetLines));
+								final ChangeDelta replacement = new ChangeDelta<>(
+												new Chunk<>(previousDelta.getSource().getPosition(), allSourceLines),
+												new Chunk<>(previousDelta.getTarget().getPosition(), allTargetLines));
 
-                newDeltas.remove(newDeltas.size()-1);
-                newDeltas.add(replacement);
-            } else {
-                newDeltas.add(currentDelta);
-            }
-        }
+								newDeltas.remove(newDeltas.size() - 1);
+								newDeltas.add(replacement);
+						} else {
+								newDeltas.add(currentDelta);
+						}
+				}
 
-        return newDeltas;
-    }
+				return newDeltas;
+		}
 
-    private DeltaMergeUtils() {
-    }
+		private DeltaMergeUtils() {}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/deltamerge/InlineDeltaMergeInfo.java b/java-diff-utils/src/main/java/com/github/difflib/text/deltamerge/InlineDeltaMergeInfo.java
index cc6b399a..1c9027f1 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/text/deltamerge/InlineDeltaMergeInfo.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/deltamerge/InlineDeltaMergeInfo.java
@@ -15,9 +15,8 @@
  */
 package com.github.difflib.text.deltamerge;
 
-import java.util.List;
-
 import com.github.difflib.patch.AbstractDelta;
+import java.util.List;
 
 /**
  * Holds the information required to merge deltas originating from an inline
@@ -27,25 +26,25 @@
  */
 public final class InlineDeltaMergeInfo {
 
-    private final List> deltas;
-    private final List origList;
-    private final List revList;
+		private final List> deltas;
+		private final List origList;
+		private final List revList;
 
-    public InlineDeltaMergeInfo(List> deltas, List origList, List revList) {
-        this.deltas = deltas;
-        this.origList = origList;
-        this.revList = revList;
-    }
+		public InlineDeltaMergeInfo(List> deltas, List origList, List revList) {
+				this.deltas = deltas;
+				this.origList = origList;
+				this.revList = revList;
+		}
 
-    public List> getDeltas() {
-        return deltas;
-    }
+		public List> getDeltas() {
+				return deltas;
+		}
 
-    public List getOrigList() {
-        return origList;
-    }
+		public List getOrigList() {
+				return origList;
+		}
 
-    public List getRevList() {
-        return revList;
-    }
+		public List getRevList() {
+				return revList;
+		}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java
index f2bb231d..bc572ae3 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java
@@ -27,52 +27,54 @@
  */
 public final class UnifiedDiff {
 
-    private String header;
-    private String tail;
-    private final List files = new ArrayList<>();
+		private String header;
+		private String tail;
+		private final List files = new ArrayList<>();
 
-    public String getHeader() {
-        return header;
-    }
+		public String getHeader() {
+				return header;
+		}
 
-    public void setHeader(String header) {
-        this.header = header;
-    }
+		public void setHeader(String header) {
+				this.header = header;
+		}
 
-    void addFile(UnifiedDiffFile file) {
-        files.add(file);
-    }
+		void addFile(UnifiedDiffFile file) {
+				files.add(file);
+		}
 
-    public List getFiles() {
-        return Collections.unmodifiableList(files);
-    }
+		public List getFiles() {
+				return Collections.unmodifiableList(files);
+		}
 
-    void setTailTxt(String tailTxt) {
-        this.tail = tailTxt;
-    }
+		void setTailTxt(String tailTxt) {
+				this.tail = tailTxt;
+		}
 
-    public String getTail() {
-        return tail;
-    }
+		public String getTail() {
+				return tail;
+		}
 
-    public List applyPatchTo(Predicate findFile, List originalLines) throws PatchFailedException {
-        UnifiedDiffFile file = files.stream()
-                .filter(diff -> findFile.test(diff.getFromFile()))
-                .findFirst().orElse(null);
-        if (file != null) {
-            return file.getPatch().applyTo(originalLines);
-        } else {
-            return originalLines;
-        }
-    }
+		public List applyPatchTo(Predicate findFile, List originalLines)
+						throws PatchFailedException {
+				UnifiedDiffFile file = files.stream()
+								.filter(diff -> findFile.test(diff.getFromFile()))
+								.findFirst()
+								.orElse(null);
+				if (file != null) {
+						return file.getPatch().applyTo(originalLines);
+				} else {
+						return originalLines;
+				}
+		}
 
-    public static UnifiedDiff from(String header, String tail, UnifiedDiffFile... files) {
-        UnifiedDiff diff = new UnifiedDiff();
-        diff.setHeader(header);
-        diff.setTailTxt(tail);
-        for (UnifiedDiffFile file : files) {
-            diff.addFile(file);
-        }
-        return diff;
-    }
+		public static UnifiedDiff from(String header, String tail, UnifiedDiffFile... files) {
+				UnifiedDiff diff = new UnifiedDiff();
+				diff.setHeader(header);
+				diff.setTailTxt(tail);
+				for (UnifiedDiffFile file : files) {
+						diff.addFile(file);
+				}
+				return diff;
+		}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java
index 1ae3b7ca..4fc54186 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java
@@ -18,194 +18,194 @@
 import com.github.difflib.patch.Patch;
 
 /**
- * Data structure for one patched file from a unified diff file. 
- * 
+ * Data structure for one patched file from a unified diff file.
+ *
  * @author Tobias Warneke (t.warneke@gmx.net)
  */
 public final class UnifiedDiffFile {
 
-    private String diffCommand;
-    private String fromFile;
-    private String fromTimestamp;
-    private String toFile;
-    private String renameFrom;
-    private String renameTo;
-    private String copyFrom;
-    private String copyTo;
-    private String toTimestamp;
-    private String index;
-    private String newFileMode;
-    private String oldMode;
-    private String newMode;
-    private String deletedFileMode;
-    private String binaryAdded;
-    private String binaryDeleted;
-    private String binaryEdited;
-    private Patch patch = new Patch<>();
-    private boolean noNewLineAtTheEndOfTheFile = false;
-    private Integer similarityIndex;
-
-    public String getDiffCommand() {
-        return diffCommand;
-    }
-
-    public void setDiffCommand(String diffCommand) {
-        this.diffCommand = diffCommand;
-    }
-
-    public String getFromFile() {
-        return fromFile;
-    }
-
-    public void setFromFile(String fromFile) {
-        this.fromFile = fromFile;
-    }
-
-    public String getToFile() {
-        return toFile;
-    }
-
-    public void setToFile(String toFile) {
-        this.toFile = toFile;
-    }
-
-    public void setIndex(String index) {
-        this.index = index;
-    }
-
-    public String getIndex() {
-        return index;
-    }
-
-    public Patch getPatch() {
-        return patch;
-    }
-
-    public String getFromTimestamp() {
-        return fromTimestamp;
-    }
-
-    public void setFromTimestamp(String fromTimestamp) {
-        this.fromTimestamp = fromTimestamp;
-    }
-
-    public String getToTimestamp() {
-        return toTimestamp;
-    }
-
-    public void setToTimestamp(String toTimestamp) {
-        this.toTimestamp = toTimestamp;
-    }
-
-    public Integer getSimilarityIndex() {
-        return similarityIndex;
-    }
-
-    public void setSimilarityIndex(Integer similarityIndex) {
-        this.similarityIndex = similarityIndex;
-    }
-
-    public String getRenameFrom() {
-        return renameFrom;
-    }
-
-    public void setRenameFrom(String renameFrom) {
-        this.renameFrom = renameFrom;
-    }
-
-    public String getRenameTo() {
-        return renameTo;
-    }
-
-    public void setRenameTo(String renameTo) {
-        this.renameTo = renameTo;
-    }
-
-    public String getCopyFrom() {
-        return copyFrom;
-    }
-
-    public void setCopyFrom(String copyFrom) {
-        this.copyFrom = copyFrom;
-    }
-
-    public String getCopyTo() {
-        return copyTo;
-    }
-
-    public void setCopyTo(String copyTo) {
-        this.copyTo = copyTo;
-    }
-
-    public static UnifiedDiffFile from(String fromFile, String toFile, Patch patch) {
-        UnifiedDiffFile file = new UnifiedDiffFile();
-        file.setFromFile(fromFile);
-        file.setToFile(toFile);
-        file.patch = patch;
-        return file;
-    }
-
-    public void setNewFileMode(String newFileMode) {
-        this.newFileMode = newFileMode;
-    }
-    
-    public String getNewFileMode() {
-        return newFileMode;
-    }
-
-    public String getDeletedFileMode() {
-        return deletedFileMode;
-    }
-
-    public void setDeletedFileMode(String deletedFileMode) {
-        this.deletedFileMode = deletedFileMode;
-    }
-
-    public String getOldMode() {
-        return oldMode;
-    }
-
-    public void setOldMode(String oldMode) {
-        this.oldMode = oldMode;
-    }
-
-    public String getNewMode() {
-        return newMode;
-    }
-
-    public void setNewMode(String newMode) {
-        this.newMode = newMode;
-    }
-
-    public String getBinaryAdded() {
-        return binaryAdded;
-    }
-
-    public void setBinaryAdded(String binaryAdded) {
-        this.binaryAdded = binaryAdded;
-    }
-
-    public String getBinaryDeleted() {
-        return binaryDeleted;
-    }
-
-    public void setBinaryDeleted(String binaryDeleted) {
-        this.binaryDeleted = binaryDeleted;
-    }
-
-    public String getBinaryEdited() {
-        return binaryEdited;
-    }
-
-    public void setBinaryEdited(String binaryEdited) {
-        this.binaryEdited = binaryEdited;
-    }
-
-    public boolean isNoNewLineAtTheEndOfTheFile() {
-        return noNewLineAtTheEndOfTheFile;
-    }
-
-    public void setNoNewLineAtTheEndOfTheFile(boolean noNewLineAtTheEndOfTheFile) {
-        this.noNewLineAtTheEndOfTheFile = noNewLineAtTheEndOfTheFile;
-    }
+		private String diffCommand;
+		private String fromFile;
+		private String fromTimestamp;
+		private String toFile;
+		private String renameFrom;
+		private String renameTo;
+		private String copyFrom;
+		private String copyTo;
+		private String toTimestamp;
+		private String index;
+		private String newFileMode;
+		private String oldMode;
+		private String newMode;
+		private String deletedFileMode;
+		private String binaryAdded;
+		private String binaryDeleted;
+		private String binaryEdited;
+		private Patch patch = new Patch<>();
+		private boolean noNewLineAtTheEndOfTheFile = false;
+		private Integer similarityIndex;
+
+		public String getDiffCommand() {
+				return diffCommand;
+		}
+
+		public void setDiffCommand(String diffCommand) {
+				this.diffCommand = diffCommand;
+		}
+
+		public String getFromFile() {
+				return fromFile;
+		}
+
+		public void setFromFile(String fromFile) {
+				this.fromFile = fromFile;
+		}
+
+		public String getToFile() {
+				return toFile;
+		}
+
+		public void setToFile(String toFile) {
+				this.toFile = toFile;
+		}
+
+		public void setIndex(String index) {
+				this.index = index;
+		}
+
+		public String getIndex() {
+				return index;
+		}
+
+		public Patch getPatch() {
+				return patch;
+		}
+
+		public String getFromTimestamp() {
+				return fromTimestamp;
+		}
+
+		public void setFromTimestamp(String fromTimestamp) {
+				this.fromTimestamp = fromTimestamp;
+		}
+
+		public String getToTimestamp() {
+				return toTimestamp;
+		}
+
+		public void setToTimestamp(String toTimestamp) {
+				this.toTimestamp = toTimestamp;
+		}
+
+		public Integer getSimilarityIndex() {
+				return similarityIndex;
+		}
+
+		public void setSimilarityIndex(Integer similarityIndex) {
+				this.similarityIndex = similarityIndex;
+		}
+
+		public String getRenameFrom() {
+				return renameFrom;
+		}
+
+		public void setRenameFrom(String renameFrom) {
+				this.renameFrom = renameFrom;
+		}
+
+		public String getRenameTo() {
+				return renameTo;
+		}
+
+		public void setRenameTo(String renameTo) {
+				this.renameTo = renameTo;
+		}
+
+		public String getCopyFrom() {
+				return copyFrom;
+		}
+
+		public void setCopyFrom(String copyFrom) {
+				this.copyFrom = copyFrom;
+		}
+
+		public String getCopyTo() {
+				return copyTo;
+		}
+
+		public void setCopyTo(String copyTo) {
+				this.copyTo = copyTo;
+		}
+
+		public static UnifiedDiffFile from(String fromFile, String toFile, Patch patch) {
+				UnifiedDiffFile file = new UnifiedDiffFile();
+				file.setFromFile(fromFile);
+				file.setToFile(toFile);
+				file.patch = patch;
+				return file;
+		}
+
+		public void setNewFileMode(String newFileMode) {
+				this.newFileMode = newFileMode;
+		}
+
+		public String getNewFileMode() {
+				return newFileMode;
+		}
+
+		public String getDeletedFileMode() {
+				return deletedFileMode;
+		}
+
+		public void setDeletedFileMode(String deletedFileMode) {
+				this.deletedFileMode = deletedFileMode;
+		}
+
+		public String getOldMode() {
+				return oldMode;
+		}
+
+		public void setOldMode(String oldMode) {
+				this.oldMode = oldMode;
+		}
+
+		public String getNewMode() {
+				return newMode;
+		}
+
+		public void setNewMode(String newMode) {
+				this.newMode = newMode;
+		}
+
+		public String getBinaryAdded() {
+				return binaryAdded;
+		}
+
+		public void setBinaryAdded(String binaryAdded) {
+				this.binaryAdded = binaryAdded;
+		}
+
+		public String getBinaryDeleted() {
+				return binaryDeleted;
+		}
+
+		public void setBinaryDeleted(String binaryDeleted) {
+				this.binaryDeleted = binaryDeleted;
+		}
+
+		public String getBinaryEdited() {
+				return binaryEdited;
+		}
+
+		public void setBinaryEdited(String binaryEdited) {
+				this.binaryEdited = binaryEdited;
+		}
+
+		public boolean isNoNewLineAtTheEndOfTheFile() {
+				return noNewLineAtTheEndOfTheFile;
+		}
+
+		public void setNoNewLineAtTheEndOfTheFile(boolean noNewLineAtTheEndOfTheFile) {
+				this.noNewLineAtTheEndOfTheFile = noNewLineAtTheEndOfTheFile;
+		}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParserException.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParserException.java
index ab7114db..0e991c77 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParserException.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParserException.java
@@ -21,23 +21,22 @@
  */
 public class UnifiedDiffParserException extends RuntimeException {
 
-    public UnifiedDiffParserException() {
-    }
+		public UnifiedDiffParserException() {}
 
-    public UnifiedDiffParserException(String message) {
-        super(message);
-    }
+		public UnifiedDiffParserException(String message) {
+				super(message);
+		}
 
-    public UnifiedDiffParserException(String message, Throwable cause) {
-        super(message, cause);
-    }
+		public UnifiedDiffParserException(String message, Throwable cause) {
+				super(message, cause);
+		}
 
-    public UnifiedDiffParserException(Throwable cause) {
-        super(cause);
-    }
-
-    public UnifiedDiffParserException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
+		public UnifiedDiffParserException(Throwable cause) {
+				super(cause);
+		}
 
+		public UnifiedDiffParserException(
+						String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+				super(message, cause, enableSuppression, writableStackTrace);
+		}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
index b3a66ab2..61e1aa4d 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
@@ -38,438 +38,469 @@
  */
 public final class UnifiedDiffReader {
 
-    static final Pattern UNIFIED_DIFF_CHUNK_REGEXP = Pattern.compile("^@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@");
-    static final Pattern TIMESTAMP_REGEXP = Pattern.compile("(\\d{4}-\\d{2}-\\d{2}[T ]\\d{2}:\\d{2}:\\d{2}\\.\\d{3,})(?: [+-]\\d+)?");
-
-    private final InternalUnifiedDiffReader READER;
-    private final UnifiedDiff data = new UnifiedDiff();
-
-    private final UnifiedDiffLine DIFF_COMMAND = new UnifiedDiffLine(true, "^diff\\s", this::processDiff);
-    private final UnifiedDiffLine SIMILARITY_INDEX = new UnifiedDiffLine(true, "^similarity index (\\d+)%$", this::processSimilarityIndex);
-    private final UnifiedDiffLine INDEX = new UnifiedDiffLine(true, "^index\\s[\\da-zA-Z]+\\.\\.[\\da-zA-Z]+(\\s(\\d+))?$", this::processIndex);
-    private final UnifiedDiffLine FROM_FILE = new UnifiedDiffLine(true, "^---\\s", this::processFromFile);
-    private final UnifiedDiffLine TO_FILE = new UnifiedDiffLine(true, "^\\+\\+\\+\\s", this::processToFile);
-    private final UnifiedDiffLine RENAME_FROM = new UnifiedDiffLine(true, "^rename\\sfrom\\s(.+)$", this::processRenameFrom);
-    private final UnifiedDiffLine RENAME_TO = new UnifiedDiffLine(true, "^rename\\sto\\s(.+)$", this::processRenameTo);
-    
-    private final UnifiedDiffLine COPY_FROM = new UnifiedDiffLine(true, "^copy\\sfrom\\s(.+)$", this::processCopyFrom);
-    private final UnifiedDiffLine COPY_TO = new UnifiedDiffLine(true, "^copy\\sto\\s(.+)$", this::processCopyTo);
-
-    private final UnifiedDiffLine NEW_FILE_MODE = new UnifiedDiffLine(true, "^new\\sfile\\smode\\s(\\d+)", this::processNewFileMode);
-
-    private final UnifiedDiffLine DELETED_FILE_MODE = new UnifiedDiffLine(true, "^deleted\\sfile\\smode\\s(\\d+)", this::processDeletedFileMode);
-    private final UnifiedDiffLine OLD_MODE = new UnifiedDiffLine(true, "^old\\smode\\s(\\d+)", this::processOldMode);
-    private final UnifiedDiffLine NEW_MODE = new UnifiedDiffLine(true, "^new\\smode\\s(\\d+)", this::processNewMode);
-    private final UnifiedDiffLine BINARY_ADDED = new UnifiedDiffLine(true, "^Binary\\sfiles\\s/dev/null\\sand\\sb/(.+)\\sdiffer", this::processBinaryAdded);
-    private final UnifiedDiffLine BINARY_DELETED = new UnifiedDiffLine(true, "^Binary\\sfiles\\sa/(.+)\\sand\\s/dev/null\\sdiffer", this::processBinaryDeleted);
-    private final UnifiedDiffLine BINARY_EDITED = new UnifiedDiffLine(true, "^Binary\\sfiles\\sa/(.+)\\sand\\sb/(.+)\\sdiffer", this::processBinaryEdited);
-    private final UnifiedDiffLine CHUNK = new UnifiedDiffLine(false, UNIFIED_DIFF_CHUNK_REGEXP, this::processChunk);
-    private final UnifiedDiffLine LINE_NORMAL = new UnifiedDiffLine("^\\s", this::processNormalLine);
-    private final UnifiedDiffLine LINE_DEL = new UnifiedDiffLine("^-", this::processDelLine);
-    private final UnifiedDiffLine LINE_ADD = new UnifiedDiffLine("^\\+", this::processAddLine);
-
-    private UnifiedDiffFile actualFile;
-
-    UnifiedDiffReader(Reader reader) {
-        this.READER = new InternalUnifiedDiffReader(reader);
-    }
-
-    // schema = [[/^\s+/, normal], [/^diff\s/, start], [/^new file mode \d+$/, new_file], 
-    // [/^deleted file mode \d+$/, deleted_file], [/^index\s[\da-zA-Z]+\.\.[\da-zA-Z]+(\s(\d+))?$/, index], 
-    // [/^---\s/, from_file], [/^\+\+\+\s/, to_file], [/^@@\s+\-(\d+),?(\d+)?\s+\+(\d+),?(\d+)?\s@@/, chunk], 
-    // [/^-/, del], [/^\+/, add], [/^\\ No newline at end of file$/, eof]];
-    private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
-//        String headerTxt = "";
-//        LOG.log(Level.FINE, "header parsing");
-//        String line = null;
-//        while (READER.ready()) {
-//            line = READER.readLine();
-//            LOG.log(Level.FINE, "parsing line {0}", line);
-//            if (DIFF_COMMAND.validLine(line) || INDEX.validLine(line)
-//                    || FROM_FILE.validLine(line) || TO_FILE.validLine(line)
-//                    || NEW_FILE_MODE.validLine(line)) {
-//                break;
-//            } else {
-//                headerTxt += line + "\n";
-//            }
-//        }
-//        if (!"".equals(headerTxt)) {
-//            data.setHeader(headerTxt);
-//        }
-
-        String line = READER.readLine();
-        while (line != null) {
-            String headerTxt = "";
-            LOG.log(Level.FINE, "header parsing");
-            while (line != null) {
-                LOG.log(Level.FINE, "parsing line {0}", line);
-                if (validLine(line, DIFF_COMMAND, SIMILARITY_INDEX, INDEX,
-                            FROM_FILE, TO_FILE,
-                            RENAME_FROM, RENAME_TO,
-                                  COPY_FROM, COPY_TO,
-                            NEW_FILE_MODE, DELETED_FILE_MODE,
-                            OLD_MODE, NEW_MODE,
-                            BINARY_ADDED, BINARY_DELETED,
-                            BINARY_EDITED, CHUNK)) {
-                    break;
-                } else {
-                    headerTxt += line + "\n";
-                }
-                line = READER.readLine();
-            }
-            if (!"".equals(headerTxt)) {
-                data.setHeader(headerTxt);
-            }
-            if (line != null && !CHUNK.validLine(line)) {
-                initFileIfNecessary();
-                while (line != null && !CHUNK.validLine(line)) {
-                    if (!processLine(line, DIFF_COMMAND, SIMILARITY_INDEX, INDEX,
-                            FROM_FILE, TO_FILE,
-                            RENAME_FROM, RENAME_TO,
-                            COPY_FROM, COPY_TO,
-                            NEW_FILE_MODE, DELETED_FILE_MODE,
-                            OLD_MODE, NEW_MODE,
-                            BINARY_ADDED , BINARY_DELETED,
-                            BINARY_EDITED)) {
-                        throw new UnifiedDiffParserException("expected file start line not found");
-                    }
-                    line = READER.readLine();
-                }
-            }
-            if (line != null) {
-                processLine(line, CHUNK);
-                while ((line = READER.readLine()) != null) {
-                    line = checkForNoNewLineAtTheEndOfTheFile(line);
-
-                    if (!processLine(line, LINE_NORMAL, LINE_ADD, LINE_DEL)) {
-                        throw new UnifiedDiffParserException("expected data line not found");
-                    }
-                    if ((originalTxt.size() == old_size && revisedTxt.size() == new_size)
-                            || (old_size == 0 && new_size == 0 && originalTxt.size() == this.old_ln
-                            && revisedTxt.size() == this.new_ln)) {
-                        finalizeChunk();
-                        break;
-                    }
-                }
-                line = READER.readLine();
-
-                line = checkForNoNewLineAtTheEndOfTheFile(line);
-            }
-            if (line == null || (line.startsWith("--") && !line.startsWith("---"))) {
-                break;
-            }
-        }
-
-        if (READER.ready()) {
-            String tailTxt = "";
-            while (READER.ready()) {
-                if (tailTxt.length() > 0) {
-                    tailTxt += "\n";
-                }
-                tailTxt += READER.readLine();
-            }
-            data.setTailTxt(tailTxt);
-        }
-
-        return data;
-    }
-
-    private String checkForNoNewLineAtTheEndOfTheFile(String line) throws IOException {
-        if ("\\ No newline at end of file".equals(line)) {
-            actualFile.setNoNewLineAtTheEndOfTheFile(true);
-            return READER.readLine();
-        }
-        return line;
-    }
-
-    static String[] parseFileNames(String line) {
-        String[] split = line.split(" ");
-        return new String[]{
-            split[2].replaceAll("^a/", ""),
-            split[3].replaceAll("^b/", "")
-        };
-    }
-
-    private static final Logger LOG = Logger.getLogger(UnifiedDiffReader.class.getName());
-
-    /**
-     * To parse a diff file use this method.
-     *
-     * @param stream This is the diff file data.
-     * @return In a UnifiedDiff structure this diff file data is returned.
-     * @throws IOException
-     * @throws UnifiedDiffParserException
-     */
-    public static UnifiedDiff parseUnifiedDiff(InputStream stream) throws IOException, UnifiedDiffParserException {
-        UnifiedDiffReader parser = new UnifiedDiffReader(new BufferedReader(new InputStreamReader(stream)));
-        return parser.parse();
-    }
-
-    private boolean processLine(String line, UnifiedDiffLine... rules) throws UnifiedDiffParserException {
-        if (line == null) {
-            return false;
-        }
-        for (UnifiedDiffLine rule : rules) {
-            if (rule.processLine(line)) {
-                LOG.fine("  >>> processed rule " + rule.toString());
-                return true;
-            }
-        }
-        LOG.warning("  >>> no rule matched " + line);
-        return false;
-        //throw new UnifiedDiffParserException("parsing error at line " + line);
-    }
-    
-    private boolean validLine(String line, UnifiedDiffLine ... rules) {
-        if (line == null) {
-            return false;
-        }
-        for (UnifiedDiffLine rule : rules) {
-            if (rule.validLine(line)) {
-                LOG.fine("  >>> accepted rule " + rule.toString());
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private void initFileIfNecessary() {
-        if (!originalTxt.isEmpty() || !revisedTxt.isEmpty()) {
-            throw new IllegalStateException();
-        }
-        actualFile = null;
-        if (actualFile == null) {
-            actualFile = new UnifiedDiffFile();
-            data.addFile(actualFile);
-        }
-    }
-
-    private void processDiff(MatchResult match, String line) {
-        //initFileIfNecessary();
-        LOG.log(Level.FINE, "start {0}", line);
-        String[] fromTo = parseFileNames(READER.lastLine());
-        actualFile.setFromFile(fromTo[0]);
-        actualFile.setToFile(fromTo[1]);
-        actualFile.setDiffCommand(line);
-    }
-
-    private void processSimilarityIndex(MatchResult match, String line) {
-        actualFile.setSimilarityIndex(Integer.valueOf(match.group(1)));
-    }
-
-    private List originalTxt = new ArrayList<>();
-    private List revisedTxt = new ArrayList<>();
-    private List addLineIdxList = new ArrayList<>();
-    private List delLineIdxList = new ArrayList<>();
-    private int old_ln;
-    private int old_size;
-    private int new_ln;
-    private int new_size;
-    private int delLineIdx = 0;
-    private int addLineIdx = 0;
-
-    private void finalizeChunk() {
-        if (!originalTxt.isEmpty() || !revisedTxt.isEmpty()) {
-            actualFile.getPatch().addDelta(new ChangeDelta<>(new Chunk<>(
-                    old_ln - 1, originalTxt, delLineIdxList), new Chunk<>(
-                    new_ln - 1, revisedTxt, addLineIdxList)));
-            old_ln = 0;
-            new_ln = 0;
-            originalTxt.clear();
-            revisedTxt.clear();
-            addLineIdxList.clear();
-            delLineIdxList.clear();
-            delLineIdx = 0;
-            addLineIdx = 0;
-        }
-    }
-
-    private void processNormalLine(MatchResult match, String line) {
-        String cline = line.substring(1);
-        originalTxt.add(cline);
-        revisedTxt.add(cline);
-        delLineIdx++;
-        addLineIdx++;
-    }
-
-    private void processAddLine(MatchResult match, String line) {
-        String cline = line.substring(1);
-        revisedTxt.add(cline);
-        addLineIdx++;
-        addLineIdxList.add(new_ln - 1 + addLineIdx);
-    }
-
-    private void processDelLine(MatchResult match, String line) {
-        String cline = line.substring(1);
-        originalTxt.add(cline);
-        delLineIdx++;
-        delLineIdxList.add(old_ln - 1 + delLineIdx);
-    }
-
-    private void processChunk(MatchResult match, String chunkStart) {
-        // finalizeChunk();
-        old_ln = toInteger(match, 1, 1);
-        old_size = toInteger(match, 2, 1);
-        new_ln = toInteger(match, 3, 1);
-        new_size = toInteger(match, 4, 1);
-        if (old_ln == 0) {
-            old_ln = 1;
-        }
-        if (new_ln == 0) {
-            new_ln = 1;
-        }
-    }
-
-    private static Integer toInteger(MatchResult match, int group, int defValue) throws NumberFormatException {
-        return Integer.valueOf(Objects.toString(match.group(group), "" + defValue));
-    }
-
-    private void processIndex(MatchResult match, String line) {
-        //initFileIfNecessary();
-        LOG.log(Level.FINE, "index {0}", line);
-        actualFile.setIndex(line.substring(6));
-    }
-
-    private void processFromFile(MatchResult match, String line) {
-        //initFileIfNecessary();
-        actualFile.setFromFile(extractFileName(line));
-        actualFile.setFromTimestamp(extractTimestamp(line));
-    }
-
-    private void processToFile(MatchResult match, String line) {
-        //initFileIfNecessary();
-        actualFile.setToFile(extractFileName(line));
-        actualFile.setToTimestamp(extractTimestamp(line));
-    }
-
-    private void processRenameFrom(MatchResult match, String line) {
-        actualFile.setRenameFrom(match.group(1));
-    }
-
-    private void processRenameTo(MatchResult match, String line) {
-        actualFile.setRenameTo(match.group(1));
-    }
-    
-    private void processCopyFrom(MatchResult match, String line) {
-        actualFile.setCopyFrom(match.group(1));
-    }
-
-    private void processCopyTo(MatchResult match, String line) {
-        actualFile.setCopyTo(match.group(1));
-    }
-
-    private void processNewFileMode(MatchResult match, String line) {
-        //initFileIfNecessary();
-        actualFile.setNewFileMode(match.group(1));
-    }
-
-    private void processDeletedFileMode(MatchResult match, String line) {
-        //initFileIfNecessary();
-        actualFile.setDeletedFileMode(match.group(1));
-    }
-
-    private void processOldMode(MatchResult match, String line) {
-        actualFile.setOldMode(match.group(1));
-    }
-
-    private void processNewMode(MatchResult match, String line) {
-        actualFile.setNewMode(match.group(1));
-    }
-
-    private void processBinaryAdded(MatchResult match, String line) {
-        actualFile.setBinaryAdded(match.group(1));
-    }
-
-    private void processBinaryDeleted(MatchResult match, String line) {
-        actualFile.setBinaryDeleted(match.group(1));
-    }
-
-    private void processBinaryEdited(MatchResult match, String line) {
-        actualFile.setBinaryEdited(match.group(1));
-    }
-
-    private String extractFileName(String _line) {
-        Matcher matcher = TIMESTAMP_REGEXP.matcher(_line);
-        String line = _line;
-        if (matcher.find()) {
-            line = line.substring(0, matcher.start());
-        }
-        line = line.split("\t")[0];
-        return line.substring(4).replaceFirst("^(a|b|old|new)/", "")
-                .trim();
-    }
-
-    private String extractTimestamp(String line) {
-        Matcher matcher = TIMESTAMP_REGEXP.matcher(line);
-        if (matcher.find()) {
-            return matcher.group();
-        }
-        return null;
-    }
-
-    final class UnifiedDiffLine {
-
-        private final Pattern pattern;
-        private final BiConsumer command;
-        private final boolean stopsHeaderParsing;
-
-        public UnifiedDiffLine(String pattern, BiConsumer command) {
-            this(false, pattern, command);
-        }
-
-        public UnifiedDiffLine(boolean stopsHeaderParsing, String pattern, BiConsumer command) {
-            this.pattern = Pattern.compile(pattern);
-            this.command = command;
-            this.stopsHeaderParsing = stopsHeaderParsing;
-        }
-
-        public UnifiedDiffLine(boolean stopsHeaderParsing, Pattern pattern, BiConsumer command) {
-            this.pattern = pattern;
-            this.command = command;
-            this.stopsHeaderParsing = stopsHeaderParsing;
-        }
-
-        public boolean validLine(String line) {
-            Matcher m = pattern.matcher(line);
-            return m.find();
-        }
-
-        public boolean processLine(String line) throws UnifiedDiffParserException {
-            Matcher m = pattern.matcher(line);
-            if (m.find()) {
-                command.accept(m.toMatchResult(), line);
-                return true;
-            } else {
-                return false;
-            }
-        }
-
-        public boolean isStopsHeaderParsing() {
-            return stopsHeaderParsing;
-        }
-
-        @Override
-        public String toString() {
-            return "UnifiedDiffLine{" + "pattern=" + pattern + ", stopsHeaderParsing=" + stopsHeaderParsing + '}';
-        }
-    }
+		static final Pattern UNIFIED_DIFF_CHUNK_REGEXP =
+						Pattern.compile("^@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@");
+		static final Pattern TIMESTAMP_REGEXP =
+						Pattern.compile("(\\d{4}-\\d{2}-\\d{2}[T ]\\d{2}:\\d{2}:\\d{2}\\.\\d{3,})(?: [+-]\\d+)?");
+
+		private final InternalUnifiedDiffReader READER;
+		private final UnifiedDiff data = new UnifiedDiff();
+
+		private final UnifiedDiffLine DIFF_COMMAND = new UnifiedDiffLine(true, "^diff\\s", this::processDiff);
+		private final UnifiedDiffLine SIMILARITY_INDEX =
+						new UnifiedDiffLine(true, "^similarity index (\\d+)%$", this::processSimilarityIndex);
+		private final UnifiedDiffLine INDEX =
+						new UnifiedDiffLine(true, "^index\\s[\\da-zA-Z]+\\.\\.[\\da-zA-Z]+(\\s(\\d+))?$", this::processIndex);
+		private final UnifiedDiffLine FROM_FILE = new UnifiedDiffLine(true, "^---\\s", this::processFromFile);
+		private final UnifiedDiffLine TO_FILE = new UnifiedDiffLine(true, "^\\+\\+\\+\\s", this::processToFile);
+		private final UnifiedDiffLine RENAME_FROM =
+						new UnifiedDiffLine(true, "^rename\\sfrom\\s(.+)$", this::processRenameFrom);
+		private final UnifiedDiffLine RENAME_TO = new UnifiedDiffLine(true, "^rename\\sto\\s(.+)$", this::processRenameTo);
+
+		private final UnifiedDiffLine COPY_FROM = new UnifiedDiffLine(true, "^copy\\sfrom\\s(.+)$", this::processCopyFrom);
+		private final UnifiedDiffLine COPY_TO = new UnifiedDiffLine(true, "^copy\\sto\\s(.+)$", this::processCopyTo);
+
+		private final UnifiedDiffLine NEW_FILE_MODE =
+						new UnifiedDiffLine(true, "^new\\sfile\\smode\\s(\\d+)", this::processNewFileMode);
+
+		private final UnifiedDiffLine DELETED_FILE_MODE =
+						new UnifiedDiffLine(true, "^deleted\\sfile\\smode\\s(\\d+)", this::processDeletedFileMode);
+		private final UnifiedDiffLine OLD_MODE = new UnifiedDiffLine(true, "^old\\smode\\s(\\d+)", this::processOldMode);
+		private final UnifiedDiffLine NEW_MODE = new UnifiedDiffLine(true, "^new\\smode\\s(\\d+)", this::processNewMode);
+		private final UnifiedDiffLine BINARY_ADDED =
+						new UnifiedDiffLine(true, "^Binary\\sfiles\\s/dev/null\\sand\\sb/(.+)\\sdiffer", this::processBinaryAdded);
+		private final UnifiedDiffLine BINARY_DELETED = new UnifiedDiffLine(
+						true, "^Binary\\sfiles\\sa/(.+)\\sand\\s/dev/null\\sdiffer", this::processBinaryDeleted);
+		private final UnifiedDiffLine BINARY_EDITED =
+						new UnifiedDiffLine(true, "^Binary\\sfiles\\sa/(.+)\\sand\\sb/(.+)\\sdiffer", this::processBinaryEdited);
+		private final UnifiedDiffLine CHUNK = new UnifiedDiffLine(false, UNIFIED_DIFF_CHUNK_REGEXP, this::processChunk);
+		private final UnifiedDiffLine LINE_NORMAL = new UnifiedDiffLine("^\\s", this::processNormalLine);
+		private final UnifiedDiffLine LINE_DEL = new UnifiedDiffLine("^-", this::processDelLine);
+		private final UnifiedDiffLine LINE_ADD = new UnifiedDiffLine("^\\+", this::processAddLine);
+
+		private UnifiedDiffFile actualFile;
+
+		UnifiedDiffReader(Reader reader) {
+				this.READER = new InternalUnifiedDiffReader(reader);
+		}
+
+		// schema = [[/^\s+/, normal], [/^diff\s/, start], [/^new file mode \d+$/, new_file],
+		// [/^deleted file mode \d+$/, deleted_file], [/^index\s[\da-zA-Z]+\.\.[\da-zA-Z]+(\s(\d+))?$/, index],
+		// [/^---\s/, from_file], [/^\+\+\+\s/, to_file], [/^@@\s+\-(\d+),?(\d+)?\s+\+(\d+),?(\d+)?\s@@/, chunk],
+		// [/^-/, del], [/^\+/, add], [/^\\ No newline at end of file$/, eof]];
+		private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
+				//        String headerTxt = "";
+				//        LOG.log(Level.FINE, "header parsing");
+				//        String line = null;
+				//        while (READER.ready()) {
+				//            line = READER.readLine();
+				//            LOG.log(Level.FINE, "parsing line {0}", line);
+				//            if (DIFF_COMMAND.validLine(line) || INDEX.validLine(line)
+				//                    || FROM_FILE.validLine(line) || TO_FILE.validLine(line)
+				//                    || NEW_FILE_MODE.validLine(line)) {
+				//                break;
+				//            } else {
+				//                headerTxt += line + "\n";
+				//            }
+				//        }
+				//        if (!"".equals(headerTxt)) {
+				//            data.setHeader(headerTxt);
+				//        }
+
+				String line = READER.readLine();
+				while (line != null) {
+						String headerTxt = "";
+						LOG.log(Level.FINE, "header parsing");
+						while (line != null) {
+								LOG.log(Level.FINE, "parsing line {0}", line);
+								if (validLine(
+												line,
+												DIFF_COMMAND,
+												SIMILARITY_INDEX,
+												INDEX,
+												FROM_FILE,
+												TO_FILE,
+												RENAME_FROM,
+												RENAME_TO,
+												COPY_FROM,
+												COPY_TO,
+												NEW_FILE_MODE,
+												DELETED_FILE_MODE,
+												OLD_MODE,
+												NEW_MODE,
+												BINARY_ADDED,
+												BINARY_DELETED,
+												BINARY_EDITED,
+												CHUNK)) {
+										break;
+								} else {
+										headerTxt += line + "\n";
+								}
+								line = READER.readLine();
+						}
+						if (!"".equals(headerTxt)) {
+								data.setHeader(headerTxt);
+						}
+						if (line != null && !CHUNK.validLine(line)) {
+								initFileIfNecessary();
+								while (line != null && !CHUNK.validLine(line)) {
+										if (!processLine(
+														line,
+														DIFF_COMMAND,
+														SIMILARITY_INDEX,
+														INDEX,
+														FROM_FILE,
+														TO_FILE,
+														RENAME_FROM,
+														RENAME_TO,
+														COPY_FROM,
+														COPY_TO,
+														NEW_FILE_MODE,
+														DELETED_FILE_MODE,
+														OLD_MODE,
+														NEW_MODE,
+														BINARY_ADDED,
+														BINARY_DELETED,
+														BINARY_EDITED)) {
+												throw new UnifiedDiffParserException("expected file start line not found");
+										}
+										line = READER.readLine();
+								}
+						}
+						if (line != null) {
+								processLine(line, CHUNK);
+								while ((line = READER.readLine()) != null) {
+										line = checkForNoNewLineAtTheEndOfTheFile(line);
+
+										if (!processLine(line, LINE_NORMAL, LINE_ADD, LINE_DEL)) {
+												throw new UnifiedDiffParserException("expected data line not found");
+										}
+										if ((originalTxt.size() == old_size && revisedTxt.size() == new_size)
+														|| (old_size == 0
+																		&& new_size == 0
+																		&& originalTxt.size() == this.old_ln
+																		&& revisedTxt.size() == this.new_ln)) {
+												finalizeChunk();
+												break;
+										}
+								}
+								line = READER.readLine();
+
+								line = checkForNoNewLineAtTheEndOfTheFile(line);
+						}
+						if (line == null || (line.startsWith("--") && !line.startsWith("---"))) {
+								break;
+						}
+				}
+
+				if (READER.ready()) {
+						String tailTxt = "";
+						while (READER.ready()) {
+								if (tailTxt.length() > 0) {
+										tailTxt += "\n";
+								}
+								tailTxt += READER.readLine();
+						}
+						data.setTailTxt(tailTxt);
+				}
+
+				return data;
+		}
+
+		private String checkForNoNewLineAtTheEndOfTheFile(String line) throws IOException {
+				if ("\\ No newline at end of file".equals(line)) {
+						actualFile.setNoNewLineAtTheEndOfTheFile(true);
+						return READER.readLine();
+				}
+				return line;
+		}
+
+		static String[] parseFileNames(String line) {
+				String[] split = line.split(" ");
+				return new String[] {split[2].replaceAll("^a/", ""), split[3].replaceAll("^b/", "")};
+		}
+
+		private static final Logger LOG = Logger.getLogger(UnifiedDiffReader.class.getName());
+
+		/**
+		 * To parse a diff file use this method.
+		 *
+		 * @param stream This is the diff file data.
+		 * @return In a UnifiedDiff structure this diff file data is returned.
+		 * @throws IOException
+		 * @throws UnifiedDiffParserException
+		 */
+		public static UnifiedDiff parseUnifiedDiff(InputStream stream) throws IOException, UnifiedDiffParserException {
+				UnifiedDiffReader parser = new UnifiedDiffReader(new BufferedReader(new InputStreamReader(stream)));
+				return parser.parse();
+		}
+
+		private boolean processLine(String line, UnifiedDiffLine... rules) throws UnifiedDiffParserException {
+				if (line == null) {
+						return false;
+				}
+				for (UnifiedDiffLine rule : rules) {
+						if (rule.processLine(line)) {
+								LOG.fine("  >>> processed rule " + rule.toString());
+								return true;
+						}
+				}
+				LOG.warning("  >>> no rule matched " + line);
+				return false;
+				// throw new UnifiedDiffParserException("parsing error at line " + line);
+		}
+
+		private boolean validLine(String line, UnifiedDiffLine... rules) {
+				if (line == null) {
+						return false;
+				}
+				for (UnifiedDiffLine rule : rules) {
+						if (rule.validLine(line)) {
+								LOG.fine("  >>> accepted rule " + rule.toString());
+								return true;
+						}
+				}
+				return false;
+		}
+
+		private void initFileIfNecessary() {
+				if (!originalTxt.isEmpty() || !revisedTxt.isEmpty()) {
+						throw new IllegalStateException();
+				}
+				actualFile = null;
+				if (actualFile == null) {
+						actualFile = new UnifiedDiffFile();
+						data.addFile(actualFile);
+				}
+		}
+
+		private void processDiff(MatchResult match, String line) {
+				// initFileIfNecessary();
+				LOG.log(Level.FINE, "start {0}", line);
+				String[] fromTo = parseFileNames(READER.lastLine());
+				actualFile.setFromFile(fromTo[0]);
+				actualFile.setToFile(fromTo[1]);
+				actualFile.setDiffCommand(line);
+		}
+
+		private void processSimilarityIndex(MatchResult match, String line) {
+				actualFile.setSimilarityIndex(Integer.valueOf(match.group(1)));
+		}
+
+		private List originalTxt = new ArrayList<>();
+		private List revisedTxt = new ArrayList<>();
+		private List addLineIdxList = new ArrayList<>();
+		private List delLineIdxList = new ArrayList<>();
+		private int old_ln;
+		private int old_size;
+		private int new_ln;
+		private int new_size;
+		private int delLineIdx = 0;
+		private int addLineIdx = 0;
+
+		private void finalizeChunk() {
+				if (!originalTxt.isEmpty() || !revisedTxt.isEmpty()) {
+						actualFile
+										.getPatch()
+										.addDelta(new ChangeDelta<>(
+														new Chunk<>(old_ln - 1, originalTxt, delLineIdxList),
+														new Chunk<>(new_ln - 1, revisedTxt, addLineIdxList)));
+						old_ln = 0;
+						new_ln = 0;
+						originalTxt.clear();
+						revisedTxt.clear();
+						addLineIdxList.clear();
+						delLineIdxList.clear();
+						delLineIdx = 0;
+						addLineIdx = 0;
+				}
+		}
+
+		private void processNormalLine(MatchResult match, String line) {
+				String cline = line.substring(1);
+				originalTxt.add(cline);
+				revisedTxt.add(cline);
+				delLineIdx++;
+				addLineIdx++;
+		}
+
+		private void processAddLine(MatchResult match, String line) {
+				String cline = line.substring(1);
+				revisedTxt.add(cline);
+				addLineIdx++;
+				addLineIdxList.add(new_ln - 1 + addLineIdx);
+		}
+
+		private void processDelLine(MatchResult match, String line) {
+				String cline = line.substring(1);
+				originalTxt.add(cline);
+				delLineIdx++;
+				delLineIdxList.add(old_ln - 1 + delLineIdx);
+		}
+
+		private void processChunk(MatchResult match, String chunkStart) {
+				// finalizeChunk();
+				old_ln = toInteger(match, 1, 1);
+				old_size = toInteger(match, 2, 1);
+				new_ln = toInteger(match, 3, 1);
+				new_size = toInteger(match, 4, 1);
+				if (old_ln == 0) {
+						old_ln = 1;
+				}
+				if (new_ln == 0) {
+						new_ln = 1;
+				}
+		}
+
+		private static Integer toInteger(MatchResult match, int group, int defValue) throws NumberFormatException {
+				return Integer.valueOf(Objects.toString(match.group(group), "" + defValue));
+		}
+
+		private void processIndex(MatchResult match, String line) {
+				// initFileIfNecessary();
+				LOG.log(Level.FINE, "index {0}", line);
+				actualFile.setIndex(line.substring(6));
+		}
+
+		private void processFromFile(MatchResult match, String line) {
+				// initFileIfNecessary();
+				actualFile.setFromFile(extractFileName(line));
+				actualFile.setFromTimestamp(extractTimestamp(line));
+		}
+
+		private void processToFile(MatchResult match, String line) {
+				// initFileIfNecessary();
+				actualFile.setToFile(extractFileName(line));
+				actualFile.setToTimestamp(extractTimestamp(line));
+		}
+
+		private void processRenameFrom(MatchResult match, String line) {
+				actualFile.setRenameFrom(match.group(1));
+		}
+
+		private void processRenameTo(MatchResult match, String line) {
+				actualFile.setRenameTo(match.group(1));
+		}
+
+		private void processCopyFrom(MatchResult match, String line) {
+				actualFile.setCopyFrom(match.group(1));
+		}
+
+		private void processCopyTo(MatchResult match, String line) {
+				actualFile.setCopyTo(match.group(1));
+		}
+
+		private void processNewFileMode(MatchResult match, String line) {
+				// initFileIfNecessary();
+				actualFile.setNewFileMode(match.group(1));
+		}
+
+		private void processDeletedFileMode(MatchResult match, String line) {
+				// initFileIfNecessary();
+				actualFile.setDeletedFileMode(match.group(1));
+		}
+
+		private void processOldMode(MatchResult match, String line) {
+				actualFile.setOldMode(match.group(1));
+		}
+
+		private void processNewMode(MatchResult match, String line) {
+				actualFile.setNewMode(match.group(1));
+		}
+
+		private void processBinaryAdded(MatchResult match, String line) {
+				actualFile.setBinaryAdded(match.group(1));
+		}
+
+		private void processBinaryDeleted(MatchResult match, String line) {
+				actualFile.setBinaryDeleted(match.group(1));
+		}
+
+		private void processBinaryEdited(MatchResult match, String line) {
+				actualFile.setBinaryEdited(match.group(1));
+		}
+
+		private String extractFileName(String _line) {
+				Matcher matcher = TIMESTAMP_REGEXP.matcher(_line);
+				String line = _line;
+				if (matcher.find()) {
+						line = line.substring(0, matcher.start());
+				}
+				line = line.split("\t")[0];
+				return line.substring(4).replaceFirst("^(a|b|old|new)/", "").trim();
+		}
+
+		private String extractTimestamp(String line) {
+				Matcher matcher = TIMESTAMP_REGEXP.matcher(line);
+				if (matcher.find()) {
+						return matcher.group();
+				}
+				return null;
+		}
+
+		final class UnifiedDiffLine {
+
+				private final Pattern pattern;
+				private final BiConsumer command;
+				private final boolean stopsHeaderParsing;
+
+				public UnifiedDiffLine(String pattern, BiConsumer command) {
+						this(false, pattern, command);
+				}
+
+				public UnifiedDiffLine(boolean stopsHeaderParsing, String pattern, BiConsumer command) {
+						this.pattern = Pattern.compile(pattern);
+						this.command = command;
+						this.stopsHeaderParsing = stopsHeaderParsing;
+				}
+
+				public UnifiedDiffLine(boolean stopsHeaderParsing, Pattern pattern, BiConsumer command) {
+						this.pattern = pattern;
+						this.command = command;
+						this.stopsHeaderParsing = stopsHeaderParsing;
+				}
+
+				public boolean validLine(String line) {
+						Matcher m = pattern.matcher(line);
+						return m.find();
+				}
+
+				public boolean processLine(String line) throws UnifiedDiffParserException {
+						Matcher m = pattern.matcher(line);
+						if (m.find()) {
+								command.accept(m.toMatchResult(), line);
+								return true;
+						} else {
+								return false;
+						}
+				}
+
+				public boolean isStopsHeaderParsing() {
+						return stopsHeaderParsing;
+				}
+
+				@Override
+				public String toString() {
+						return "UnifiedDiffLine{" + "pattern=" + pattern + ", stopsHeaderParsing=" + stopsHeaderParsing + '}';
+				}
+		}
 }
 
 class InternalUnifiedDiffReader extends BufferedReader {
 
-    private String lastLine;
+		private String lastLine;
 
-    public InternalUnifiedDiffReader(Reader reader) {
-        super(reader);
-    }
+		public InternalUnifiedDiffReader(Reader reader) {
+				super(reader);
+		}
 
-    @Override
-    public String readLine() throws IOException {
-        lastLine = super.readLine();
-        return lastLine();
-    }
+		@Override
+		public String readLine() throws IOException {
+				lastLine = super.readLine();
+				return lastLine();
+		}
 
-    String lastLine() {
-        return lastLine;
-    }
+		String lastLine() {
+				return lastLine;
+		}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java
index 7cac8a2c..aa572683 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java
@@ -32,180 +32,195 @@
  */
 public class UnifiedDiffWriter {
 
-    private static final Logger LOG = Logger.getLogger(UnifiedDiffWriter.class.getName());
-
-    public static void write(UnifiedDiff diff, Function> originalLinesProvider, Writer writer, int contextSize) throws IOException {
-        Objects.requireNonNull(originalLinesProvider, "original lines provider needs to be specified");
-        write(diff, originalLinesProvider, line -> {
-            try {
-                writer.append(line).append("\n");
-            } catch (IOException ex) {
-                LOG.log(Level.SEVERE, null, ex);
-            }
-        }, contextSize);
-    }
-
-    public static void write(UnifiedDiff diff, Function> originalLinesProvider, Consumer writer, int contextSize) throws IOException {
-        if (diff.getHeader() != null) {
-            writer.accept(diff.getHeader());
-        }
-
-        for (UnifiedDiffFile file : diff.getFiles()) {
-            List> patchDeltas = new ArrayList<>(
-                    file.getPatch().getDeltas());
-            if (!patchDeltas.isEmpty()) {
-                writeOrNothing(writer, file.getDiffCommand());
-                if (file.getIndex() != null) {
-                    writer.accept("index " + file.getIndex());
-                }
-
-                writer.accept("--- " + (file.getFromFile() == null ? "/dev/null" : file.getFromFile()));
-
-                if (file.getToFile() != null) {
-                    writer.accept("+++ " + file.getToFile());
-                }
-
-                List originalLines = originalLinesProvider.apply(file.getFromFile());
-
-                List> deltas = new ArrayList<>();
-
-                AbstractDelta delta = patchDeltas.get(0);
-                deltas.add(delta); // add the first Delta to the current set
-                // if there's more than 1 Delta, we may need to output them together
-                if (patchDeltas.size() > 1) {
-                    for (int i = 1; i < patchDeltas.size(); i++) {
-                        int position = delta.getSource().getPosition();
-
-                        // Check if the next Delta is too close to the current
-                        // position.
-                        // And if it is, add it to the current set
-                        AbstractDelta nextDelta = patchDeltas.get(i);
-                        if ((position + delta.getSource().size() + contextSize) >= (nextDelta
-                                .getSource().getPosition() - contextSize)) {
-                            deltas.add(nextDelta);
-                        } else {
-                            // if it isn't, output the current set,
-                            // then create a new set and add the current Delta to
-                            // it.
-                            processDeltas(writer, originalLines, deltas, contextSize, false);
-                            deltas.clear();
-                            deltas.add(nextDelta);
-                        }
-                        delta = nextDelta;
-                    }
-
-                }
-                // don't forget to process the last set of Deltas
-                processDeltas(writer, originalLines, deltas, contextSize,
-                        patchDeltas.size() == 1 && file.getFromFile() == null);
-            }
-
-        }
-        if (diff.getTail() != null) {
-            writer.accept("--");
-            writer.accept(diff.getTail());
-        }
-    }
-
-    private static void processDeltas(Consumer writer,
-            List origLines, List> deltas,
-            int contextSize, boolean newFile) {
-        List buffer = new ArrayList<>();
-        int origTotal = 0; // counter for total lines output from Original
-        int revTotal = 0; // counter for total lines output from Original
-        int line;
-
-        AbstractDelta curDelta = deltas.get(0);
-
-        int origStart;
-        if (newFile) {
-            origStart = 0;
-        } else {
-            // NOTE: +1 to overcome the 0-offset Position
-            origStart = curDelta.getSource().getPosition() + 1 - contextSize;
-            if (origStart < 1) {
-                origStart = 1;
-            }
-        }
-
-        int revStart = curDelta.getTarget().getPosition() + 1 - contextSize;
-        if (revStart < 1) {
-            revStart = 1;
-        }
-
-        // find the start of the wrapper context code
-        int contextStart = curDelta.getSource().getPosition() - contextSize;
-        if (contextStart < 0) {
-            contextStart = 0; // clamp to the start of the file
-        }
-
-        // output the context before the first Delta
-        for (line = contextStart; line < curDelta.getSource().getPosition()
-                && line < origLines.size(); line++) { //
-            buffer.add(" " + origLines.get(line));
-            origTotal++;
-            revTotal++;
-        }
-        // output the first Delta
-        getDeltaText(txt -> buffer.add(txt), curDelta);
-        origTotal += curDelta.getSource().getLines().size();
-        revTotal += curDelta.getTarget().getLines().size();
-
-        int deltaIndex = 1;
-        while (deltaIndex < deltas.size()) { // for each of the other Deltas
-            AbstractDelta nextDelta = deltas.get(deltaIndex);
-            int intermediateStart = curDelta.getSource().getPosition()
-                    + curDelta.getSource().getLines().size();
-            for (line = intermediateStart; line < nextDelta.getSource().getPosition()
-                    && line < origLines.size(); line++) {
-                // output the code between the last Delta and this one
-                buffer.add(" " + origLines.get(line));
-                origTotal++;
-                revTotal++;
-            }
-            getDeltaText(txt -> buffer.add(txt), nextDelta); // output the Delta
-            origTotal += nextDelta.getSource().getLines().size();
-            revTotal += nextDelta.getTarget().getLines().size();
-            curDelta = nextDelta;
-            deltaIndex++;
-        }
-
-        // Now output the post-Delta context code, clamping the end of the file
-        contextStart = curDelta.getSource().getPosition()
-                + curDelta.getSource().getLines().size();
-        for (line = contextStart; (line < (contextStart + contextSize))
-                && (line < origLines.size()); line++) {
-            buffer.add(" " + origLines.get(line));
-            origTotal++;
-            revTotal++;
-        }
-
-        // Create and insert the block header, conforming to the Unified Diff
-        // standard
-        writer.accept("@@ -" + origStart + "," + origTotal + " +" + revStart + "," + revTotal + " @@");
-        buffer.forEach(txt -> {
-            writer.accept(txt);
-        });
-    }
-
-    /**
-     * getDeltaText returns the lines to be added to the Unified Diff text from the Delta parameter. 
-     *
-     * @param writer consumer for the list of String lines of code
-     * @param delta the Delta to output
-     */
-    private static void getDeltaText(Consumer writer, AbstractDelta delta) {
-        for (String line : delta.getSource().getLines()) {
-            writer.accept("-" + line);
-        }
-        for (String line : delta.getTarget().getLines()) {
-            writer.accept("+" + line);
-        }
-    }
-
-    private static void writeOrNothing(Consumer writer, String str) throws IOException {
-        if (str != null) {
-            writer.accept(str);
-        }
-    }
+		private static final Logger LOG = Logger.getLogger(UnifiedDiffWriter.class.getName());
+
+		public static void write(
+						UnifiedDiff diff, Function> originalLinesProvider, Writer writer, int contextSize)
+						throws IOException {
+				Objects.requireNonNull(originalLinesProvider, "original lines provider needs to be specified");
+				write(
+								diff,
+								originalLinesProvider,
+								line -> {
+										try {
+												writer.append(line).append("\n");
+										} catch (IOException ex) {
+												LOG.log(Level.SEVERE, null, ex);
+										}
+								},
+								contextSize);
+		}
+
+		public static void write(
+						UnifiedDiff diff,
+						Function> originalLinesProvider,
+						Consumer writer,
+						int contextSize)
+						throws IOException {
+				if (diff.getHeader() != null) {
+						writer.accept(diff.getHeader());
+				}
+
+				for (UnifiedDiffFile file : diff.getFiles()) {
+						List> patchDeltas =
+										new ArrayList<>(file.getPatch().getDeltas());
+						if (!patchDeltas.isEmpty()) {
+								writeOrNothing(writer, file.getDiffCommand());
+								if (file.getIndex() != null) {
+										writer.accept("index " + file.getIndex());
+								}
+
+								writer.accept("--- " + (file.getFromFile() == null ? "/dev/null" : file.getFromFile()));
+
+								if (file.getToFile() != null) {
+										writer.accept("+++ " + file.getToFile());
+								}
+
+								List originalLines = originalLinesProvider.apply(file.getFromFile());
+
+								List> deltas = new ArrayList<>();
+
+								AbstractDelta delta = patchDeltas.get(0);
+								deltas.add(delta); // add the first Delta to the current set
+								// if there's more than 1 Delta, we may need to output them together
+								if (patchDeltas.size() > 1) {
+										for (int i = 1; i < patchDeltas.size(); i++) {
+												int position = delta.getSource().getPosition();
+
+												// Check if the next Delta is too close to the current
+												// position.
+												// And if it is, add it to the current set
+												AbstractDelta nextDelta = patchDeltas.get(i);
+												if ((position + delta.getSource().size() + contextSize)
+																>= (nextDelta.getSource().getPosition() - contextSize)) {
+														deltas.add(nextDelta);
+												} else {
+														// if it isn't, output the current set,
+														// then create a new set and add the current Delta to
+														// it.
+														processDeltas(writer, originalLines, deltas, contextSize, false);
+														deltas.clear();
+														deltas.add(nextDelta);
+												}
+												delta = nextDelta;
+										}
+								}
+								// don't forget to process the last set of Deltas
+								processDeltas(
+												writer,
+												originalLines,
+												deltas,
+												contextSize,
+												patchDeltas.size() == 1 && file.getFromFile() == null);
+						}
+				}
+				if (diff.getTail() != null) {
+						writer.accept("--");
+						writer.accept(diff.getTail());
+				}
+		}
+
+		private static void processDeltas(
+						Consumer writer,
+						List origLines,
+						List> deltas,
+						int contextSize,
+						boolean newFile) {
+				List buffer = new ArrayList<>();
+				int origTotal = 0; // counter for total lines output from Original
+				int revTotal = 0; // counter for total lines output from Original
+				int line;
+
+				AbstractDelta curDelta = deltas.get(0);
+
+				int origStart;
+				if (newFile) {
+						origStart = 0;
+				} else {
+						// NOTE: +1 to overcome the 0-offset Position
+						origStart = curDelta.getSource().getPosition() + 1 - contextSize;
+						if (origStart < 1) {
+								origStart = 1;
+						}
+				}
+
+				int revStart = curDelta.getTarget().getPosition() + 1 - contextSize;
+				if (revStart < 1) {
+						revStart = 1;
+				}
+
+				// find the start of the wrapper context code
+				int contextStart = curDelta.getSource().getPosition() - contextSize;
+				if (contextStart < 0) {
+						contextStart = 0; // clamp to the start of the file
+				}
+
+				// output the context before the first Delta
+				for (line = contextStart; line < curDelta.getSource().getPosition() && line < origLines.size(); line++) { //
+						buffer.add(" " + origLines.get(line));
+						origTotal++;
+						revTotal++;
+				}
+				// output the first Delta
+				getDeltaText(txt -> buffer.add(txt), curDelta);
+				origTotal += curDelta.getSource().getLines().size();
+				revTotal += curDelta.getTarget().getLines().size();
+
+				int deltaIndex = 1;
+				while (deltaIndex < deltas.size()) { // for each of the other Deltas
+						AbstractDelta nextDelta = deltas.get(deltaIndex);
+						int intermediateStart = curDelta.getSource().getPosition()
+										+ curDelta.getSource().getLines().size();
+						for (line = intermediateStart;
+										line < nextDelta.getSource().getPosition() && line < origLines.size();
+										line++) {
+								// output the code between the last Delta and this one
+								buffer.add(" " + origLines.get(line));
+								origTotal++;
+								revTotal++;
+						}
+						getDeltaText(txt -> buffer.add(txt), nextDelta); // output the Delta
+						origTotal += nextDelta.getSource().getLines().size();
+						revTotal += nextDelta.getTarget().getLines().size();
+						curDelta = nextDelta;
+						deltaIndex++;
+				}
+
+				// Now output the post-Delta context code, clamping the end of the file
+				contextStart = curDelta.getSource().getPosition()
+								+ curDelta.getSource().getLines().size();
+				for (line = contextStart; (line < (contextStart + contextSize)) && (line < origLines.size()); line++) {
+						buffer.add(" " + origLines.get(line));
+						origTotal++;
+						revTotal++;
+				}
+
+				// Create and insert the block header, conforming to the Unified Diff
+				// standard
+				writer.accept("@@ -" + origStart + "," + origTotal + " +" + revStart + "," + revTotal + " @@");
+				buffer.forEach(txt -> {
+						writer.accept(txt);
+				});
+		}
+
+		/**
+		 * getDeltaText returns the lines to be added to the Unified Diff text from the Delta parameter.
+		 *
+		 * @param writer consumer for the list of String lines of code
+		 * @param delta the Delta to output
+		 */
+		private static void getDeltaText(Consumer writer, AbstractDelta delta) {
+				for (String line : delta.getSource().getLines()) {
+						writer.accept("-" + line);
+				}
+				for (String line : delta.getTarget().getLines()) {
+						writer.accept("+" + line);
+				}
+		}
+
+		private static void writeOrNothing(Consumer writer, String str) throws IOException {
+				if (str != null) {
+						writer.accept(str);
+				}
+		}
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java b/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
index 3a4a6995..8d133622 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
@@ -1,9 +1,15 @@
 package com.github.difflib;
 
+import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import com.github.difflib.patch.AbstractDelta;
 import com.github.difflib.patch.ChangeDelta;
 import com.github.difflib.patch.Chunk;
 import com.github.difflib.patch.DeleteDelta;
-import com.github.difflib.patch.AbstractDelta;
 import com.github.difflib.patch.EqualDelta;
 import com.github.difflib.patch.InsertDelta;
 import com.github.difflib.patch.Patch;
@@ -19,224 +25,225 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import static java.util.stream.Collectors.toList;
 import java.util.zip.ZipFile;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 public class DiffUtilsTest {
 
-    @Test
-    public void testDiff_Insert() {
-        final Patch patch = DiffUtils.diff(Arrays.asList("hhh"), Arrays.
-                asList("hhh", "jjj", "kkk"));
-        assertNotNull(patch);
-        assertEquals(1, patch.getDeltas().size());
-        final AbstractDelta delta = patch.getDeltas().get(0);
-        assertTrue(delta instanceof InsertDelta);
-        assertEquals(new Chunk<>(1, Collections.emptyList()), delta.getSource());
-        assertEquals(new Chunk<>(1, Arrays.asList("jjj", "kkk")), delta.getTarget());
-    }
-
-    @Test
-    public void testDiff_Delete() {
-        final Patch patch = DiffUtils.diff(Arrays.asList("ddd", "fff", "ggg"), Arrays.
-                asList("ggg"));
-        assertNotNull(patch);
-        assertEquals(1, patch.getDeltas().size());
-        final AbstractDelta delta = patch.getDeltas().get(0);
-        assertTrue(delta instanceof DeleteDelta);
-        assertEquals(new Chunk<>(0, Arrays.asList("ddd", "fff")), delta.getSource());
-        assertEquals(new Chunk<>(0, Collections.emptyList()), delta.getTarget());
-    }
-
-    @Test
-    public void testDiff_Change() {
-        final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc");
-        final List changeTest_to = Arrays.asList("aaa", "zzz", "ccc");
-
-        final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to);
-        assertNotNull(patch);
-        assertEquals(1, patch.getDeltas().size());
-        final AbstractDelta delta = patch.getDeltas().get(0);
-        assertTrue(delta instanceof ChangeDelta);
-        assertEquals(new Chunk<>(1, Arrays.asList("bbb")), delta.getSource());
-        assertEquals(new Chunk<>(1, Arrays.asList("zzz")), delta.getTarget());
-    }
-
-    @Test
-    public void testDiff_EmptyList() {
-        final Patch patch = DiffUtils.diff(new ArrayList<>(), new ArrayList<>());
-        assertNotNull(patch);
-        assertEquals(0, patch.getDeltas().size());
-    }
-
-    @Test
-    public void testDiff_EmptyListWithNonEmpty() {
-        final Patch patch = DiffUtils.diff(new ArrayList<>(), Arrays.asList("aaa"));
-        assertNotNull(patch);
-        assertEquals(1, patch.getDeltas().size());
-        final AbstractDelta delta = patch.getDeltas().get(0);
-        assertTrue(delta instanceof InsertDelta);
-    }
-
-    @Test
-    public void testDiffInline() {
-        final Patch patch = DiffUtils.diffInline("", "test");
-        assertEquals(1, patch.getDeltas().size());
-        assertTrue(patch.getDeltas().get(0) instanceof InsertDelta);
-        assertEquals(0, patch.getDeltas().get(0).getSource().getPosition());
-        assertEquals(0, patch.getDeltas().get(0).getSource().getLines().size());
-        assertEquals("test", patch.getDeltas().get(0).getTarget().getLines().get(0));
-    }
-
-    @Test
-    public void testDiffInline2() {
-        final Patch patch = DiffUtils.diffInline("es", "fest");
-        assertEquals(2, patch.getDeltas().size());
-        assertTrue(patch.getDeltas().get(0) instanceof InsertDelta);
-        assertEquals(0, patch.getDeltas().get(0).getSource().getPosition());
-        assertEquals(2, patch.getDeltas().get(1).getSource().getPosition());
-        assertEquals(0, patch.getDeltas().get(0).getSource().getLines().size());
-        assertEquals(0, patch.getDeltas().get(1).getSource().getLines().size());
-        assertEquals("f", patch.getDeltas().get(0).getTarget().getLines().get(0));
-        assertEquals("t", patch.getDeltas().get(1).getTarget().getLines().get(0));
-    }
-
-    @Test
-    public void testDiffIntegerList() {
-        List original = Arrays.asList(1, 2, 3, 4, 5);
-        List revised = Arrays.asList(2, 3, 4, 6);
-
-        final Patch patch = DiffUtils.diff(original, revised);
-
-        for (AbstractDelta delta : patch.getDeltas()) {
-            System.out.println(delta);
-        }
-
-        assertEquals(2, patch.getDeltas().size());
-        assertEquals("[DeleteDelta, position: 0, lines: [1]]", patch.getDeltas().get(0).toString());
-        assertEquals("[ChangeDelta, position: 4, lines: [5] to [6]]", patch.getDeltas().get(1).toString());
-    }
-
-    @Test
-    public void testDiffMissesChangeForkDnaumenkoIssue31() {
-        List original = Arrays.asList("line1", "line2", "line3");
-        List revised = Arrays.asList("line1", "line2-2", "line4");
-
-        Patch patch = DiffUtils.diff(original, revised);
-        assertEquals(1, patch.getDeltas().size());
-        assertEquals("[ChangeDelta, position: 1, lines: [line2, line3] to [line2-2, line4]]", patch.getDeltas().get(0).toString());
-    }
-
-    /**
-     * To test this, the greedy Myer algorithm is not suitable.
-     */
-    @Test
-    @Disabled
-    public void testPossibleDiffHangOnLargeDatasetDnaumenkoIssue26() throws IOException {
-        ZipFile zip = new ZipFile(TestConstants.MOCK_FOLDER + "/large_dataset1.zip");
-
-        Patch patch = DiffUtils.diff(
-                readStringListFromInputStream(zip.getInputStream(zip.getEntry("ta"))),
-                readStringListFromInputStream(zip.getInputStream(zip.getEntry("tb"))));
-
-        assertEquals(1, patch.getDeltas().size());
-    }
-
-    public static List readStringListFromInputStream(InputStream is) throws IOException {
-        try (BufferedReader reader = new BufferedReader(
-                new InputStreamReader(is, Charset.forName(StandardCharsets.UTF_8.name())))) {
-
-            return reader.lines().collect(toList());
-        }
-    }
-
-    @Test
-    public void testDiffMyersExample1() {
-        final Patch patch = DiffUtils.diff(Arrays.asList("A", "B", "C", "A", "B", "B", "A"), Arrays.asList("C", "B", "A", "B", "A", "C"));
-        assertNotNull(patch);
-        assertEquals(4, patch.getDeltas().size());
-        assertEquals("Patch{deltas=[[DeleteDelta, position: 0, lines: [A, B]], [InsertDelta, position: 3, lines: [B]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]}", patch.toString());
-    }
-
-    @Test
-    public void testDiff_Equal() {
-        final Patch patch = DiffUtils.diff(
-                Arrays.asList("hhh", "jjj", "kkk"),
-                Arrays.asList("hhh", "jjj", "kkk"), true);
-        assertNotNull(patch);
-        assertEquals(1, patch.getDeltas().size());
-        final AbstractDelta delta = patch.getDeltas().get(0);
-        assertTrue(delta instanceof EqualDelta);
-        assertEquals(new Chunk<>(0, Arrays.asList("hhh", "jjj", "kkk")), delta.getSource());
-        assertEquals(new Chunk<>(0, Arrays.asList("hhh", "jjj", "kkk")), delta.getTarget());
-    }
-
-    @Test
-    public void testDiff_InsertWithEqual() {
-        final Patch patch = DiffUtils.diff(Arrays.asList("hhh"), Arrays.
-                asList("hhh", "jjj", "kkk"), true);
-        assertNotNull(patch);
-        assertEquals(2, patch.getDeltas().size());
-
-        AbstractDelta delta = patch.getDeltas().get(0);
-        assertTrue(delta instanceof EqualDelta);
-        assertEquals(new Chunk<>(0, Arrays.asList("hhh")), delta.getSource());
-        assertEquals(new Chunk<>(0, Arrays.asList("hhh")), delta.getTarget());
-
-        delta = patch.getDeltas().get(1);
-        assertTrue(delta instanceof InsertDelta);
-        assertEquals(new Chunk<>(1, Collections.emptyList()), delta.getSource());
-        assertEquals(new Chunk<>(1, Arrays.asList("jjj", "kkk")), delta.getTarget());
-    }
-
-    @Test
-    public void testDiff_ProblemIssue42() {
-        final Patch patch = DiffUtils.diff(
-                Arrays.asList("The", "dog", "is", "brown"),
-                Arrays.asList("The", "fox", "is", "down"), true);
-
-        System.out.println(patch);
-        assertNotNull(patch);
-        assertEquals(4, patch.getDeltas().size());
-
-        
-        assertThat(patch.getDeltas()).extracting(d -> d.getType().name())
-                .containsExactly("EQUAL", "CHANGE", "EQUAL", "CHANGE");
-        
-        AbstractDelta delta = patch.getDeltas().get(0);
-        assertTrue(delta instanceof EqualDelta);
-        assertEquals(new Chunk<>(0, Arrays.asList("The")), delta.getSource());
-        assertEquals(new Chunk<>(0, Arrays.asList("The")), delta.getTarget());
-
-        delta = patch.getDeltas().get(1);
-        assertTrue(delta instanceof ChangeDelta);
-        assertEquals(new Chunk<>(1, Arrays.asList("dog")), delta.getSource());
-        assertEquals(new Chunk<>(1, Arrays.asList("fox")), delta.getTarget());
-        
-        delta = patch.getDeltas().get(2);
-        assertTrue(delta instanceof EqualDelta);
-        assertEquals(new Chunk<>(2, Arrays.asList("is")), delta.getSource());
-        assertEquals(new Chunk<>(2, Arrays.asList("is")), delta.getTarget());
-        
-        delta = patch.getDeltas().get(3);
-        assertTrue(delta instanceof ChangeDelta);
-        assertEquals(new Chunk<>(3, Arrays.asList("brown")), delta.getSource());
-        assertEquals(new Chunk<>(3, Arrays.asList("down")), delta.getTarget());
-    }
-    
-    @Test
-    public void testDiffPatchIssue189Problem() throws IOException {
-        String original = new String(Files.readAllBytes(Paths.get("target/test-classes/com/github/difflib/text/issue_189_insert_original.txt")));
-        String revised = new String(Files.readAllBytes(Paths.get("target/test-classes/com/github/difflib/text/issue_189_insert_revised.txt")));
-        
-        Patch patch = DiffUtils.diff(Arrays.asList(original.split("\n")), Arrays.asList(revised.split("\n")));
-        
-        assertEquals(1, patch.getDeltas().size());
-    }
+		@Test
+		public void testDiff_Insert() {
+				final Patch patch = DiffUtils.diff(Arrays.asList("hhh"), Arrays.asList("hhh", "jjj", "kkk"));
+				assertNotNull(patch);
+				assertEquals(1, patch.getDeltas().size());
+				final AbstractDelta delta = patch.getDeltas().get(0);
+				assertTrue(delta instanceof InsertDelta);
+				assertEquals(new Chunk<>(1, Collections.emptyList()), delta.getSource());
+				assertEquals(new Chunk<>(1, Arrays.asList("jjj", "kkk")), delta.getTarget());
+		}
+
+		@Test
+		public void testDiff_Delete() {
+				final Patch patch = DiffUtils.diff(Arrays.asList("ddd", "fff", "ggg"), Arrays.asList("ggg"));
+				assertNotNull(patch);
+				assertEquals(1, patch.getDeltas().size());
+				final AbstractDelta delta = patch.getDeltas().get(0);
+				assertTrue(delta instanceof DeleteDelta);
+				assertEquals(new Chunk<>(0, Arrays.asList("ddd", "fff")), delta.getSource());
+				assertEquals(new Chunk<>(0, Collections.emptyList()), delta.getTarget());
+		}
+
+		@Test
+		public void testDiff_Change() {
+				final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc");
+				final List changeTest_to = Arrays.asList("aaa", "zzz", "ccc");
+
+				final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to);
+				assertNotNull(patch);
+				assertEquals(1, patch.getDeltas().size());
+				final AbstractDelta delta = patch.getDeltas().get(0);
+				assertTrue(delta instanceof ChangeDelta);
+				assertEquals(new Chunk<>(1, Arrays.asList("bbb")), delta.getSource());
+				assertEquals(new Chunk<>(1, Arrays.asList("zzz")), delta.getTarget());
+		}
+
+		@Test
+		public void testDiff_EmptyList() {
+				final Patch patch = DiffUtils.diff(new ArrayList<>(), new ArrayList<>());
+				assertNotNull(patch);
+				assertEquals(0, patch.getDeltas().size());
+		}
+
+		@Test
+		public void testDiff_EmptyListWithNonEmpty() {
+				final Patch patch = DiffUtils.diff(new ArrayList<>(), Arrays.asList("aaa"));
+				assertNotNull(patch);
+				assertEquals(1, patch.getDeltas().size());
+				final AbstractDelta delta = patch.getDeltas().get(0);
+				assertTrue(delta instanceof InsertDelta);
+		}
+
+		@Test
+		public void testDiffInline() {
+				final Patch patch = DiffUtils.diffInline("", "test");
+				assertEquals(1, patch.getDeltas().size());
+				assertTrue(patch.getDeltas().get(0) instanceof InsertDelta);
+				assertEquals(0, patch.getDeltas().get(0).getSource().getPosition());
+				assertEquals(0, patch.getDeltas().get(0).getSource().getLines().size());
+				assertEquals("test", patch.getDeltas().get(0).getTarget().getLines().get(0));
+		}
+
+		@Test
+		public void testDiffInline2() {
+				final Patch patch = DiffUtils.diffInline("es", "fest");
+				assertEquals(2, patch.getDeltas().size());
+				assertTrue(patch.getDeltas().get(0) instanceof InsertDelta);
+				assertEquals(0, patch.getDeltas().get(0).getSource().getPosition());
+				assertEquals(2, patch.getDeltas().get(1).getSource().getPosition());
+				assertEquals(0, patch.getDeltas().get(0).getSource().getLines().size());
+				assertEquals(0, patch.getDeltas().get(1).getSource().getLines().size());
+				assertEquals("f", patch.getDeltas().get(0).getTarget().getLines().get(0));
+				assertEquals("t", patch.getDeltas().get(1).getTarget().getLines().get(0));
+		}
+
+		@Test
+		public void testDiffIntegerList() {
+				List original = Arrays.asList(1, 2, 3, 4, 5);
+				List revised = Arrays.asList(2, 3, 4, 6);
+
+				final Patch patch = DiffUtils.diff(original, revised);
+
+				for (AbstractDelta delta : patch.getDeltas()) {
+						System.out.println(delta);
+				}
+
+				assertEquals(2, patch.getDeltas().size());
+				assertEquals(
+								"[DeleteDelta, position: 0, lines: [1]]",
+								patch.getDeltas().get(0).toString());
+				assertEquals(
+								"[ChangeDelta, position: 4, lines: [5] to [6]]",
+								patch.getDeltas().get(1).toString());
+		}
+
+		@Test
+		public void testDiffMissesChangeForkDnaumenkoIssue31() {
+				List original = Arrays.asList("line1", "line2", "line3");
+				List revised = Arrays.asList("line1", "line2-2", "line4");
+
+				Patch patch = DiffUtils.diff(original, revised);
+				assertEquals(1, patch.getDeltas().size());
+				assertEquals(
+								"[ChangeDelta, position: 1, lines: [line2, line3] to [line2-2, line4]]",
+								patch.getDeltas().get(0).toString());
+		}
+
+		/**
+		 * To test this, the greedy Myer algorithm is not suitable.
+		 */
+		@Test
+		@Disabled
+		public void testPossibleDiffHangOnLargeDatasetDnaumenkoIssue26() throws IOException {
+				ZipFile zip = new ZipFile(TestConstants.MOCK_FOLDER + "/large_dataset1.zip");
+
+				Patch patch = DiffUtils.diff(
+								readStringListFromInputStream(zip.getInputStream(zip.getEntry("ta"))),
+								readStringListFromInputStream(zip.getInputStream(zip.getEntry("tb"))));
+
+				assertEquals(1, patch.getDeltas().size());
+		}
+
+		public static List readStringListFromInputStream(InputStream is) throws IOException {
+				try (BufferedReader reader =
+								new BufferedReader(new InputStreamReader(is, Charset.forName(StandardCharsets.UTF_8.name())))) {
+
+						return reader.lines().collect(toList());
+				}
+		}
+
+		@Test
+		public void testDiffMyersExample1() {
+				final Patch patch = DiffUtils.diff(
+								Arrays.asList("A", "B", "C", "A", "B", "B", "A"), Arrays.asList("C", "B", "A", "B", "A", "C"));
+				assertNotNull(patch);
+				assertEquals(4, patch.getDeltas().size());
+				assertEquals(
+								"Patch{deltas=[[DeleteDelta, position: 0, lines: [A, B]], [InsertDelta, position: 3, lines: [B]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]}",
+								patch.toString());
+		}
+
+		@Test
+		public void testDiff_Equal() {
+				final Patch patch =
+								DiffUtils.diff(Arrays.asList("hhh", "jjj", "kkk"), Arrays.asList("hhh", "jjj", "kkk"), true);
+				assertNotNull(patch);
+				assertEquals(1, patch.getDeltas().size());
+				final AbstractDelta delta = patch.getDeltas().get(0);
+				assertTrue(delta instanceof EqualDelta);
+				assertEquals(new Chunk<>(0, Arrays.asList("hhh", "jjj", "kkk")), delta.getSource());
+				assertEquals(new Chunk<>(0, Arrays.asList("hhh", "jjj", "kkk")), delta.getTarget());
+		}
+
+		@Test
+		public void testDiff_InsertWithEqual() {
+				final Patch patch = DiffUtils.diff(Arrays.asList("hhh"), Arrays.asList("hhh", "jjj", "kkk"), true);
+				assertNotNull(patch);
+				assertEquals(2, patch.getDeltas().size());
+
+				AbstractDelta delta = patch.getDeltas().get(0);
+				assertTrue(delta instanceof EqualDelta);
+				assertEquals(new Chunk<>(0, Arrays.asList("hhh")), delta.getSource());
+				assertEquals(new Chunk<>(0, Arrays.asList("hhh")), delta.getTarget());
+
+				delta = patch.getDeltas().get(1);
+				assertTrue(delta instanceof InsertDelta);
+				assertEquals(new Chunk<>(1, Collections.emptyList()), delta.getSource());
+				assertEquals(new Chunk<>(1, Arrays.asList("jjj", "kkk")), delta.getTarget());
+		}
+
+		@Test
+		public void testDiff_ProblemIssue42() {
+				final Patch patch = DiffUtils.diff(
+								Arrays.asList("The", "dog", "is", "brown"), Arrays.asList("The", "fox", "is", "down"), true);
+
+				System.out.println(patch);
+				assertNotNull(patch);
+				assertEquals(4, patch.getDeltas().size());
+
+				assertThat(patch.getDeltas())
+								.extracting(d -> d.getType().name())
+								.containsExactly("EQUAL", "CHANGE", "EQUAL", "CHANGE");
+
+				AbstractDelta delta = patch.getDeltas().get(0);
+				assertTrue(delta instanceof EqualDelta);
+				assertEquals(new Chunk<>(0, Arrays.asList("The")), delta.getSource());
+				assertEquals(new Chunk<>(0, Arrays.asList("The")), delta.getTarget());
+
+				delta = patch.getDeltas().get(1);
+				assertTrue(delta instanceof ChangeDelta);
+				assertEquals(new Chunk<>(1, Arrays.asList("dog")), delta.getSource());
+				assertEquals(new Chunk<>(1, Arrays.asList("fox")), delta.getTarget());
+
+				delta = patch.getDeltas().get(2);
+				assertTrue(delta instanceof EqualDelta);
+				assertEquals(new Chunk<>(2, Arrays.asList("is")), delta.getSource());
+				assertEquals(new Chunk<>(2, Arrays.asList("is")), delta.getTarget());
+
+				delta = patch.getDeltas().get(3);
+				assertTrue(delta instanceof ChangeDelta);
+				assertEquals(new Chunk<>(3, Arrays.asList("brown")), delta.getSource());
+				assertEquals(new Chunk<>(3, Arrays.asList("down")), delta.getTarget());
+		}
+
+		@Test
+		public void testDiffPatchIssue189Problem() throws IOException {
+				String original = new String(Files.readAllBytes(
+								Paths.get("target/test-classes/com/github/difflib/text/issue_189_insert_original.txt")));
+				String revised = new String(Files.readAllBytes(
+								Paths.get("target/test-classes/com/github/difflib/text/issue_189_insert_revised.txt")));
+
+				Patch patch = DiffUtils.diff(Arrays.asList(original.split("\n")), Arrays.asList(revised.split("\n")));
+
+				assertEquals(1, patch.getDeltas().size());
+		}
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
index b8667818..3e2357da 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
@@ -1,5 +1,12 @@
 package com.github.difflib;
 
+import static java.util.stream.Collectors.joining;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
 import com.github.difflib.patch.Chunk;
 import com.github.difflib.patch.Patch;
 import com.github.difflib.patch.PatchFailedException;
@@ -11,219 +18,211 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import static java.util.stream.Collectors.joining;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
 import org.junit.jupiter.api.Test;
 
 public class GenerateUnifiedDiffTest {
 
-    public static List fileToLines(String filename) throws FileNotFoundException, IOException {
-        List lines = new ArrayList<>();
-        String line = "";
-        try (BufferedReader in = new BufferedReader(new FileReader(filename))) {
-            while ((line = in.readLine()) != null) {
-                lines.add(line);
-            }
-        }
-        return lines;
-    }
-
-    @Test
-    public void testGenerateUnified() throws IOException {
-        List origLines = fileToLines(TestConstants.MOCK_FOLDER + "original.txt");
-        List revLines = fileToLines(TestConstants.MOCK_FOLDER + "revised.txt");
-
-        verify(origLines, revLines, "original.txt", "revised.txt");
-    }
-
-    @Test
-    public void testGenerateUnifiedWithOneDelta() throws IOException {
-        List origLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_original.txt");
-        List revLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_revised.txt");
-
-        verify(origLines, revLines, "one_delta_test_original.txt", "one_delta_test_revised.txt");
-    }
-
-    @Test
-    public void testGenerateUnifiedDiffWithoutAnyDeltas() {
-        List test = Arrays.asList("abc");
-        List testRevised = Arrays.asList("abc2");
-        Patch patch = DiffUtils.diff(test, testRevised);
-        String unifiedDiffTxt = String.join("\n", UnifiedDiffUtils.generateUnifiedDiff("abc1", "abc2", test, patch, 0));
-        System.out.println(unifiedDiffTxt);
-        
-        assertThat(unifiedDiffTxt)
-                .as("original filename should be abc1").contains("--- abc1")
-                .as("revised filename should be abc2").contains("+++ abc2");
-    }
-
-    @Test
-    public void testDiff_Issue10() throws IOException {
-        final List baseLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_base.txt");
-        final List patchLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_patch.txt");
-        final Patch p = UnifiedDiffUtils.parseUnifiedDiff(patchLines);
-        try {
-            DiffUtils.patch(baseLines, p);
-        } catch (PatchFailedException e) {
-            fail(e.getMessage());
-        }
-    }
-
-    /**
-     * Issue 12
-     */
-    @Test
-    public void testPatchWithNoDeltas() throws IOException {
-        final List lines1 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_1.txt");
-        final List lines2 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_2.txt");
-        verify(lines1, lines2, "issue11_1.txt", "issue11_2.txt");
-    }
-
-    @Test
-    public void testDiff5() throws IOException {
-        final List lines1 = fileToLines(TestConstants.MOCK_FOLDER + "5A.txt");
-        final List lines2 = fileToLines(TestConstants.MOCK_FOLDER + "5B.txt");
-        verify(lines1, lines2, "5A.txt", "5B.txt");
-    }
-
-    /**
-     * Issue 19
-     */
-    @Test
-    public void testDiffWithHeaderLineInText() {
-        List original = new ArrayList<>();
-        List revised = new ArrayList<>();
-
-        original.add("test line1");
-        original.add("test line2");
-        original.add("test line 4");
-        original.add("test line 5");
-
-        revised.add("test line1");
-        revised.add("test line2");
-        revised.add("@@ -2,6 +2,7 @@");
-        revised.add("test line 4");
-        revised.add("test line 5");
-
-        Patch patch = DiffUtils.diff(original, revised);
-        List udiff = UnifiedDiffUtils.generateUnifiedDiff("original", "revised",
-                original, patch, 10);
-        UnifiedDiffUtils.parseUnifiedDiff(udiff);
-    }
-    
-    /**
-     * Issue 47
-     */
-    @Test
-    public void testNewFileCreation() {
-        List original = new ArrayList<>();
-        List revised = new ArrayList<>();
-
-        revised.add("line1");
-        revised.add("line2");
-
-        Patch patch = DiffUtils.diff(original, revised);
-        List udiff = UnifiedDiffUtils.generateUnifiedDiff(null, "revised",
-                original, patch, 10);
-        
-        assertEquals("--- /dev/null", udiff.get(0));
-        assertEquals("+++ revised", udiff.get(1));
-        assertEquals("@@ -0,0 +1,2 @@", udiff.get(2));
-        
-        UnifiedDiffUtils.parseUnifiedDiff(udiff);
-    }
-
-    /**
-     * Issue 89
-     */
-    @Test
-    public void testChangePosition() throws IOException {
-        final List patchLines = fileToLines(TestConstants.MOCK_FOLDER + "issue89_patch.txt");
-        final Patch patch = UnifiedDiffUtils.parseUnifiedDiff(patchLines);
-        List realRemoveListOne = Collections.singletonList(3);
-        List realAddListOne = Arrays.asList(3, 7, 8, 9, 10, 11, 12, 13, 14);
-        validateChangePosition(patch, 0, realRemoveListOne, realAddListOne);
-        List realRemoveListTwo = new ArrayList<>();
-        List realAddListTwo = Arrays.asList(27, 28);
-        validateChangePosition(patch, 1, realRemoveListTwo, realAddListTwo);
-
-    }
-
-    private void validateChangePosition(Patch patch, int index, List realRemoveList,
-                                        List realAddList ) {
-        final Chunk originChunk = patch.getDeltas().get(index).getSource();
-        List removeList = originChunk.getChangePosition();
-        assertEquals(realRemoveList.size(), removeList.size());
-        for (Integer ele: realRemoveList) {
-            assertTrue(realRemoveList.contains(ele));
-        }
-        for (Integer ele: removeList) {
-            assertTrue(realAddList.contains(ele));
-        }
-        final Chunk targetChunk = patch.getDeltas().get(index).getTarget();
-        List addList = targetChunk.getChangePosition();
-        assertEquals(realAddList.size(), addList.size());
-        for (Integer ele: realAddList) {
-            assertTrue(addList.contains(ele));
-        }
-        for (Integer ele: addList) {
-            assertTrue(realAddList.contains(ele));
-        }
-    }
-
-    private void verify(List origLines, List revLines,
-            String originalFile, String revisedFile) {
-        Patch patch = DiffUtils.diff(origLines, revLines);
-        List unifiedDiff = UnifiedDiffUtils.generateUnifiedDiff(originalFile, revisedFile,
-                origLines, patch, 10);
-
-        System.out.println(unifiedDiff.stream().collect(joining("\n")));
-
-        Patch fromUnifiedPatch = UnifiedDiffUtils.parseUnifiedDiff(unifiedDiff);
-        List patchedLines;
-        try {
-            patchedLines = fromUnifiedPatch.applyTo(origLines);
-            assertEquals(revLines.size(), patchedLines.size());
-            for (int i = 0; i < revLines.size(); i++) {
-                String l1 = revLines.get(i);
-                String l2 = patchedLines.get(i);
-                if (!l1.equals(l2)) {
-                    fail("Line " + (i + 1) + " of the patched file did not match the revised original");
-                }
-            }
-        } catch (PatchFailedException e) {
-            fail(e.getMessage());
-        }
-    }
-    
-    
-    @Test
-    public void testFailingPatchByException() throws IOException {
-        final List baseLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_base.txt");
-        final List patchLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_patch.txt");
-        final Patch p = UnifiedDiffUtils.parseUnifiedDiff(patchLines);
-        
-        //make original not fitting
-        baseLines.set(40, baseLines.get(40) + " corrupted ");
-        
-        assertThrows(PatchFailedException.class, () -> DiffUtils.patch(baseLines, p));
-    }
-    
-    @Test
-    public void testWrongContextLength() throws IOException {
-        List original = fileToLines(TestConstants.BASE_FOLDER_RESOURCES + "com/github/difflib/text/issue_119_original.txt");
-        List revised = fileToLines(TestConstants.BASE_FOLDER_RESOURCES + "com/github/difflib/text/issue_119_revised.txt");
-
-        Patch patch = DiffUtils.diff(original, revised);
-        List udiff = UnifiedDiffUtils.generateUnifiedDiff("a/$filename", "b/$filename",
-                original, patch, 3);
-        
-        //System.out.println(udiff.stream().collect(joining("\n")));
-        
-        assertThat(udiff).contains("@@ -1,4 +1,4 @@");
-    }
+		public static List fileToLines(String filename) throws FileNotFoundException, IOException {
+				List lines = new ArrayList<>();
+				String line = "";
+				try (BufferedReader in = new BufferedReader(new FileReader(filename))) {
+						while ((line = in.readLine()) != null) {
+								lines.add(line);
+						}
+				}
+				return lines;
+		}
+
+		@Test
+		public void testGenerateUnified() throws IOException {
+				List origLines = fileToLines(TestConstants.MOCK_FOLDER + "original.txt");
+				List revLines = fileToLines(TestConstants.MOCK_FOLDER + "revised.txt");
+
+				verify(origLines, revLines, "original.txt", "revised.txt");
+		}
+
+		@Test
+		public void testGenerateUnifiedWithOneDelta() throws IOException {
+				List origLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_original.txt");
+				List revLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_revised.txt");
+
+				verify(origLines, revLines, "one_delta_test_original.txt", "one_delta_test_revised.txt");
+		}
+
+		@Test
+		public void testGenerateUnifiedDiffWithoutAnyDeltas() {
+				List test = Arrays.asList("abc");
+				List testRevised = Arrays.asList("abc2");
+				Patch patch = DiffUtils.diff(test, testRevised);
+				String unifiedDiffTxt = String.join("\n", UnifiedDiffUtils.generateUnifiedDiff("abc1", "abc2", test, patch, 0));
+				System.out.println(unifiedDiffTxt);
+
+				assertThat(unifiedDiffTxt)
+								.as("original filename should be abc1")
+								.contains("--- abc1")
+								.as("revised filename should be abc2")
+								.contains("+++ abc2");
+		}
+
+		@Test
+		public void testDiff_Issue10() throws IOException {
+				final List baseLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_base.txt");
+				final List patchLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_patch.txt");
+				final Patch p = UnifiedDiffUtils.parseUnifiedDiff(patchLines);
+				try {
+						DiffUtils.patch(baseLines, p);
+				} catch (PatchFailedException e) {
+						fail(e.getMessage());
+				}
+		}
+
+		/**
+		 * Issue 12
+		 */
+		@Test
+		public void testPatchWithNoDeltas() throws IOException {
+				final List lines1 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_1.txt");
+				final List lines2 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_2.txt");
+				verify(lines1, lines2, "issue11_1.txt", "issue11_2.txt");
+		}
+
+		@Test
+		public void testDiff5() throws IOException {
+				final List lines1 = fileToLines(TestConstants.MOCK_FOLDER + "5A.txt");
+				final List lines2 = fileToLines(TestConstants.MOCK_FOLDER + "5B.txt");
+				verify(lines1, lines2, "5A.txt", "5B.txt");
+		}
+
+		/**
+		 * Issue 19
+		 */
+		@Test
+		public void testDiffWithHeaderLineInText() {
+				List original = new ArrayList<>();
+				List revised = new ArrayList<>();
+
+				original.add("test line1");
+				original.add("test line2");
+				original.add("test line 4");
+				original.add("test line 5");
+
+				revised.add("test line1");
+				revised.add("test line2");
+				revised.add("@@ -2,6 +2,7 @@");
+				revised.add("test line 4");
+				revised.add("test line 5");
+
+				Patch patch = DiffUtils.diff(original, revised);
+				List udiff = UnifiedDiffUtils.generateUnifiedDiff("original", "revised", original, patch, 10);
+				UnifiedDiffUtils.parseUnifiedDiff(udiff);
+		}
+
+		/**
+		 * Issue 47
+		 */
+		@Test
+		public void testNewFileCreation() {
+				List original = new ArrayList<>();
+				List revised = new ArrayList<>();
+
+				revised.add("line1");
+				revised.add("line2");
+
+				Patch patch = DiffUtils.diff(original, revised);
+				List udiff = UnifiedDiffUtils.generateUnifiedDiff(null, "revised", original, patch, 10);
+
+				assertEquals("--- /dev/null", udiff.get(0));
+				assertEquals("+++ revised", udiff.get(1));
+				assertEquals("@@ -0,0 +1,2 @@", udiff.get(2));
+
+				UnifiedDiffUtils.parseUnifiedDiff(udiff);
+		}
+
+		/**
+		 * Issue 89
+		 */
+		@Test
+		public void testChangePosition() throws IOException {
+				final List patchLines = fileToLines(TestConstants.MOCK_FOLDER + "issue89_patch.txt");
+				final Patch patch = UnifiedDiffUtils.parseUnifiedDiff(patchLines);
+				List realRemoveListOne = Collections.singletonList(3);
+				List realAddListOne = Arrays.asList(3, 7, 8, 9, 10, 11, 12, 13, 14);
+				validateChangePosition(patch, 0, realRemoveListOne, realAddListOne);
+				List realRemoveListTwo = new ArrayList<>();
+				List realAddListTwo = Arrays.asList(27, 28);
+				validateChangePosition(patch, 1, realRemoveListTwo, realAddListTwo);
+		}
+
+		private void validateChangePosition(
+						Patch patch, int index, List realRemoveList, List realAddList) {
+				final Chunk originChunk = patch.getDeltas().get(index).getSource();
+				List removeList = originChunk.getChangePosition();
+				assertEquals(realRemoveList.size(), removeList.size());
+				for (Integer ele : realRemoveList) {
+						assertTrue(realRemoveList.contains(ele));
+				}
+				for (Integer ele : removeList) {
+						assertTrue(realAddList.contains(ele));
+				}
+				final Chunk targetChunk = patch.getDeltas().get(index).getTarget();
+				List addList = targetChunk.getChangePosition();
+				assertEquals(realAddList.size(), addList.size());
+				for (Integer ele : realAddList) {
+						assertTrue(addList.contains(ele));
+				}
+				for (Integer ele : addList) {
+						assertTrue(realAddList.contains(ele));
+				}
+		}
+
+		private void verify(List origLines, List revLines, String originalFile, String revisedFile) {
+				Patch patch = DiffUtils.diff(origLines, revLines);
+				List unifiedDiff =
+								UnifiedDiffUtils.generateUnifiedDiff(originalFile, revisedFile, origLines, patch, 10);
+
+				System.out.println(unifiedDiff.stream().collect(joining("\n")));
+
+				Patch fromUnifiedPatch = UnifiedDiffUtils.parseUnifiedDiff(unifiedDiff);
+				List patchedLines;
+				try {
+						patchedLines = fromUnifiedPatch.applyTo(origLines);
+						assertEquals(revLines.size(), patchedLines.size());
+						for (int i = 0; i < revLines.size(); i++) {
+								String l1 = revLines.get(i);
+								String l2 = patchedLines.get(i);
+								if (!l1.equals(l2)) {
+										fail("Line " + (i + 1) + " of the patched file did not match the revised original");
+								}
+						}
+				} catch (PatchFailedException e) {
+						fail(e.getMessage());
+				}
+		}
+
+		@Test
+		public void testFailingPatchByException() throws IOException {
+				final List baseLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_base.txt");
+				final List patchLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_patch.txt");
+				final Patch p = UnifiedDiffUtils.parseUnifiedDiff(patchLines);
+
+				// make original not fitting
+				baseLines.set(40, baseLines.get(40) + " corrupted ");
+
+				assertThrows(PatchFailedException.class, () -> DiffUtils.patch(baseLines, p));
+		}
+
+		@Test
+		public void testWrongContextLength() throws IOException {
+				List original =
+								fileToLines(TestConstants.BASE_FOLDER_RESOURCES + "com/github/difflib/text/issue_119_original.txt");
+				List revised =
+								fileToLines(TestConstants.BASE_FOLDER_RESOURCES + "com/github/difflib/text/issue_119_revised.txt");
+
+				Patch patch = DiffUtils.diff(original, revised);
+				List udiff = UnifiedDiffUtils.generateUnifiedDiff("a/$filename", "b/$filename", original, patch, 3);
+
+				// System.out.println(udiff.stream().collect(joining("\n")));
+
+				assertThat(udiff).contains("@@ -1,4 +1,4 @@");
+		}
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/TestConstants.java b/java-diff-utils/src/test/java/com/github/difflib/TestConstants.java
index ba6d754e..f7035864 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/TestConstants.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/TestConstants.java
@@ -8,12 +8,11 @@
  */
 public final class TestConstants {
 
-    public static final String BASE_FOLDER_RESOURCES = "target/test-classes/";
-    /**
-     * The base folder containing the test files.
-     */
-    public static final String MOCK_FOLDER = BASE_FOLDER_RESOURCES + "/mocks/";
+		public static final String BASE_FOLDER_RESOURCES = "target/test-classes/";
+		/**
+		 * The base folder containing the test files.
+		 */
+		public static final String MOCK_FOLDER = BASE_FOLDER_RESOURCES + "/mocks/";
 
-    private TestConstants() {
-    }
+		private TestConstants() {}
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java
index 1e233a8c..f315f2b9 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java
@@ -15,13 +15,14 @@
  */
 package com.github.difflib.algorithm.myers;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import com.github.difflib.algorithm.DiffAlgorithmListener;
 import com.github.difflib.patch.Patch;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -30,43 +31,48 @@
  */
 public class MyersDiffTest {
 
-    @Test
-    public void testDiffMyersExample1Forward() {
-        List original = Arrays.asList("A", "B", "C", "A", "B", "B", "A");
-        List revised = Arrays.asList("C", "B", "A", "B", "A", "C");
-        final Patch patch = Patch.generate(original, revised, new MyersDiff().computeDiff(original, revised, null));
-        assertNotNull(patch);
-        assertEquals(4, patch.getDeltas().size());
-        assertEquals("Patch{deltas=[[DeleteDelta, position: 0, lines: [A, B]], [InsertDelta, position: 3, lines: [B]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]}", patch.toString());
-    }
-    
-    @Test
-    public void testDiffMyersExample1ForwardWithListener() {
-        List original = Arrays.asList("A", "B", "C", "A", "B", "B", "A");
-        List revised = Arrays.asList("C", "B", "A", "B", "A", "C");
-        
-        List logdata = new ArrayList<>();
-        final Patch patch = Patch.generate(original, revised, 
-                new MyersDiff().computeDiff(original, revised, new DiffAlgorithmListener() {
-            @Override
-            public void diffStart() {
-                logdata.add("start");
-            }
+		@Test
+		public void testDiffMyersExample1Forward() {
+				List original = Arrays.asList("A", "B", "C", "A", "B", "B", "A");
+				List revised = Arrays.asList("C", "B", "A", "B", "A", "C");
+				final Patch patch =
+								Patch.generate(original, revised, new MyersDiff().computeDiff(original, revised, null));
+				assertNotNull(patch);
+				assertEquals(4, patch.getDeltas().size());
+				assertEquals(
+								"Patch{deltas=[[DeleteDelta, position: 0, lines: [A, B]], [InsertDelta, position: 3, lines: [B]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]}",
+								patch.toString());
+		}
+
+		@Test
+		public void testDiffMyersExample1ForwardWithListener() {
+				List original = Arrays.asList("A", "B", "C", "A", "B", "B", "A");
+				List revised = Arrays.asList("C", "B", "A", "B", "A", "C");
+
+				List logdata = new ArrayList<>();
+				final Patch patch = Patch.generate(
+								original, revised, new MyersDiff().computeDiff(original, revised, new DiffAlgorithmListener() {
+														@Override
+														public void diffStart() {
+																logdata.add("start");
+														}
 
-            @Override
-            public void diffStep(int value, int max) {
-                logdata.add(value + " - " + max);
-            }
+														@Override
+														public void diffStep(int value, int max) {
+																logdata.add(value + " - " + max);
+														}
 
-            @Override
-            public void diffEnd() {
-                logdata.add("end");
-            }
-        }));
-        assertNotNull(patch);
-        assertEquals(4, patch.getDeltas().size());
-        assertEquals("Patch{deltas=[[DeleteDelta, position: 0, lines: [A, B]], [InsertDelta, position: 3, lines: [B]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]}", patch.toString());
-        System.out.println(logdata);
-        assertEquals(8, logdata.size());
-    }
+														@Override
+														public void diffEnd() {
+																logdata.add("end");
+														}
+												}));
+				assertNotNull(patch);
+				assertEquals(4, patch.getDeltas().size());
+				assertEquals(
+								"Patch{deltas=[[DeleteDelta, position: 0, lines: [A, B]], [InsertDelta, position: 3, lines: [B]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]}",
+								patch.toString());
+				System.out.println(logdata);
+				assertEquals(8, logdata.size());
+		}
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffWithLinearSpaceTest.java b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffWithLinearSpaceTest.java
index b63876ac..87f80134 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffWithLinearSpaceTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffWithLinearSpaceTest.java
@@ -15,77 +15,83 @@
  */
 package com.github.difflib.algorithm.myers;
 
+import static java.util.stream.Collectors.toList;
+import static org.junit.jupiter.api.Assertions.*;
+
 import com.github.difflib.DiffUtils;
 import com.github.difflib.algorithm.DiffAlgorithmListener;
 import com.github.difflib.patch.Patch;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import static java.util.stream.Collectors.toList;
 import java.util.stream.IntStream;
 import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
  * @author tw
  */
 public class MyersDiffWithLinearSpaceTest {
-    
-    @Test
-    public void testDiffMyersExample1Forward() {
-        List original = Arrays.asList("A", "B", "C", "A", "B", "B", "A");
-        List revised = Arrays.asList("C", "B", "A", "B", "A", "C");
-        final Patch patch = Patch.generate(original, revised, new MyersDiffWithLinearSpace().computeDiff(original, revised, null));
-        assertNotNull(patch);
-        System.out.println(patch);
-        assertEquals(5, patch.getDeltas().size());
-        assertEquals("Patch{deltas=[[InsertDelta, position: 0, lines: [C]], [DeleteDelta, position: 0, lines: [A]], [DeleteDelta, position: 2, lines: [C]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]}", patch.toString());
-    }
-    
-    @Test
-    public void testDiffMyersExample1ForwardWithListener() {
-        List original = Arrays.asList("A", "B", "C", "A", "B", "B", "A");
-        List revised = Arrays.asList("C", "B", "A", "B", "A", "C");
-        
-        List logdata = new ArrayList<>();
-        final Patch patch = Patch.generate(original, revised, 
-                new MyersDiffWithLinearSpace().computeDiff(original, revised, new DiffAlgorithmListener() {
-            @Override
-            public void diffStart() {
-                logdata.add("start");
-            }
 
-            @Override
-            public void diffStep(int value, int max) {
-                logdata.add(value + " - " + max);
-            }
+		@Test
+		public void testDiffMyersExample1Forward() {
+				List original = Arrays.asList("A", "B", "C", "A", "B", "B", "A");
+				List revised = Arrays.asList("C", "B", "A", "B", "A", "C");
+				final Patch patch = Patch.generate(
+								original, revised, new MyersDiffWithLinearSpace().computeDiff(original, revised, null));
+				assertNotNull(patch);
+				System.out.println(patch);
+				assertEquals(5, patch.getDeltas().size());
+				assertEquals(
+								"Patch{deltas=[[InsertDelta, position: 0, lines: [C]], [DeleteDelta, position: 0, lines: [A]], [DeleteDelta, position: 2, lines: [C]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]}",
+								patch.toString());
+		}
+
+		@Test
+		public void testDiffMyersExample1ForwardWithListener() {
+				List original = Arrays.asList("A", "B", "C", "A", "B", "B", "A");
+				List revised = Arrays.asList("C", "B", "A", "B", "A", "C");
+
+				List logdata = new ArrayList<>();
+				final Patch patch = Patch.generate(
+								original,
+								revised,
+								new MyersDiffWithLinearSpace().computeDiff(original, revised, new DiffAlgorithmListener() {
+										@Override
+										public void diffStart() {
+												logdata.add("start");
+										}
+
+										@Override
+										public void diffStep(int value, int max) {
+												logdata.add(value + " - " + max);
+										}
+
+										@Override
+										public void diffEnd() {
+												logdata.add("end");
+										}
+								}));
+				assertNotNull(patch);
+				System.out.println(patch);
+				assertEquals(5, patch.getDeltas().size());
+				assertEquals(
+								"Patch{deltas=[[InsertDelta, position: 0, lines: [C]], [DeleteDelta, position: 0, lines: [A]], [DeleteDelta, position: 2, lines: [C]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]}",
+								patch.toString());
+				System.out.println(logdata);
+				assertEquals(11, logdata.size());
+		}
+
+		@Test
+		public void testPerformanceProblemsIssue124() {
+				List old = Arrays.asList("abcd");
+				List newl =
+								IntStream.range(0, 90000).boxed().map(i -> i.toString()).collect(toList());
 
-            @Override
-            public void diffEnd() {
-                logdata.add("end");
-            }
-        }));
-        assertNotNull(patch);
-        System.out.println(patch);
-        assertEquals(5, patch.getDeltas().size());
-        assertEquals("Patch{deltas=[[InsertDelta, position: 0, lines: [C]], [DeleteDelta, position: 0, lines: [A]], [DeleteDelta, position: 2, lines: [C]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]}", patch.toString());
-        System.out.println(logdata);
-        assertEquals(11, logdata.size());
-    }
-    
-    
-    @Test
-    public void testPerformanceProblemsIssue124() {
-         List old = Arrays.asList("abcd");
-         List newl = IntStream.range(0, 90000)
-                    .boxed()
-                    .map(i -> i.toString())
-                    .collect(toList());
-         
-        long start = System.currentTimeMillis();
-        Patch diff = DiffUtils.diff(old, newl, new MyersDiffWithLinearSpace());
-        long end = System.currentTimeMillis();
-        System.out.println("Finished in " + (end - start) + "ms and resulted " + diff.getDeltas().size() + " deltas");
-    }
+				long start = System.currentTimeMillis();
+				Patch diff = DiffUtils.diff(old, newl, new MyersDiffWithLinearSpace());
+				long end = System.currentTimeMillis();
+				System.out.println("Finished in " + (end - start) + "ms and resulted "
+								+ diff.getDeltas().size() + " deltas");
+		}
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMyersDiffWithLinearSpacePatchTest.java b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMyersDiffWithLinearSpacePatchTest.java
index 522eff58..92668ce8 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMyersDiffWithLinearSpacePatchTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/WithMyersDiffWithLinearSpacePatchTest.java
@@ -1,10 +1,11 @@
 package com.github.difflib.algorithm.myers;
 
-import com.github.difflib.patch.*;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.fail;
 
+import com.github.difflib.DiffUtils;
+import com.github.difflib.patch.*;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -17,378 +18,378 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.junit.jupiter.api.Test;
 
-import com.github.difflib.DiffUtils;
-
 public class WithMyersDiffWithLinearSpacePatchTest {
 
-    @Test
-    public void testPatch_Insert() {
-        final List insertTest_from = Arrays.asList("hhh");
-        final List insertTest_to = Arrays.asList("hhh", "jjj", "kkk", "lll");
-
-        final Patch patch = DiffUtils.diff(insertTest_from, insertTest_to, new MyersDiffWithLinearSpace());
-        try {
-            assertEquals(insertTest_to, DiffUtils.patch(insertTest_from, patch));
-        } catch (PatchFailedException e) {
-            fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testPatch_Delete() {
-        final List deleteTest_from = Arrays.asList("ddd", "fff", "ggg", "hhh");
-        final List deleteTest_to = Arrays.asList("ggg");
-
-        final Patch patch = DiffUtils.diff(deleteTest_from, deleteTest_to, new MyersDiffWithLinearSpace());
-        try {
-            assertEquals(deleteTest_to, DiffUtils.patch(deleteTest_from, patch));
-        } catch (PatchFailedException e) {
-            fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void testPatch_Change() {
-        final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
-        final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
-
-        final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to, new MyersDiffWithLinearSpace());
-        try {
-            assertEquals(changeTest_to, DiffUtils.patch(changeTest_from, patch));
-        } catch (PatchFailedException e) {
-            fail(e.getMessage());
-        }
-    }
-
-    // region testPatch_fuzzyApply utils
-
-    private List intRange(int count) {
-        return IntStream.range(0, count)
-                .mapToObj(Integer::toString)
-                .collect(Collectors.toList());
-    }
-
-    @SafeVarargs
-    private final List join(List... lists) {
-        return Arrays.stream(lists).flatMap(Collection::stream).collect(Collectors.toList());
-    }
-
-    private static class FuzzyApplyTestPair {
-        public final List from;
-        public final List to;
-        public final int requiredFuzz;
-
-        private FuzzyApplyTestPair(List from, List to, int requiredFuzz) {
-            this.from = from;
-            this.to = to;
-            this.requiredFuzz = requiredFuzz;
-        }
-    }
-
-    // endregion
-
-    @Test
-    public void fuzzyApply() throws PatchFailedException {
-        Patch patch = new Patch<>();
-        List deltaFrom = Arrays.asList("aaa", "bbb", "ccc", "ddd", "eee", "fff");
-        List deltaTo = Arrays.asList("aaa", "bbb", "cxc", "dxd", "eee", "fff");
-        patch.addDelta(new ChangeDelta<>(
-                new Chunk<>(6, deltaFrom),
-                new Chunk<>(6, deltaTo)));
-
-        //noinspection unchecked
-        List[] moves = new List[] {
-                intRange(6), // no patch move
-                intRange(3), // forward patch move
-                intRange(9), // backward patch move
-                intRange(0), // apply to the first
-        };
-
-        for (FuzzyApplyTestPair pair : FUZZY_APPLY_TEST_PAIRS) {
-            for (List move : moves) {
-                List from = join(move, pair.from);
-                List to = join(move, pair.to);
-
-                for (int i = 0; i < pair.requiredFuzz; i++) {
-                    int maxFuzz = i;
-                    assertThrows(PatchFailedException.class, () ->
-                            patch.applyFuzzy(from, maxFuzz),
-                            () -> "fail for " + from + " -> " + to + " for fuzz " + maxFuzz + " required " + pair.requiredFuzz);
-                }
-                for (int i = pair.requiredFuzz; i < 4; i++) {
-                    int maxFuzz = i;
-                    assertEquals(to, patch.applyFuzzy(from, maxFuzz),
-                            () -> "with " + maxFuzz);
-                }
-            }
-        }
-    }
-
-    @Test
-    public void fuzzyApplyTwoSideBySidePatches() throws PatchFailedException {
-        Patch patch = new Patch<>();
-        List deltaFrom = Arrays.asList("aaa", "bbb", "ccc", "ddd", "eee", "fff");
-        List deltaTo = Arrays.asList("aaa", "bbb", "cxc", "dxd", "eee", "fff");
-        patch.addDelta(new ChangeDelta<>(
-                new Chunk<>(0, deltaFrom),
-                new Chunk<>(0, deltaTo)));
-        patch.addDelta(new ChangeDelta<>(
-                new Chunk<>(6, deltaFrom),
-                new Chunk<>(6, deltaTo)));
-
-
-        assertEquals(join(deltaTo, deltaTo), patch.applyFuzzy(join(deltaFrom, deltaFrom), 0));
-    }
-
-    @Test
-    public void fuzzyApplyToNearest() throws PatchFailedException {
-        Patch patch = new Patch<>();
-        List deltaFrom = Arrays.asList("aaa", "bbb", "ccc", "ddd", "eee", "fff");
-        List deltaTo = Arrays.asList("aaa", "bbb", "cxc", "dxd", "eee", "fff");
-        patch.addDelta(new ChangeDelta<>(
-                new Chunk<>(0, deltaFrom),
-                new Chunk<>(0, deltaTo)));
-        patch.addDelta(new ChangeDelta<>(
-                new Chunk<>(10, deltaFrom),
-                new Chunk<>(10, deltaTo)));
-
-        assertEquals(join(deltaTo, deltaFrom, deltaTo),
-                patch.applyFuzzy(join(deltaFrom, deltaFrom, deltaFrom), 0));
-        assertEquals(join(intRange(1), deltaTo, deltaFrom, deltaTo),
-                patch.applyFuzzy(join(intRange(1), deltaFrom, deltaFrom, deltaFrom), 0));
-    }
-
-    @Test
-    public void testPatch_Serializable() throws IOException, ClassNotFoundException {
-        final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
-        final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
-
-        final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to, new MyersDiffWithLinearSpace());
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        ObjectOutputStream out = new ObjectOutputStream(baos);
-        out.writeObject(patch);
-        out.close();
-        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-        ObjectInputStream in = new ObjectInputStream(bais);
-        Patch result = (Patch) in.readObject();
-        in.close();
-
-        try {
-            assertEquals(changeTest_to, DiffUtils.patch(changeTest_from, result));
-        } catch (PatchFailedException e) {
-            fail(e.getMessage());
-        }
-
-    }
-
-    @Test
-    public void testPatch_Change_withExceptionProcessor() {
-        final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
-        final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
-
-        final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to, new MyersDiffWithLinearSpace());
-
-        changeTest_from.set(2, "CDC");
-
-        patch.withConflictOutput(Patch.CONFLICT_PRODUCES_MERGE_CONFLICT);
-
-        try {
-            List data = DiffUtils.patch(changeTest_from, patch);
-            assertEquals(11, data.size());
-            
-            assertEquals(Arrays.asList("aaa", "bxb", "cxc", "<<<<<< HEAD", "bbb", "CDC", "======", "bbb", "ccc", ">>>>>>> PATCH", "ddd"), data);
-            
-        } catch (PatchFailedException e) {
-            fail(e.getMessage());
-        }
-    }
-
-    static class FuzzyApplyTestDataGenerator {
-        private static String createList(List values) {
-            return values.stream()
-                    .map(x -> '"' + x + '"')
-                    .collect(Collectors.joining(", ", "Arrays.asList(", ")"));
-        }
-
-        public static void main(String[] args) {
-            String[] deltaFrom = new String[] { "aaa", "bbb", "ccc", "ddd", "eee", "fff" };
-            String[] deltaTo = new String[] { "aaa", "bbb", "cxc", "dxd", "eee", "fff" };
-
-            List pairs = new ArrayList<>();
-
-            // create test data.
-            // Brute-force search
-            String[] changedValue = new String[]{"axa", "bxb", "czc", "dzd", "exe", "fxf"};
-            for (int i = 0; i < 1 << 6; i++) {
-                if ((i & 0b001100) != 0 && (i & 0b001100) != 0b001100) {
-                    continue;
-                }
-
-                String[] from = deltaFrom.clone();
-                String[] to = deltaTo.clone();
-                for (int j = 0; j < 6; j++) {
-                    if ((i & (1 << j)) != 0) {
-                        from[j] = changedValue[j];
-                        to[j] = changedValue[j];
-                    }
-                }
-
-                int requiredFuzz;
-                if ((i & 0b001100) != 0) {
-                    requiredFuzz = 3;
-                } else if ((i & 0b010010) != 0) {
-                    requiredFuzz = 2;
-                } else if ((i & 0b100001) != 0) {
-                    requiredFuzz = 1;
-                } else {
-                    requiredFuzz = 0;
-                }
-
-                pairs.add(new FuzzyApplyTestPair(Arrays.asList(from), Arrays.asList(to), requiredFuzz));
-            }
-            pairs.sort(Comparator.comparingInt(a -> a.requiredFuzz));
-            System.out.println("FuzzyApplyTestPair[] pairs = new FuzzyApplyTestPair[] {");
-            for (FuzzyApplyTestPair pair : pairs) {
-                System.out.println("        new FuzzyApplyTestPair(");
-                System.out.println("                " + createList(pair.from) + ",");
-                System.out.println("                " + createList(pair.to) + ",");
-                System.out.println("                " + pair.requiredFuzz + "),");
-            }
-            System.out.println("};");
-        }
-    }
-
-    private static final FuzzyApplyTestPair[] FUZZY_APPLY_TEST_PAIRS = new FuzzyApplyTestPair[] {
-            new FuzzyApplyTestPair(
-                    Arrays.asList("aaa", "bbb", "ccc", "ddd", "eee", "fff"),
-                    Arrays.asList("aaa", "bbb", "cxc", "dxd", "eee", "fff"),
-                    0),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("axa", "bbb", "ccc", "ddd", "eee", "fff"),
-                    Arrays.asList("axa", "bbb", "cxc", "dxd", "eee", "fff"),
-                    1),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("aaa", "bbb", "ccc", "ddd", "eee", "fxf"),
-                    Arrays.asList("aaa", "bbb", "cxc", "dxd", "eee", "fxf"),
-                    1),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("axa", "bbb", "ccc", "ddd", "eee", "fxf"),
-                    Arrays.asList("axa", "bbb", "cxc", "dxd", "eee", "fxf"),
-                    1),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("aaa", "bxb", "ccc", "ddd", "eee", "fff"),
-                    Arrays.asList("aaa", "bxb", "cxc", "dxd", "eee", "fff"),
-                    2),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("axa", "bxb", "ccc", "ddd", "eee", "fff"),
-                    Arrays.asList("axa", "bxb", "cxc", "dxd", "eee", "fff"),
-                    2),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("aaa", "bbb", "ccc", "ddd", "exe", "fff"),
-                    Arrays.asList("aaa", "bbb", "cxc", "dxd", "exe", "fff"),
-                    2),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("axa", "bbb", "ccc", "ddd", "exe", "fff"),
-                    Arrays.asList("axa", "bbb", "cxc", "dxd", "exe", "fff"),
-                    2),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("aaa", "bxb", "ccc", "ddd", "exe", "fff"),
-                    Arrays.asList("aaa", "bxb", "cxc", "dxd", "exe", "fff"),
-                    2),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("axa", "bxb", "ccc", "ddd", "exe", "fff"),
-                    Arrays.asList("axa", "bxb", "cxc", "dxd", "exe", "fff"),
-                    2),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("aaa", "bxb", "ccc", "ddd", "eee", "fxf"),
-                    Arrays.asList("aaa", "bxb", "cxc", "dxd", "eee", "fxf"),
-                    2),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("axa", "bxb", "ccc", "ddd", "eee", "fxf"),
-                    Arrays.asList("axa", "bxb", "cxc", "dxd", "eee", "fxf"),
-                    2),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("aaa", "bbb", "ccc", "ddd", "exe", "fxf"),
-                    Arrays.asList("aaa", "bbb", "cxc", "dxd", "exe", "fxf"),
-                    2),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("axa", "bbb", "ccc", "ddd", "exe", "fxf"),
-                    Arrays.asList("axa", "bbb", "cxc", "dxd", "exe", "fxf"),
-                    2),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("aaa", "bxb", "ccc", "ddd", "exe", "fxf"),
-                    Arrays.asList("aaa", "bxb", "cxc", "dxd", "exe", "fxf"),
-                    2),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("axa", "bxb", "ccc", "ddd", "exe", "fxf"),
-                    Arrays.asList("axa", "bxb", "cxc", "dxd", "exe", "fxf"),
-                    2),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("aaa", "bbb", "czc", "dzd", "eee", "fff"),
-                    Arrays.asList("aaa", "bbb", "czc", "dzd", "eee", "fff"),
-                    3),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("axa", "bbb", "czc", "dzd", "eee", "fff"),
-                    Arrays.asList("axa", "bbb", "czc", "dzd", "eee", "fff"),
-                    3),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("aaa", "bxb", "czc", "dzd", "eee", "fff"),
-                    Arrays.asList("aaa", "bxb", "czc", "dzd", "eee", "fff"),
-                    3),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("axa", "bxb", "czc", "dzd", "eee", "fff"),
-                    Arrays.asList("axa", "bxb", "czc", "dzd", "eee", "fff"),
-                    3),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("aaa", "bbb", "czc", "dzd", "exe", "fff"),
-                    Arrays.asList("aaa", "bbb", "czc", "dzd", "exe", "fff"),
-                    3),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("axa", "bbb", "czc", "dzd", "exe", "fff"),
-                    Arrays.asList("axa", "bbb", "czc", "dzd", "exe", "fff"),
-                    3),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("aaa", "bxb", "czc", "dzd", "exe", "fff"),
-                    Arrays.asList("aaa", "bxb", "czc", "dzd", "exe", "fff"),
-                    3),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("axa", "bxb", "czc", "dzd", "exe", "fff"),
-                    Arrays.asList("axa", "bxb", "czc", "dzd", "exe", "fff"),
-                    3),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("aaa", "bbb", "czc", "dzd", "eee", "fxf"),
-                    Arrays.asList("aaa", "bbb", "czc", "dzd", "eee", "fxf"),
-                    3),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("axa", "bbb", "czc", "dzd", "eee", "fxf"),
-                    Arrays.asList("axa", "bbb", "czc", "dzd", "eee", "fxf"),
-                    3),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("aaa", "bxb", "czc", "dzd", "eee", "fxf"),
-                    Arrays.asList("aaa", "bxb", "czc", "dzd", "eee", "fxf"),
-                    3),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("axa", "bxb", "czc", "dzd", "eee", "fxf"),
-                    Arrays.asList("axa", "bxb", "czc", "dzd", "eee", "fxf"),
-                    3),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("aaa", "bbb", "czc", "dzd", "exe", "fxf"),
-                    Arrays.asList("aaa", "bbb", "czc", "dzd", "exe", "fxf"),
-                    3),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("axa", "bbb", "czc", "dzd", "exe", "fxf"),
-                    Arrays.asList("axa", "bbb", "czc", "dzd", "exe", "fxf"),
-                    3),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("aaa", "bxb", "czc", "dzd", "exe", "fxf"),
-                    Arrays.asList("aaa", "bxb", "czc", "dzd", "exe", "fxf"),
-                    3),
-            new FuzzyApplyTestPair(
-                    Arrays.asList("axa", "bxb", "czc", "dzd", "exe", "fxf"),
-                    Arrays.asList("axa", "bxb", "czc", "dzd", "exe", "fxf"),
-                    3),
-    };
+		@Test
+		public void testPatch_Insert() {
+				final List insertTest_from = Arrays.asList("hhh");
+				final List insertTest_to = Arrays.asList("hhh", "jjj", "kkk", "lll");
+
+				final Patch patch =
+								DiffUtils.diff(insertTest_from, insertTest_to, new MyersDiffWithLinearSpace());
+				try {
+						assertEquals(insertTest_to, DiffUtils.patch(insertTest_from, patch));
+				} catch (PatchFailedException e) {
+						fail(e.getMessage());
+				}
+		}
+
+		@Test
+		public void testPatch_Delete() {
+				final List deleteTest_from = Arrays.asList("ddd", "fff", "ggg", "hhh");
+				final List deleteTest_to = Arrays.asList("ggg");
+
+				final Patch patch =
+								DiffUtils.diff(deleteTest_from, deleteTest_to, new MyersDiffWithLinearSpace());
+				try {
+						assertEquals(deleteTest_to, DiffUtils.patch(deleteTest_from, patch));
+				} catch (PatchFailedException e) {
+						fail(e.getMessage());
+				}
+		}
+
+		@Test
+		public void testPatch_Change() {
+				final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
+				final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
+
+				final Patch patch =
+								DiffUtils.diff(changeTest_from, changeTest_to, new MyersDiffWithLinearSpace());
+				try {
+						assertEquals(changeTest_to, DiffUtils.patch(changeTest_from, patch));
+				} catch (PatchFailedException e) {
+						fail(e.getMessage());
+				}
+		}
+
+		// region testPatch_fuzzyApply utils
+
+		private List intRange(int count) {
+				return IntStream.range(0, count).mapToObj(Integer::toString).collect(Collectors.toList());
+		}
+
+		@SafeVarargs
+		private final List join(List... lists) {
+				return Arrays.stream(lists).flatMap(Collection::stream).collect(Collectors.toList());
+		}
+
+		private static class FuzzyApplyTestPair {
+				public final List from;
+				public final List to;
+				public final int requiredFuzz;
+
+				private FuzzyApplyTestPair(List from, List to, int requiredFuzz) {
+						this.from = from;
+						this.to = to;
+						this.requiredFuzz = requiredFuzz;
+				}
+		}
+
+		// endregion
+
+		@Test
+		public void fuzzyApply() throws PatchFailedException {
+				Patch patch = new Patch<>();
+				List deltaFrom = Arrays.asList("aaa", "bbb", "ccc", "ddd", "eee", "fff");
+				List deltaTo = Arrays.asList("aaa", "bbb", "cxc", "dxd", "eee", "fff");
+				patch.addDelta(new ChangeDelta<>(new Chunk<>(6, deltaFrom), new Chunk<>(6, deltaTo)));
+
+				//noinspection unchecked
+				List[] moves = new List[] {
+						intRange(6), // no patch move
+						intRange(3), // forward patch move
+						intRange(9), // backward patch move
+						intRange(0), // apply to the first
+				};
+
+				for (FuzzyApplyTestPair pair : FUZZY_APPLY_TEST_PAIRS) {
+						for (List move : moves) {
+								List from = join(move, pair.from);
+								List to = join(move, pair.to);
+
+								for (int i = 0; i < pair.requiredFuzz; i++) {
+										int maxFuzz = i;
+										assertThrows(
+														PatchFailedException.class,
+														() -> patch.applyFuzzy(from, maxFuzz),
+														() -> "fail for " + from + " -> " + to + " for fuzz " + maxFuzz + " required "
+																		+ pair.requiredFuzz);
+								}
+								for (int i = pair.requiredFuzz; i < 4; i++) {
+										int maxFuzz = i;
+										assertEquals(to, patch.applyFuzzy(from, maxFuzz), () -> "with " + maxFuzz);
+								}
+						}
+				}
+		}
+
+		@Test
+		public void fuzzyApplyTwoSideBySidePatches() throws PatchFailedException {
+				Patch patch = new Patch<>();
+				List deltaFrom = Arrays.asList("aaa", "bbb", "ccc", "ddd", "eee", "fff");
+				List deltaTo = Arrays.asList("aaa", "bbb", "cxc", "dxd", "eee", "fff");
+				patch.addDelta(new ChangeDelta<>(new Chunk<>(0, deltaFrom), new Chunk<>(0, deltaTo)));
+				patch.addDelta(new ChangeDelta<>(new Chunk<>(6, deltaFrom), new Chunk<>(6, deltaTo)));
+
+				assertEquals(join(deltaTo, deltaTo), patch.applyFuzzy(join(deltaFrom, deltaFrom), 0));
+		}
+
+		@Test
+		public void fuzzyApplyToNearest() throws PatchFailedException {
+				Patch patch = new Patch<>();
+				List deltaFrom = Arrays.asList("aaa", "bbb", "ccc", "ddd", "eee", "fff");
+				List deltaTo = Arrays.asList("aaa", "bbb", "cxc", "dxd", "eee", "fff");
+				patch.addDelta(new ChangeDelta<>(new Chunk<>(0, deltaFrom), new Chunk<>(0, deltaTo)));
+				patch.addDelta(new ChangeDelta<>(new Chunk<>(10, deltaFrom), new Chunk<>(10, deltaTo)));
+
+				assertEquals(join(deltaTo, deltaFrom, deltaTo), patch.applyFuzzy(join(deltaFrom, deltaFrom, deltaFrom), 0));
+				assertEquals(
+								join(intRange(1), deltaTo, deltaFrom, deltaTo),
+								patch.applyFuzzy(join(intRange(1), deltaFrom, deltaFrom, deltaFrom), 0));
+		}
+
+		@Test
+		public void testPatch_Serializable() throws IOException, ClassNotFoundException {
+				final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
+				final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
+
+				final Patch patch =
+								DiffUtils.diff(changeTest_from, changeTest_to, new MyersDiffWithLinearSpace());
+				ByteArrayOutputStream baos = new ByteArrayOutputStream();
+				ObjectOutputStream out = new ObjectOutputStream(baos);
+				out.writeObject(patch);
+				out.close();
+				ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+				ObjectInputStream in = new ObjectInputStream(bais);
+				Patch result = (Patch) in.readObject();
+				in.close();
+
+				try {
+						assertEquals(changeTest_to, DiffUtils.patch(changeTest_from, result));
+				} catch (PatchFailedException e) {
+						fail(e.getMessage());
+				}
+		}
+
+		@Test
+		public void testPatch_Change_withExceptionProcessor() {
+				final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
+				final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
+
+				final Patch patch =
+								DiffUtils.diff(changeTest_from, changeTest_to, new MyersDiffWithLinearSpace());
+
+				changeTest_from.set(2, "CDC");
+
+				patch.withConflictOutput(Patch.CONFLICT_PRODUCES_MERGE_CONFLICT);
+
+				try {
+						List data = DiffUtils.patch(changeTest_from, patch);
+						assertEquals(11, data.size());
+
+						assertEquals(
+										Arrays.asList(
+														"aaa",
+														"bxb",
+														"cxc",
+														"<<<<<< HEAD",
+														"bbb",
+														"CDC",
+														"======",
+														"bbb",
+														"ccc",
+														">>>>>>> PATCH",
+														"ddd"),
+										data);
+
+				} catch (PatchFailedException e) {
+						fail(e.getMessage());
+				}
+		}
+
+		static class FuzzyApplyTestDataGenerator {
+				private static String createList(List values) {
+						return values.stream().map(x -> '"' + x + '"').collect(Collectors.joining(", ", "Arrays.asList(", ")"));
+				}
+
+				public static void main(String[] args) {
+						String[] deltaFrom = new String[] {"aaa", "bbb", "ccc", "ddd", "eee", "fff"};
+						String[] deltaTo = new String[] {"aaa", "bbb", "cxc", "dxd", "eee", "fff"};
+
+						List pairs = new ArrayList<>();
+
+						// create test data.
+						// Brute-force search
+						String[] changedValue = new String[] {"axa", "bxb", "czc", "dzd", "exe", "fxf"};
+						for (int i = 0; i < 1 << 6; i++) {
+								if ((i & 0b001100) != 0 && (i & 0b001100) != 0b001100) {
+										continue;
+								}
+
+								String[] from = deltaFrom.clone();
+								String[] to = deltaTo.clone();
+								for (int j = 0; j < 6; j++) {
+										if ((i & (1 << j)) != 0) {
+												from[j] = changedValue[j];
+												to[j] = changedValue[j];
+										}
+								}
+
+								int requiredFuzz;
+								if ((i & 0b001100) != 0) {
+										requiredFuzz = 3;
+								} else if ((i & 0b010010) != 0) {
+										requiredFuzz = 2;
+								} else if ((i & 0b100001) != 0) {
+										requiredFuzz = 1;
+								} else {
+										requiredFuzz = 0;
+								}
+
+								pairs.add(new FuzzyApplyTestPair(Arrays.asList(from), Arrays.asList(to), requiredFuzz));
+						}
+						pairs.sort(Comparator.comparingInt(a -> a.requiredFuzz));
+						System.out.println("FuzzyApplyTestPair[] pairs = new FuzzyApplyTestPair[] {");
+						for (FuzzyApplyTestPair pair : pairs) {
+								System.out.println("        new FuzzyApplyTestPair(");
+								System.out.println("                " + createList(pair.from) + ",");
+								System.out.println("                " + createList(pair.to) + ",");
+								System.out.println("                " + pair.requiredFuzz + "),");
+						}
+						System.out.println("};");
+				}
+		}
+
+		private static final FuzzyApplyTestPair[] FUZZY_APPLY_TEST_PAIRS = new FuzzyApplyTestPair[] {
+				new FuzzyApplyTestPair(
+								Arrays.asList("aaa", "bbb", "ccc", "ddd", "eee", "fff"),
+								Arrays.asList("aaa", "bbb", "cxc", "dxd", "eee", "fff"),
+								0),
+				new FuzzyApplyTestPair(
+								Arrays.asList("axa", "bbb", "ccc", "ddd", "eee", "fff"),
+								Arrays.asList("axa", "bbb", "cxc", "dxd", "eee", "fff"),
+								1),
+				new FuzzyApplyTestPair(
+								Arrays.asList("aaa", "bbb", "ccc", "ddd", "eee", "fxf"),
+								Arrays.asList("aaa", "bbb", "cxc", "dxd", "eee", "fxf"),
+								1),
+				new FuzzyApplyTestPair(
+								Arrays.asList("axa", "bbb", "ccc", "ddd", "eee", "fxf"),
+								Arrays.asList("axa", "bbb", "cxc", "dxd", "eee", "fxf"),
+								1),
+				new FuzzyApplyTestPair(
+								Arrays.asList("aaa", "bxb", "ccc", "ddd", "eee", "fff"),
+								Arrays.asList("aaa", "bxb", "cxc", "dxd", "eee", "fff"),
+								2),
+				new FuzzyApplyTestPair(
+								Arrays.asList("axa", "bxb", "ccc", "ddd", "eee", "fff"),
+								Arrays.asList("axa", "bxb", "cxc", "dxd", "eee", "fff"),
+								2),
+				new FuzzyApplyTestPair(
+								Arrays.asList("aaa", "bbb", "ccc", "ddd", "exe", "fff"),
+								Arrays.asList("aaa", "bbb", "cxc", "dxd", "exe", "fff"),
+								2),
+				new FuzzyApplyTestPair(
+								Arrays.asList("axa", "bbb", "ccc", "ddd", "exe", "fff"),
+								Arrays.asList("axa", "bbb", "cxc", "dxd", "exe", "fff"),
+								2),
+				new FuzzyApplyTestPair(
+								Arrays.asList("aaa", "bxb", "ccc", "ddd", "exe", "fff"),
+								Arrays.asList("aaa", "bxb", "cxc", "dxd", "exe", "fff"),
+								2),
+				new FuzzyApplyTestPair(
+								Arrays.asList("axa", "bxb", "ccc", "ddd", "exe", "fff"),
+								Arrays.asList("axa", "bxb", "cxc", "dxd", "exe", "fff"),
+								2),
+				new FuzzyApplyTestPair(
+								Arrays.asList("aaa", "bxb", "ccc", "ddd", "eee", "fxf"),
+								Arrays.asList("aaa", "bxb", "cxc", "dxd", "eee", "fxf"),
+								2),
+				new FuzzyApplyTestPair(
+								Arrays.asList("axa", "bxb", "ccc", "ddd", "eee", "fxf"),
+								Arrays.asList("axa", "bxb", "cxc", "dxd", "eee", "fxf"),
+								2),
+				new FuzzyApplyTestPair(
+								Arrays.asList("aaa", "bbb", "ccc", "ddd", "exe", "fxf"),
+								Arrays.asList("aaa", "bbb", "cxc", "dxd", "exe", "fxf"),
+								2),
+				new FuzzyApplyTestPair(
+								Arrays.asList("axa", "bbb", "ccc", "ddd", "exe", "fxf"),
+								Arrays.asList("axa", "bbb", "cxc", "dxd", "exe", "fxf"),
+								2),
+				new FuzzyApplyTestPair(
+								Arrays.asList("aaa", "bxb", "ccc", "ddd", "exe", "fxf"),
+								Arrays.asList("aaa", "bxb", "cxc", "dxd", "exe", "fxf"),
+								2),
+				new FuzzyApplyTestPair(
+								Arrays.asList("axa", "bxb", "ccc", "ddd", "exe", "fxf"),
+								Arrays.asList("axa", "bxb", "cxc", "dxd", "exe", "fxf"),
+								2),
+				new FuzzyApplyTestPair(
+								Arrays.asList("aaa", "bbb", "czc", "dzd", "eee", "fff"),
+								Arrays.asList("aaa", "bbb", "czc", "dzd", "eee", "fff"),
+								3),
+				new FuzzyApplyTestPair(
+								Arrays.asList("axa", "bbb", "czc", "dzd", "eee", "fff"),
+								Arrays.asList("axa", "bbb", "czc", "dzd", "eee", "fff"),
+								3),
+				new FuzzyApplyTestPair(
+								Arrays.asList("aaa", "bxb", "czc", "dzd", "eee", "fff"),
+								Arrays.asList("aaa", "bxb", "czc", "dzd", "eee", "fff"),
+								3),
+				new FuzzyApplyTestPair(
+								Arrays.asList("axa", "bxb", "czc", "dzd", "eee", "fff"),
+								Arrays.asList("axa", "bxb", "czc", "dzd", "eee", "fff"),
+								3),
+				new FuzzyApplyTestPair(
+								Arrays.asList("aaa", "bbb", "czc", "dzd", "exe", "fff"),
+								Arrays.asList("aaa", "bbb", "czc", "dzd", "exe", "fff"),
+								3),
+				new FuzzyApplyTestPair(
+								Arrays.asList("axa", "bbb", "czc", "dzd", "exe", "fff"),
+								Arrays.asList("axa", "bbb", "czc", "dzd", "exe", "fff"),
+								3),
+				new FuzzyApplyTestPair(
+								Arrays.asList("aaa", "bxb", "czc", "dzd", "exe", "fff"),
+								Arrays.asList("aaa", "bxb", "czc", "dzd", "exe", "fff"),
+								3),
+				new FuzzyApplyTestPair(
+								Arrays.asList("axa", "bxb", "czc", "dzd", "exe", "fff"),
+								Arrays.asList("axa", "bxb", "czc", "dzd", "exe", "fff"),
+								3),
+				new FuzzyApplyTestPair(
+								Arrays.asList("aaa", "bbb", "czc", "dzd", "eee", "fxf"),
+								Arrays.asList("aaa", "bbb", "czc", "dzd", "eee", "fxf"),
+								3),
+				new FuzzyApplyTestPair(
+								Arrays.asList("axa", "bbb", "czc", "dzd", "eee", "fxf"),
+								Arrays.asList("axa", "bbb", "czc", "dzd", "eee", "fxf"),
+								3),
+				new FuzzyApplyTestPair(
+								Arrays.asList("aaa", "bxb", "czc", "dzd", "eee", "fxf"),
+								Arrays.asList("aaa", "bxb", "czc", "dzd", "eee", "fxf"),
+								3),
+				new FuzzyApplyTestPair(
+								Arrays.asList("axa", "bxb", "czc", "dzd", "eee", "fxf"),
+								Arrays.asList("axa", "bxb", "czc", "dzd", "eee", "fxf"),
+								3),
+				new FuzzyApplyTestPair(
+								Arrays.asList("aaa", "bbb", "czc", "dzd", "exe", "fxf"),
+								Arrays.asList("aaa", "bbb", "czc", "dzd", "exe", "fxf"),
+								3),
+				new FuzzyApplyTestPair(
+								Arrays.asList("axa", "bbb", "czc", "dzd", "exe", "fxf"),
+								Arrays.asList("axa", "bbb", "czc", "dzd", "exe", "fxf"),
+								3),
+				new FuzzyApplyTestPair(
+								Arrays.asList("aaa", "bxb", "czc", "dzd", "exe", "fxf"),
+								Arrays.asList("aaa", "bxb", "czc", "dzd", "exe", "fxf"),
+								3),
+				new FuzzyApplyTestPair(
+								Arrays.asList("axa", "bxb", "czc", "dzd", "exe", "fxf"),
+								Arrays.asList("axa", "bxb", "czc", "dzd", "exe", "fxf"),
+								3),
+		};
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/examples/ApplyPatch.java b/java-diff-utils/src/test/java/com/github/difflib/examples/ApplyPatch.java
index 4eca7d36..48259260 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/examples/ApplyPatch.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/examples/ApplyPatch.java
@@ -12,19 +12,19 @@
 
 public class ApplyPatch {
 
-    private static final String ORIGINAL = TestConstants.MOCK_FOLDER + "issue10_base.txt";
-    private static final String PATCH = TestConstants.MOCK_FOLDER + "issue10_patch.txt";
+		private static final String ORIGINAL = TestConstants.MOCK_FOLDER + "issue10_base.txt";
+		private static final String PATCH = TestConstants.MOCK_FOLDER + "issue10_patch.txt";
 
-    public static void main(String[] args) throws PatchFailedException, IOException {
-        List original = Files.readAllLines(new File(ORIGINAL).toPath());
-        List patched = Files.readAllLines(new File(PATCH).toPath());
+		public static void main(String[] args) throws PatchFailedException, IOException {
+				List original = Files.readAllLines(new File(ORIGINAL).toPath());
+				List patched = Files.readAllLines(new File(PATCH).toPath());
 
-        // At first, parse the unified diff file and get the patch
-        Patch patch = UnifiedDiffUtils.parseUnifiedDiff(patched);
+				// At first, parse the unified diff file and get the patch
+				Patch patch = UnifiedDiffUtils.parseUnifiedDiff(patched);
 
-        // Then apply the computed patch to the given text
-        List result = DiffUtils.patch(original, patch);
-        System.out.println(result);
-        // / Or we can call patch.applyTo(original). There is no difference.
-    }
+				// Then apply the computed patch to the given text
+				List result = DiffUtils.patch(original, patch);
+				System.out.println(result);
+				// / Or we can call patch.applyTo(original). There is no difference.
+		}
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/examples/ComputeDifference.java b/java-diff-utils/src/test/java/com/github/difflib/examples/ComputeDifference.java
index e8b25437..ffae731b 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/examples/ComputeDifference.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/examples/ComputeDifference.java
@@ -11,18 +11,18 @@
 
 public class ComputeDifference {
 
-    private static final String ORIGINAL = TestConstants.MOCK_FOLDER + "original.txt";
-    private static final String REVISED = TestConstants.MOCK_FOLDER + "revised.txt";
+		private static final String ORIGINAL = TestConstants.MOCK_FOLDER + "original.txt";
+		private static final String REVISED = TestConstants.MOCK_FOLDER + "revised.txt";
 
-    public static void main(String[] args) throws IOException {
-        List original = Files.readAllLines(new File(ORIGINAL).toPath());
-        List revised = Files.readAllLines(new File(REVISED).toPath());
+		public static void main(String[] args) throws IOException {
+				List original = Files.readAllLines(new File(ORIGINAL).toPath());
+				List revised = Files.readAllLines(new File(REVISED).toPath());
 
-        // Compute diff. Get the Patch object. Patch is the container for computed deltas.
-        Patch patch = DiffUtils.diff(original, revised);
+				// Compute diff. Get the Patch object. Patch is the container for computed deltas.
+				Patch patch = DiffUtils.diff(original, revised);
 
-        for (AbstractDelta delta : patch.getDeltas()) {
-            System.out.println(delta);
-        }
-    }
+				for (AbstractDelta delta : patch.getDeltas()) {
+						System.out.println(delta);
+				}
+		}
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/examples/OriginalAndDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/examples/OriginalAndDiffTest.java
index 17283b4d..a3f0b7b9 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/examples/OriginalAndDiffTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/examples/OriginalAndDiffTest.java
@@ -1,59 +1,58 @@
 package com.github.difflib.examples;
 
+import static java.util.stream.Collectors.joining;
+import static org.junit.jupiter.api.Assertions.fail;
+
 import com.github.difflib.TestConstants;
 import com.github.difflib.UnifiedDiffUtils;
-import org.junit.jupiter.api.Test;
-
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-
-import static java.util.stream.Collectors.joining;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
 
 public class OriginalAndDiffTest {
 
-    @Test
-    public void testGenerateOriginalAndDiff()  {
-        List origLines = null;
-        List revLines = null;
-        try {
-            origLines = fileToLines(TestConstants.MOCK_FOLDER + "original.txt");
-            revLines = fileToLines(TestConstants.MOCK_FOLDER + "revised.txt");
-        } catch (IOException e) {
-            fail(e.getMessage());
-        }
-
-        List originalAndDiff = UnifiedDiffUtils.generateOriginalAndDiff(origLines, revLines);
-        System.out.println(originalAndDiff.stream().collect(joining("\n")));
-    }
-
-    @Test
-    public void testGenerateOriginalAndDiffFirstLineChange()  {
-        List origLines = null;
-        List revLines = null;
-        try {
-            origLines = fileToLines(TestConstants.MOCK_FOLDER + "issue_170_original.txt");
-            revLines = fileToLines(TestConstants.MOCK_FOLDER + "issue_170_revised.txt");
-        } catch (IOException e) {
-            fail(e.getMessage());
-        }
-
-        List originalAndDiff = UnifiedDiffUtils.generateOriginalAndDiff(origLines, revLines);
-        System.out.println(originalAndDiff.stream().collect(joining("\n")));
-    }
-
-    public static List fileToLines(String filename) throws FileNotFoundException, IOException {
-        List lines = new ArrayList<>();
-        String line = "";
-        try (BufferedReader in = new BufferedReader(new FileReader(filename))) {
-            while ((line = in.readLine()) != null) {
-                lines.add(line);
-            }
-        }
-        return lines;
-    }
+		@Test
+		public void testGenerateOriginalAndDiff() {
+				List origLines = null;
+				List revLines = null;
+				try {
+						origLines = fileToLines(TestConstants.MOCK_FOLDER + "original.txt");
+						revLines = fileToLines(TestConstants.MOCK_FOLDER + "revised.txt");
+				} catch (IOException e) {
+						fail(e.getMessage());
+				}
+
+				List originalAndDiff = UnifiedDiffUtils.generateOriginalAndDiff(origLines, revLines);
+				System.out.println(originalAndDiff.stream().collect(joining("\n")));
+		}
+
+		@Test
+		public void testGenerateOriginalAndDiffFirstLineChange() {
+				List origLines = null;
+				List revLines = null;
+				try {
+						origLines = fileToLines(TestConstants.MOCK_FOLDER + "issue_170_original.txt");
+						revLines = fileToLines(TestConstants.MOCK_FOLDER + "issue_170_revised.txt");
+				} catch (IOException e) {
+						fail(e.getMessage());
+				}
+
+				List originalAndDiff = UnifiedDiffUtils.generateOriginalAndDiff(origLines, revLines);
+				System.out.println(originalAndDiff.stream().collect(joining("\n")));
+		}
+
+		public static List fileToLines(String filename) throws FileNotFoundException, IOException {
+				List lines = new ArrayList<>();
+				String line = "";
+				try (BufferedReader in = new BufferedReader(new FileReader(filename))) {
+						while ((line = in.readLine()) != null) {
+								lines.add(line);
+						}
+				}
+				return lines;
+		}
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/patch/ChunkTest.java b/java-diff-utils/src/test/java/com/github/difflib/patch/ChunkTest.java
index 4816f221..46eb727b 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/patch/ChunkTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/patch/ChunkTest.java
@@ -1,43 +1,37 @@
 package com.github.difflib.patch;
 
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.List;
 import java.util.stream.Collectors;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
 class ChunkTest {
-    @Test
-    void verifyChunk() throws PatchFailedException {
-        Chunk chunk = new Chunk<>(7, toCharList("test"));
-
-        // normal check
-        assertEquals(VerifyChunk.OK,
-                chunk.verifyChunk(toCharList("prefix test suffix")));
-        assertEquals(VerifyChunk.CONTENT_DOES_NOT_MATCH_TARGET,
-                chunk.verifyChunk(toCharList("prefix  es  suffix"), 0, 7));
-
-        // position
-        assertEquals(VerifyChunk.OK,
-                chunk.verifyChunk(toCharList("short test suffix"), 0, 6));
-        assertEquals(VerifyChunk.OK,
-                chunk.verifyChunk(toCharList("loonger test suffix"), 0, 8));
-        assertEquals(VerifyChunk.CONTENT_DOES_NOT_MATCH_TARGET,
-                chunk.verifyChunk(toCharList("prefix test suffix"), 0, 6));
-        assertEquals(VerifyChunk.CONTENT_DOES_NOT_MATCH_TARGET,
-                chunk.verifyChunk(toCharList("prefix test suffix"), 0, 8));
-
-        // fuzz
-        assertEquals(VerifyChunk.OK,
-                chunk.verifyChunk(toCharList("prefix test suffix"), 1, 7));
-        assertEquals(VerifyChunk.OK,
-                chunk.verifyChunk(toCharList("prefix  es  suffix"), 1, 7));
-        assertEquals(VerifyChunk.CONTENT_DOES_NOT_MATCH_TARGET,
-                chunk.verifyChunk(toCharList("prefix      suffix"), 1, 7));
-    }
-
-    private List toCharList(String str) {
-        return str.chars().mapToObj(x -> (char) x).collect(Collectors.toList());
-    }
+		@Test
+		void verifyChunk() throws PatchFailedException {
+				Chunk chunk = new Chunk<>(7, toCharList("test"));
+
+				// normal check
+				assertEquals(VerifyChunk.OK, chunk.verifyChunk(toCharList("prefix test suffix")));
+				assertEquals(
+								VerifyChunk.CONTENT_DOES_NOT_MATCH_TARGET, chunk.verifyChunk(toCharList("prefix  es  suffix"), 0, 7));
+
+				// position
+				assertEquals(VerifyChunk.OK, chunk.verifyChunk(toCharList("short test suffix"), 0, 6));
+				assertEquals(VerifyChunk.OK, chunk.verifyChunk(toCharList("loonger test suffix"), 0, 8));
+				assertEquals(
+								VerifyChunk.CONTENT_DOES_NOT_MATCH_TARGET, chunk.verifyChunk(toCharList("prefix test suffix"), 0, 6));
+				assertEquals(
+								VerifyChunk.CONTENT_DOES_NOT_MATCH_TARGET, chunk.verifyChunk(toCharList("prefix test suffix"), 0, 8));
+
+				// fuzz
+				assertEquals(VerifyChunk.OK, chunk.verifyChunk(toCharList("prefix test suffix"), 1, 7));
+				assertEquals(VerifyChunk.OK, chunk.verifyChunk(toCharList("prefix  es  suffix"), 1, 7));
+				assertEquals(
+								VerifyChunk.CONTENT_DOES_NOT_MATCH_TARGET, chunk.verifyChunk(toCharList("prefix      suffix"), 1, 7));
+		}
+
+		private List toCharList(String str) {
+				return str.chars().mapToObj(x -> (char) x).collect(Collectors.toList());
+		}
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithAllDiffAlgorithmsTest.java b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithAllDiffAlgorithmsTest.java
index a9731514..a14ba520 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithAllDiffAlgorithmsTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithAllDiffAlgorithmsTest.java
@@ -3,6 +3,10 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
+import com.github.difflib.DiffUtils;
+import com.github.difflib.algorithm.DiffAlgorithmFactory;
+import com.github.difflib.algorithm.myers.MyersDiff;
+import com.github.difflib.algorithm.myers.MyersDiffWithLinearSpace;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -10,12 +14,6 @@
 import java.io.ObjectOutputStream;
 import java.util.Arrays;
 import java.util.List;
-
-
-import com.github.difflib.DiffUtils;
-import com.github.difflib.algorithm.DiffAlgorithmFactory;
-import com.github.difflib.algorithm.myers.MyersDiff;
-import com.github.difflib.algorithm.myers.MyersDiffWithLinearSpace;
 import java.util.stream.Stream;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -24,87 +22,85 @@
 
 public class PatchWithAllDiffAlgorithmsTest {
 
-    private static Stream provideAlgorithms() {
-        return Stream.of(Arguments.of(MyersDiff.factory()), 
-                Arguments.of(MyersDiffWithLinearSpace.factory()));
-    }
-    
-    @AfterAll
-    public static void afterAll() {
-        DiffUtils.withDefaultDiffAlgorithmFactory(MyersDiff.factory());
-    }
-
-    @ParameterizedTest
-    @MethodSource("provideAlgorithms")
-    public void testPatch_Insert(DiffAlgorithmFactory factory) {
-        DiffUtils.withDefaultDiffAlgorithmFactory(factory);
-        
-        final List insertTest_from = Arrays.asList("hhh");
-        final List insertTest_to = Arrays.asList("hhh", "jjj", "kkk", "lll");
-
-        final Patch patch = DiffUtils.diff(insertTest_from, insertTest_to);
-        try {
-            assertEquals(insertTest_to, DiffUtils.patch(insertTest_from, patch));
-        } catch (PatchFailedException e) {
-            fail(e.getMessage());
-        }
-    }
-
-    @ParameterizedTest
-    @MethodSource("provideAlgorithms")
-    public void testPatch_Delete(DiffAlgorithmFactory factory) {
-        DiffUtils.withDefaultDiffAlgorithmFactory(factory);
-        
-        final List deleteTest_from = Arrays.asList("ddd", "fff", "ggg", "hhh");
-        final List deleteTest_to = Arrays.asList("ggg");
-
-        final Patch patch = DiffUtils.diff(deleteTest_from, deleteTest_to);
-        try {
-            assertEquals(deleteTest_to, DiffUtils.patch(deleteTest_from, patch));
-        } catch (PatchFailedException e) {
-            fail(e.getMessage());
-        }
-    }
-
-    @ParameterizedTest
-    @MethodSource("provideAlgorithms")
-    public void testPatch_Change(DiffAlgorithmFactory factory) {
-        DiffUtils.withDefaultDiffAlgorithmFactory(factory);
-        
-        final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
-        final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
-
-        final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to);
-        try {
-            assertEquals(changeTest_to, DiffUtils.patch(changeTest_from, patch));
-        } catch (PatchFailedException e) {
-            fail(e.getMessage());
-        }
-    }
-
-    @ParameterizedTest
-    @MethodSource("provideAlgorithms")
-    public void testPatch_Serializable(DiffAlgorithmFactory factory) throws IOException, ClassNotFoundException {
-        DiffUtils.withDefaultDiffAlgorithmFactory(factory);
-        
-        final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
-        final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
-
-        final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to);
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        ObjectOutputStream out = new ObjectOutputStream(baos);
-        out.writeObject(patch);
-        out.close();
-        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-        ObjectInputStream in = new ObjectInputStream(bais);
-        Patch result = (Patch) in.readObject();
-        in.close();
-
-        try {
-            assertEquals(changeTest_to, DiffUtils.patch(changeTest_from, result));
-        } catch (PatchFailedException e) {
-            fail(e.getMessage());
-        }
-
-    }    
+		private static Stream provideAlgorithms() {
+				return Stream.of(Arguments.of(MyersDiff.factory()), Arguments.of(MyersDiffWithLinearSpace.factory()));
+		}
+
+		@AfterAll
+		public static void afterAll() {
+				DiffUtils.withDefaultDiffAlgorithmFactory(MyersDiff.factory());
+		}
+
+		@ParameterizedTest
+		@MethodSource("provideAlgorithms")
+		public void testPatch_Insert(DiffAlgorithmFactory factory) {
+				DiffUtils.withDefaultDiffAlgorithmFactory(factory);
+
+				final List insertTest_from = Arrays.asList("hhh");
+				final List insertTest_to = Arrays.asList("hhh", "jjj", "kkk", "lll");
+
+				final Patch patch = DiffUtils.diff(insertTest_from, insertTest_to);
+				try {
+						assertEquals(insertTest_to, DiffUtils.patch(insertTest_from, patch));
+				} catch (PatchFailedException e) {
+						fail(e.getMessage());
+				}
+		}
+
+		@ParameterizedTest
+		@MethodSource("provideAlgorithms")
+		public void testPatch_Delete(DiffAlgorithmFactory factory) {
+				DiffUtils.withDefaultDiffAlgorithmFactory(factory);
+
+				final List deleteTest_from = Arrays.asList("ddd", "fff", "ggg", "hhh");
+				final List deleteTest_to = Arrays.asList("ggg");
+
+				final Patch patch = DiffUtils.diff(deleteTest_from, deleteTest_to);
+				try {
+						assertEquals(deleteTest_to, DiffUtils.patch(deleteTest_from, patch));
+				} catch (PatchFailedException e) {
+						fail(e.getMessage());
+				}
+		}
+
+		@ParameterizedTest
+		@MethodSource("provideAlgorithms")
+		public void testPatch_Change(DiffAlgorithmFactory factory) {
+				DiffUtils.withDefaultDiffAlgorithmFactory(factory);
+
+				final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
+				final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
+
+				final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to);
+				try {
+						assertEquals(changeTest_to, DiffUtils.patch(changeTest_from, patch));
+				} catch (PatchFailedException e) {
+						fail(e.getMessage());
+				}
+		}
+
+		@ParameterizedTest
+		@MethodSource("provideAlgorithms")
+		public void testPatch_Serializable(DiffAlgorithmFactory factory) throws IOException, ClassNotFoundException {
+				DiffUtils.withDefaultDiffAlgorithmFactory(factory);
+
+				final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
+				final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
+
+				final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to);
+				ByteArrayOutputStream baos = new ByteArrayOutputStream();
+				ObjectOutputStream out = new ObjectOutputStream(baos);
+				out.writeObject(patch);
+				out.close();
+				ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+				ObjectInputStream in = new ObjectInputStream(bais);
+				Patch result = (Patch) in.readObject();
+				in.close();
+
+				try {
+						assertEquals(changeTest_to, DiffUtils.patch(changeTest_from, result));
+				} catch (PatchFailedException e) {
+						fail(e.getMessage());
+				}
+		}
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMyerDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMyerDiffTest.java
index 97dc20fb..0dab69f3 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMyerDiffTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMyerDiffTest.java
@@ -15,13 +15,14 @@
  */
 package com.github.difflib.patch;
 
-import com.github.difflib.DiffUtils;
 import static com.github.difflib.patch.Patch.CONFLICT_PRODUCES_MERGE_CONFLICT;
-import java.util.Arrays;
-import java.util.List;
 import static java.util.stream.Collectors.joining;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
+
+import com.github.difflib.DiffUtils;
+import java.util.Arrays;
+import java.util.List;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -30,39 +31,40 @@
  */
 public class PatchWithMyerDiffTest {
 
-    @Test
-    public void testPatch_Change_withExceptionProcessor() {
-        final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
-        final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
+		@Test
+		public void testPatch_Change_withExceptionProcessor() {
+				final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
+				final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
 
-        final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to);
+				final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to);
 
-        changeTest_from.set(2, "CDC");
+				changeTest_from.set(2, "CDC");
 
-        patch.withConflictOutput(Patch.CONFLICT_PRODUCES_MERGE_CONFLICT);
+				patch.withConflictOutput(Patch.CONFLICT_PRODUCES_MERGE_CONFLICT);
 
-        try {
-            List data = DiffUtils.patch(changeTest_from, patch);
-            assertEquals(9, data.size());
+				try {
+						List data = DiffUtils.patch(changeTest_from, patch);
+						assertEquals(9, data.size());
 
-            assertEquals(Arrays.asList("aaa", "<<<<<< HEAD", "bbb", "CDC", "======", "bbb", "ccc", ">>>>>>> PATCH", "ddd"), data);
+						assertEquals(
+										Arrays.asList("aaa", "<<<<<< HEAD", "bbb", "CDC", "======", "bbb", "ccc", ">>>>>>> PATCH", "ddd"),
+										data);
 
-        } catch (PatchFailedException e) {
-            fail(e.getMessage());
-        }
-    }
+				} catch (PatchFailedException e) {
+						fail(e.getMessage());
+				}
+		}
 
-    @Test
-    public void testPatchThreeWayIssue138() throws PatchFailedException {
-        List base = Arrays.asList("Imagine there's no heaven".split("\\s+"));
-        List left = Arrays.asList("Imagine there's no HEAVEN".split("\\s+"));
-        List right = Arrays.asList("IMAGINE there's no heaven".split("\\s+"));
+		@Test
+		public void testPatchThreeWayIssue138() throws PatchFailedException {
+				List base = Arrays.asList("Imagine there's no heaven".split("\\s+"));
+				List left = Arrays.asList("Imagine there's no HEAVEN".split("\\s+"));
+				List right = Arrays.asList("IMAGINE there's no heaven".split("\\s+"));
 
-        Patch rightPatch = DiffUtils.diff(base, right)
-                .withConflictOutput(CONFLICT_PRODUCES_MERGE_CONFLICT);
+				Patch rightPatch = DiffUtils.diff(base, right).withConflictOutput(CONFLICT_PRODUCES_MERGE_CONFLICT);
 
-        List applied = rightPatch.applyTo(left);
+				List applied = rightPatch.applyTo(left);
 
-        assertEquals("IMAGINE there's no HEAVEN", applied.stream().collect(joining(" ")));
-    }
+				assertEquals("IMAGINE there's no HEAVEN", applied.stream().collect(joining(" ")));
+		}
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMyerDiffWithLinearSpaceTest.java b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMyerDiffWithLinearSpaceTest.java
index 2cc334ad..f04a1c93 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMyerDiffWithLinearSpaceTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMyerDiffWithLinearSpaceTest.java
@@ -15,14 +15,15 @@
  */
 package com.github.difflib.patch;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
 import com.github.difflib.DiffUtils;
 import com.github.difflib.algorithm.myers.MyersDiff;
 import com.github.difflib.algorithm.myers.MyersDiffWithLinearSpace;
 import java.util.Arrays;
 import java.util.List;
 import org.junit.jupiter.api.AfterAll;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
@@ -32,35 +33,48 @@
  */
 public class PatchWithMyerDiffWithLinearSpaceTest {
 
-    @BeforeAll
-    public static void setupClass() {
-        DiffUtils.withDefaultDiffAlgorithmFactory(MyersDiffWithLinearSpace.factory());
-    }
+		@BeforeAll
+		public static void setupClass() {
+				DiffUtils.withDefaultDiffAlgorithmFactory(MyersDiffWithLinearSpace.factory());
+		}
 
-    @AfterAll
-    public static void resetClass() {
-        DiffUtils.withDefaultDiffAlgorithmFactory(MyersDiff.factory());
-    }
+		@AfterAll
+		public static void resetClass() {
+				DiffUtils.withDefaultDiffAlgorithmFactory(MyersDiff.factory());
+		}
 
-    @Test
-    public void testPatch_Change_withExceptionProcessor() {
-        final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
-        final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
+		@Test
+		public void testPatch_Change_withExceptionProcessor() {
+				final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
+				final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
 
-        final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to);
+				final Patch patch = DiffUtils.diff(changeTest_from, changeTest_to);
 
-        changeTest_from.set(2, "CDC");
+				changeTest_from.set(2, "CDC");
 
-        patch.withConflictOutput(Patch.CONFLICT_PRODUCES_MERGE_CONFLICT);
+				patch.withConflictOutput(Patch.CONFLICT_PRODUCES_MERGE_CONFLICT);
 
-        try {
-            List data = DiffUtils.patch(changeTest_from, patch);
-            assertEquals(11, data.size());
+				try {
+						List data = DiffUtils.patch(changeTest_from, patch);
+						assertEquals(11, data.size());
 
-            assertEquals(Arrays.asList("aaa", "bxb", "cxc", "<<<<<< HEAD", "bbb", "CDC", "======", "bbb", "ccc", ">>>>>>> PATCH", "ddd"), data);
+						assertEquals(
+										Arrays.asList(
+														"aaa",
+														"bxb",
+														"cxc",
+														"<<<<<< HEAD",
+														"bbb",
+														"CDC",
+														"======",
+														"bbb",
+														"ccc",
+														">>>>>>> PATCH",
+														"ddd"),
+										data);
 
-        } catch (PatchFailedException e) {
-            fail(e.getMessage());
-        }
-    }
+				} catch (PatchFailedException e) {
+						fail(e.getMessage());
+				}
+		}
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
index beccad8c..3b1120c4 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
@@ -1,7 +1,16 @@
 package com.github.difflib.text;
 
+import static java.util.stream.Collectors.joining;
+import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import com.github.difflib.DiffUtils;
 import com.github.difflib.algorithm.myers.MyersDiffWithLinearSpace;
+import com.github.difflib.patch.AbstractDelta;
+import com.github.difflib.text.deltamerge.DeltaMergeUtils;
+import com.github.difflib.text.deltamerge.InlineDeltaMergeInfo;
 import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -14,850 +23,882 @@
 import java.util.List;
 import java.util.function.Function;
 import java.util.regex.Pattern;
-import static java.util.stream.Collectors.joining;
-import static java.util.stream.Collectors.toList;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import org.junit.jupiter.api.Test;
 
-import com.github.difflib.patch.AbstractDelta;
-import com.github.difflib.text.deltamerge.DeltaMergeUtils;
-import com.github.difflib.text.deltamerge.InlineDeltaMergeInfo;
-
 public class DiffRowGeneratorTest {
 
-    @Test
-    public void testGenerator_Default() {
-        String first = "anything \n \nother";
-        String second = "anything\n\nother";
-
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .columnWidth(Integer.MAX_VALUE) // do not wrap
-                .build();
-        List rows = generator.generateDiffRows(split(first), split(second));
-        print(rows);
-
-        assertEquals(3, rows.size());
-    }
-
-    /**
-     * Test of normalize method, of class StringUtils.
-     */
-    @Test
-    public void testNormalize_List() {
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .build();
-        assertEquals(Collections.singletonList("    test"), generator.normalizeLines(Collections.singletonList("\ttest")));
-    }
-
-    @Test
-    public void testGenerator_Default2() {
-        String first = "anything \n \nother";
-        String second = "anything\n\nother";
-
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .columnWidth(0) // do not wrap
-                .build();
-        List rows = generator.generateDiffRows(split(first), split(second));
-        print(rows);
-
-        assertEquals(3, rows.size());
-    }
-
-    @Test
-    public void testGenerator_InlineDiff() {
-        String first = "anything \n \nother";
-        String second = "anything\n\nother";
-
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .columnWidth(Integer.MAX_VALUE) // do not wrap
-                .build();
-        List rows = generator.generateDiffRows(split(first), split(second));
-        print(rows);
-
-        assertEquals(3, rows.size());
-        assertTrue(rows.get(0).getOldLine().indexOf(" 0);
-    }
-
-    @Test
-    public void testGenerator_IgnoreWhitespaces() {
-        String first = "anything \n \nother\nmore lines";
-        String second = "anything\n\nother\nsome more lines";
-
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .ignoreWhiteSpaces(true)
-                .columnWidth(Integer.MAX_VALUE) // do not wrap
-                .build();
-        List rows = generator.generateDiffRows(split(first), split(second));
-        print(rows);
-
-        assertEquals(4, rows.size());
-        assertEquals(rows.get(0).getTag(), DiffRow.Tag.EQUAL);
-        assertEquals(rows.get(1).getTag(), DiffRow.Tag.EQUAL);
-        assertEquals(rows.get(2).getTag(), DiffRow.Tag.EQUAL);
-        assertEquals(rows.get(3).getTag(), DiffRow.Tag.CHANGE);
-    }
-
-    private List split(String content) {
-        return Arrays.asList(content.split("\n"));
-    }
-
-    private void print(List diffRows) {
-        for (DiffRow row : diffRows) {
-            System.out.println(row);
-        }
-    }
-
-    @Test
-    public void testGeneratorWithWordWrap() {
-        String first = "anything \n \nother";
-        String second = "anything\n\nother";
-
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .columnWidth(5)
-                .build();
-        List rows = generator.generateDiffRows(split(first), split(second));
-        print(rows);
-
-        assertEquals(3, rows.size());
-        assertEquals("[CHANGE,anyth
ing ,anyth
ing]", rows.get(0).toString());
-        assertEquals("[CHANGE, ,]", rows.get(1).toString());
-        assertEquals("[EQUAL,other,other]", rows.get(2).toString());
-    }
-
-    @Test
-    public void testGeneratorWithMerge() {
-        String first = "anything \n \nother";
-        String second = "anything\n\nother";
-
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .mergeOriginalRevised(true)
-                .build();
-        List rows = generator.generateDiffRows(split(first), split(second));
-        print(rows);
-
-        assertEquals(3, rows.size());
-        assertEquals("[CHANGE,anything ,anything]", rows.get(0).toString());
-        assertEquals("[CHANGE, ,]", rows.get(1).toString());
-        assertEquals("[EQUAL,other,other]", rows.get(2).toString());
-    }
-
-    @Test
-    public void testGeneratorWithMerge2() {
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .mergeOriginalRevised(true)
-                .build();
-        List rows = generator.generateDiffRows(Arrays.asList("Test"), Arrays.asList("ester"));
-        print(rows);
-
-        assertEquals(1, rows.size());
-        assertEquals("[CHANGE,Tester,ester]", rows.get(0).toString());
-    }
-
-    @Test
-    public void testGeneratorWithMerge3() {
-        String first = "test\nanything \n \nother";
-        String second = "anything\n\nother\ntest\ntest2";
-
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .mergeOriginalRevised(true)
-                .build();
-        List rows = generator.generateDiffRows(split(first), split(second));
-        print(rows);
-
-        assertEquals(6, rows.size());
-        assertEquals("[CHANGE,test,anything]", rows.get(0).toString());
-        assertEquals("[CHANGE,anything ,]", rows.get(1).toString());
-        assertEquals("[DELETE, ,]", rows.get(2).toString());
-        assertEquals("[EQUAL,other,other]", rows.get(3).toString());
-        assertEquals("[INSERT,test,test]", rows.get(4).toString());
-        assertEquals("[INSERT,test2,test2]", rows.get(5).toString());
-    }
-
-    @Test
-    public void testGeneratorWithMergeByWord4() {
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .mergeOriginalRevised(true)
-                .inlineDiffByWord(true)
-                .build();
-        List rows = generator.generateDiffRows(Arrays.asList("Test"), Arrays.asList("ester"));
-        print(rows);
-
-        assertEquals(1, rows.size());
-        assertEquals("[CHANGE,Testester,ester]", rows.get(0).toString());
-    }
-
-    @Test
-    public void testGeneratorWithMergeByWord5() {
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .mergeOriginalRevised(true)
-                .inlineDiffByWord(true)
-                .columnWidth(80)
-                .build();
-        List rows = generator.generateDiffRows(Arrays.asList("Test feature"), Arrays.asList("ester feature best"));
-        print(rows);
-
-        assertEquals(1, rows.size());
-        assertEquals("[CHANGE,Testester 
feature best,ester feature best]", rows.get(0).toString());
-    }
-
-    @Test
-    public void testSplitString() {
-        List list = DiffRowGenerator.splitStringPreserveDelimiter("test,test2", DiffRowGenerator.SPLIT_BY_WORD_PATTERN);
-        assertEquals(3, list.size());
-        assertEquals("[test, ,, test2]", list.toString());
-    }
-
-    @Test
-    public void testSplitString2() {
-        List list = DiffRowGenerator.splitStringPreserveDelimiter("test , test2", DiffRowGenerator.SPLIT_BY_WORD_PATTERN);
-        System.out.println(list);
-        assertEquals(5, list.size());
-        assertEquals("[test,  , ,,  , test2]", list.toString());
-    }
-
-    @Test
-    public void testSplitString3() {
-        List list = DiffRowGenerator.splitStringPreserveDelimiter("test,test2,", DiffRowGenerator.SPLIT_BY_WORD_PATTERN);
-        System.out.println(list);
-        assertEquals(4, list.size());
-        assertEquals("[test, ,, test2, ,]", list.toString());
-    }
-
-    @Test
-    public void testGeneratorExample1() {
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .mergeOriginalRevised(true)
-                .inlineDiffByWord(true)
-                .oldTag(f -> "~")
-                .newTag(f -> "**")
-                .build();
-        List rows = generator.generateDiffRows(
-                Arrays.asList("This is a test senctence."),
-                Arrays.asList("This is a test for diffutils."));
-
-        System.out.println(rows.get(0).getOldLine());
-
-        assertEquals(1, rows.size());
-        assertEquals("This is a test ~senctence~**for diffutils**.", rows.get(0).getOldLine());
-    }
-
-    @Test
-    public void testGeneratorExample2() {
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .inlineDiffByWord(true)
-                .oldTag(f -> "~")
-                .newTag(f -> "**")
-                .build();
-        List rows = generator.generateDiffRows(
-                Arrays.asList("This is a test senctence.", "This is the second line.", "And here is the finish."),
-                Arrays.asList("This is a test for diffutils.", "This is the second line."));
-
-        System.out.println("|original|new|");
-        System.out.println("|--------|---|");
-        for (DiffRow row : rows) {
-            System.out.println("|" + row.getOldLine() + "|" + row.getNewLine() + "|");
-        }
-
-        assertEquals(3, rows.size());
-        assertEquals("This is a test ~senctence~.", rows.get(0).getOldLine());
-        assertEquals("This is a test **for diffutils**.", rows.get(0).getNewLine());
-    }
-
-    @Test
-    public void testGeneratorUnchanged() {
-        String first = "anything \n \nother";
-        String second = "anything\n\nother";
-
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .columnWidth(5)
-                .reportLinesUnchanged(true)
-                .build();
-        List rows = generator.generateDiffRows(split(first), split(second));
-        print(rows);
-
-        assertEquals(3, rows.size());
-        assertEquals("[CHANGE,anything ,anything]", rows.get(0).toString());
-        assertEquals("[CHANGE, ,]", rows.get(1).toString());
-        assertEquals("[EQUAL,other,other]", rows.get(2).toString());
-    }
-
-    @Test
-    public void testGeneratorIssue14() {
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .mergeOriginalRevised(true)
-                .inlineDiffBySplitter(line -> DiffRowGenerator.splitStringPreserveDelimiter(line, Pattern.compile(",")))
-                .oldTag(f -> "~")
-                .newTag(f -> "**")
-                .build();
-        List rows = generator.generateDiffRows(
-                Arrays.asList("J. G. Feldstein, Chair"),
-                Arrays.asList("T. P. Pastor, Chair"));
-
-        System.out.println(rows.get(0).getOldLine());
-
-        assertEquals(1, rows.size());
-        assertEquals("~J. G. Feldstein~**T. P. Pastor**, Chair", rows.get(0).getOldLine());
-    }
-
-    @Test
-    public void testGeneratorIssue15() throws IOException {
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true) //show the ~ ~ and ** ** symbols on each difference
-                .inlineDiffByWord(true) //show the ~ ~ and ** ** around each different word instead of each letter
-                //.reportLinesUnchanged(true) //experiment
-                .oldTag(f -> "~")
-                .newTag(f -> "**")
-                .build();
-
-        List listOne = Files.lines(new File("target/test-classes/mocks/issue15_1.txt").toPath())
-                .collect(toList());
-
-        List listTwo = Files.lines(new File("target/test-classes/mocks/issue15_2.txt").toPath())
-                .collect(toList());
-
-        List rows = generator.generateDiffRows(listOne, listTwo);
-
-        assertEquals(9, rows.size());
-
-        for (DiffRow row : rows) {
-            System.out.println("|" + row.getOldLine() + "| " + row.getNewLine() + " |");
-            if (!row.getOldLine().startsWith("TABLE_NAME")) {
-                assertTrue(row.getNewLine().startsWith("**ACTIONS_C16913**"));
-                assertTrue(row.getOldLine().startsWith("~ACTIONS_C1700"));
-            }
-        }
-    }
-
-    @Test
-    public void testGeneratorIssue22() {
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .inlineDiffByWord(true)
-                .oldTag(f -> "~")
-                .newTag(f -> "**")
-                .build();
-        String aa = "This is a test senctence.";
-        String bb = "This is a test for diffutils.\nThis is the second line.";
-        List rows = generator.generateDiffRows(
-                Arrays.asList(aa.split("\n")),
-                Arrays.asList(bb.split("\n")));
-
-        assertEquals("[[CHANGE,This is a test ~senctence~.,This is a test **for diffutils**.], [INSERT,,**This is the second line.**]]",
-                rows.toString());
-
-        System.out.println("|original|new|");
-        System.out.println("|--------|---|");
-        for (DiffRow row : rows) {
-            System.out.println("|" + row.getOldLine() + "|" + row.getNewLine() + "|");
-        }
-    }
-
-    @Test
-    public void testGeneratorIssue22_2() {
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .inlineDiffByWord(true)
-                .oldTag(f -> "~")
-                .newTag(f -> "**")
-                .build();
-        String aa = "This is a test for diffutils.\nThis is the second line.";
-        String bb = "This is a test senctence.";
-        List rows = generator.generateDiffRows(
-                Arrays.asList(aa.split("\n")),
-                Arrays.asList(bb.split("\n")));
-
-        assertEquals("[[CHANGE,This is a test ~for diffutils~.,This is a test **senctence**.], [DELETE,~This is the second line.~,]]",
-                rows.toString());
-    }
-
-    @Test
-    public void testGeneratorIssue22_3() {
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .inlineDiffByWord(true)
-                .oldTag(f -> "~")
-                .newTag(f -> "**")
-                .build();
-        String aa = "This is a test senctence.";
-        String bb = "This is a test for diffutils.\nThis is the second line.\nAnd one more.";
-        List rows = generator.generateDiffRows(
-                Arrays.asList(aa.split("\n")),
-                Arrays.asList(bb.split("\n")));
-
-        assertEquals("[[CHANGE,This is a test ~senctence~.,This is a test **for diffutils**.], [INSERT,,**This is the second line.**], [INSERT,,**And one more.**]]",
-                rows.toString());
-    }
-
-    @Test
-    public void testGeneratorIssue41DefaultNormalizer() {
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .build();
-        List rows = generator.generateDiffRows(Arrays.asList("<"), Arrays.asList("<"));
-        assertEquals("[[EQUAL,<,<]]", rows.toString());
-    }
-
-    @Test
-    public void testGeneratorIssue41UserNormalizer() {
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .lineNormalizer(str -> str.replace("\t", "    "))
-                .build();
-        List rows = generator.generateDiffRows(Arrays.asList("<"), Arrays.asList("<"));
-        assertEquals("[[EQUAL,<,<]]", rows.toString());
-        rows = generator.generateDiffRows(Arrays.asList("\t<"), Arrays.asList("<"));
-        assertEquals("[[CHANGE,    <,<]]", rows.toString());
-    }
-
-    @Test
-    public void testGenerationIssue44reportLinesUnchangedProblem() {
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .reportLinesUnchanged(true)
-                .oldTag(f -> "~~")
-                .newTag(f -> "**")
-                .build();
-        List rows = generator.generateDiffRows(Arrays.asList("
To do
"), Arrays.asList("
Done
"));
-        assertEquals("[[CHANGE,
~~T~~o~~ do~~
,
**D**o**ne**
]]", rows.toString());
-    }
-
-    @Test
-    public void testIgnoreWhitespaceIssue66() {
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .inlineDiffByWord(true)
-                .ignoreWhiteSpaces(true)
-                .mergeOriginalRevised(true)
-                .oldTag(f -> "~") //introduce markdown style for strikethrough
-                .newTag(f -> "**") //introduce markdown style for bold
-                .build();
-
-        //compute the differences for two test texts.
-        //CHECKSTYLE:OFF
-        List rows = generator.generateDiffRows(
-                Arrays.asList("This\tis\ta\ttest."),
-                Arrays.asList("This is a test"));
-        //CHECKSTYLE:ON
-
-        assertEquals("This    is    a    test~.~", rows.get(0).getOldLine());
-    }
-
-    @Test
-    public void testIgnoreWhitespaceIssue66_2() {
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .inlineDiffByWord(true)
-                .ignoreWhiteSpaces(true)
-                .mergeOriginalRevised(true)
-                .oldTag(f -> "~") //introduce markdown style for strikethrough
-                .newTag(f -> "**") //introduce markdown style for bold
-                .build();
-
-        //compute the differences for two test texts.
-        List rows = generator.generateDiffRows(
-                Arrays.asList("This  is  a  test."),
-                Arrays.asList("This is a test"));
-
-        assertEquals("This  is  a  test~.~", rows.get(0).getOldLine());
-    }
-
-    @Test
-    public void testIgnoreWhitespaceIssue64() {
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .inlineDiffByWord(true)
-                .ignoreWhiteSpaces(true)
-                .mergeOriginalRevised(true)
-                .oldTag(f -> "~") //introduce markdown style for strikethrough
-                .newTag(f -> "**") //introduce markdown style for bold
-                .build();
-
-        //compute the differences for two test texts.
-        List rows = generator.generateDiffRows(
-                Arrays.asList("test\n\ntestline".split("\n")),
-                Arrays.asList("A new text line\n\nanother one".split("\n")));
-
-        assertThat(rows).extracting(item -> item.getOldLine())
-                .containsExactly("~test~**A new text line**",
-                        "",
-                        "~testline~**another one**");
-    }
-
-    @Test
-    public void testReplaceDiffsIssue63() {
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .inlineDiffByWord(true)
-                .mergeOriginalRevised(true)
-                .oldTag(f -> "~") //introduce markdown style for strikethrough
-                .newTag(f -> "**") //introduce markdown style for bold
-                .processDiffs(str -> str.replace(" ", "/"))
-                .build();
-
-        //compute the differences for two test texts.
-        List rows = generator.generateDiffRows(
-                Arrays.asList("This  is  a  test."),
-                Arrays.asList("This is a test"));
-
-        assertEquals("This~//~**/**is~//~**/**a~//~**/**test~.~", rows.get(0).getOldLine());
-    }
-
-    @Test
-    public void testProblemTooManyDiffRowsIssue65() {
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .reportLinesUnchanged(true)
-                .oldTag(f -> "~")
-                .newTag(f -> "**")
-                .mergeOriginalRevised(true)
-                .inlineDiffByWord(false)
-                .replaceOriginalLinefeedInChangesWithSpaces(true)
-                .build();
-
-        List diffRows = generator.generateDiffRows(
-                Arrays.asList("Ich möchte nicht mit einem Bot sprechen.", "Ich soll das schon wieder wiederholen?"),
-                Arrays.asList("Ich möchte nicht mehr mit dir sprechen. Leite mich weiter.", "Kannst du mich zum Kundendienst weiterleiten?"));
-
-        print(diffRows);
-
-        assertThat(diffRows).hasSize(2);
-    }
-
-    @Test
-    public void testProblemTooManyDiffRowsIssue65_NoMerge() {
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .reportLinesUnchanged(true)
-                .oldTag(f -> "~")
-                .newTag(f -> "**")
-                .mergeOriginalRevised(false)
-                .inlineDiffByWord(false)
-                .build();
-
-        List diffRows = generator.generateDiffRows(
-                Arrays.asList("Ich möchte nicht mit einem Bot sprechen.", "Ich soll das schon wieder wiederholen?"),
-                Arrays.asList("Ich möchte nicht mehr mit dir sprechen. Leite mich weiter.", "Kannst du mich zum Kundendienst weiterleiten?"));
-
-        System.out.println(diffRows);
-
-        assertThat(diffRows).hasSize(2);
-    }
-
-    @Test
-    public void testProblemTooManyDiffRowsIssue65_DiffByWord() {
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .reportLinesUnchanged(true)
-                .oldTag(f -> "~")
-                .newTag(f -> "**")
-                .mergeOriginalRevised(true)
-                .inlineDiffByWord(true)
-                .build();
-
-        List diffRows = generator.generateDiffRows(
-                Arrays.asList("Ich möchte nicht mit einem Bot sprechen.", "Ich soll das schon wieder wiederholen?"),
-                Arrays.asList("Ich möchte nicht mehr mit dir sprechen. Leite mich weiter.", "Kannst du mich zum Kundendienst weiterleiten?"));
-
-        System.out.println(diffRows);
-
-        assertThat(diffRows).hasSize(2);
-    }
-
-    @Test
-    public void testProblemTooManyDiffRowsIssue65_NoInlineDiff() {
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(false)
-                .reportLinesUnchanged(true)
-                .oldTag(f -> "~")
-                .newTag(f -> "**")
-                .mergeOriginalRevised(true)
-                .inlineDiffByWord(false)
-                .build();
-
-        List diffRows = generator.generateDiffRows(
-                Arrays.asList("Ich möchte nicht mit einem Bot sprechen.", "Ich soll das schon wieder wiederholen?"),
-                Arrays.asList("Ich möchte nicht mehr mit dir sprechen. Leite mich weiter.", "Kannst du mich zum Kundendienst weiterleiten?"));
-
-        System.out.println(diffRows);
-
-        assertThat(diffRows).hasSize(2);
-    }
-
-    @Test
-    public void testLinefeedInStandardTagsWithLineWidthIssue81() {
-        List original = Arrays.asList(("American bobtail jaguar. American bobtail bombay but turkish angora and tomcat.\n"
-                + "Russian blue leopard. Lion. Tabby scottish fold for russian blue, so savannah yet lynx. Tomcat singapura, cheetah.\n"
-                + "Bengal tiger panther but singapura but bombay munchkin for cougar.").split("\n"));
-        List revised = Arrays.asList(("bobtail jaguar. American bobtail turkish angora and tomcat.\n"
-                + "Russian blue leopard. Lion. Tabby scottish folded for russian blue, so savannah yettie? lynx. Tomcat singapura, cheetah.\n"
-                + "Bengal tiger panther but singapura but bombay munchkin for cougar. And more.").split("\n"));
-
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .ignoreWhiteSpaces(true)
-                .columnWidth(100)
-                .build();
-        List deltas = generator.generateDiffRows(original, revised);
-
-        System.out.println(deltas);
-    }
-
-    @Test
-    public void testIssue86WrongInlineDiff() throws IOException {
-        String original = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue_86_original.txt")).collect(joining("\n"));
-        String revised = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue_86_revised.txt")).collect(joining("\n"));
-
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .mergeOriginalRevised(true)
-                .inlineDiffByWord(true)
-                .oldTag(f -> "~")
-                .newTag(f -> "**")
-                .build();
-        List rows = generator.generateDiffRows(
-                Arrays.asList(original.split("\n")),
-                Arrays.asList(revised.split("\n")));
-
-        rows.stream()
-                .filter(item -> item.getTag() != DiffRow.Tag.EQUAL)
-                .forEach(System.out::println);
-    }
-
-    @Test
-    public void testCorrectChangeIssue114() throws IOException {
-        List original = Arrays.asList("A", "B", "C", "D", "E");
-        List revised = Arrays.asList("a", "C", "", "E");
-
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(false)
-                .inlineDiffByWord(true)
-                .oldTag(f -> "~")
-                .newTag(f -> "**")
-                .build();
-        List rows = generator.generateDiffRows(original, revised);
-
-        for (DiffRow diff : rows) {
-            System.out.println(diff);
-        }
-
-        assertThat(rows).extracting(item -> item.getTag().name()).containsExactly("CHANGE", "DELETE", "EQUAL", "CHANGE", "EQUAL");
-    }
-
-    @Test
-    public void testCorrectChangeIssue114_2() throws IOException {
-        List original = Arrays.asList("A", "B", "C", "D", "E");
-        List revised = Arrays.asList("a", "C", "", "E");
-
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .inlineDiffByWord(true)
-                .oldTag(f -> "~")
-                .newTag(f -> "**")
-                .build();
-        List rows = generator.generateDiffRows(original, revised);
-
-        for (DiffRow diff : rows) {
-            System.out.println(diff);
-        }
-
-        assertThat(rows).extracting(item -> item.getTag().name()).containsExactly("CHANGE", "DELETE", "EQUAL", "CHANGE", "EQUAL");
-        assertThat(rows.get(1).toString()).isEqualTo("[DELETE,~B~,]");
-    }
-
-    @Test
-    public void testIssue119WrongContextLength() throws IOException {
-        String original = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue_119_original.txt")).collect(joining("\n"));
-        String revised = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue_119_revised.txt")).collect(joining("\n"));
-
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .mergeOriginalRevised(true)
-                .inlineDiffByWord(true)
-                .oldTag(f -> "~")
-                .newTag(f -> "**")
-                .build();
-        List rows = generator.generateDiffRows(
-                Arrays.asList(original.split("\n")),
-                Arrays.asList(revised.split("\n")));
-
-        rows.stream()
-                .filter(item -> item.getTag() != DiffRow.Tag.EQUAL)
-                .forEach(System.out::println);
-    }
-
-    @Test
-    public void testIssue129WithDeltaDecompression() {
-        List lines1 = Arrays.asList(
-                "apple1",
-                "apple2",
-                "apple3",
-                "A man named Frankenstein abc to Switzerland for cookies!",
-                "banana1",
-                "banana2",
-                "banana3");
-        List lines2 = Arrays.asList(
-                "apple1",
-                "apple2",
-                "apple3",
-                "A man named Frankenstein",
-                "xyz",
-                "to Switzerland for cookies!",
-                "banana1",
-                "banana2",
-                "banana3");
-        int[] entry = {1};
-        String txt = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .oldTag((tag, isOpening) -> isOpening ? "==old" + tag + "==>" : "<==old==")
-                .newTag((tag, isOpening) -> isOpening ? "==new" + tag + "==>" : "<==new==")
-                .build()
-                .generateDiffRows(lines1, lines2)
-                .stream()
-                .map(row -> row.getTag().toString())
-                .collect(joining(" "));
-//                .forEachOrdered(row -> {
-//                    System.out.printf("%4d %-8s %-80s %-80s\n", entry[0]++,
-//                            row.getTag(), row.getOldLine(), row.getNewLine());
-//                });
-
-        assertThat(txt).isEqualTo("EQUAL EQUAL EQUAL CHANGE INSERT INSERT EQUAL EQUAL EQUAL");
-    }
-
-    @Test
-    public void testIssue129SkipDeltaDecompression() {
-        List lines1 = Arrays.asList(
-                "apple1",
-                "apple2",
-                "apple3",
-                "A man named Frankenstein abc to Switzerland for cookies!",
-                "banana1",
-                "banana2",
-                "banana3");
-        List lines2 = Arrays.asList(
-                "apple1",
-                "apple2",
-                "apple3",
-                "A man named Frankenstein",
-                "xyz",
-                "to Switzerland for cookies!",
-                "banana1",
-                "banana2",
-                "banana3");
-        int[] entry = {1};
-        String txt
-                = DiffRowGenerator.create()
-                        .showInlineDiffs(true)
-                        .decompressDeltas(false)
-                        .oldTag((tag, isOpening) -> isOpening ? "==old" + tag + "==>" : "<==old==")
-                        .newTag((tag, isOpening) -> isOpening ? "==new" + tag + "==>" : "<==new==")
-                        .build()
-                        .generateDiffRows(lines1, lines2)
-                        .stream()
-                        .map(row -> row.getTag().toString())
-                        .collect(joining(" "));
-//                .forEachOrdered(row -> {
-//                    System.out.printf("%4d %-8s %-80s %-80s\n", entry[0]++,
-//                            row.getTag(), row.getOldLine(), row.getNewLine());
-//                });
-
-        assertThat(txt).isEqualTo("EQUAL EQUAL EQUAL CHANGE CHANGE CHANGE EQUAL EQUAL EQUAL");
-    }
-
-    @Test
-    public void testIssue129SkipWhitespaceChanges() throws IOException {
-        String original = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue129_1.txt")).collect(joining("\n"));
-        String revised = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue129_2.txt")).collect(joining("\n"));
-
-        DiffRowGenerator generator = DiffRowGenerator.create()
-                .showInlineDiffs(true)
-                .mergeOriginalRevised(true)
-                .inlineDiffByWord(true)
-                .ignoreWhiteSpaces(true)
-                .oldTag((tag, isOpening) -> isOpening ? "==old" + tag + "==>" : "<==old==")
-                .newTag((tag, isOpening) -> isOpening ? "==new" + tag + "==>" : "<==new==")
-                .build();
-        List rows = generator.generateDiffRows(
-                Arrays.asList(original.split("\n")),
-                Arrays.asList(revised.split("\n")));
-
-        assertThat(rows).hasSize(13);
-
-        rows.stream()
-                .filter(item -> item.getTag() != DiffRow.Tag.EQUAL)
-                .forEach(System.out::println);
-    }
-
-    @Test
-    public void testGeneratorWithWhitespaceDeltaMerge() {
-        final DiffRowGenerator generator = DiffRowGenerator.create().showInlineDiffs(true).mergeOriginalRevised(true)
-                .inlineDiffByWord(true).oldTag(f -> "~").newTag(f -> "**") //
-                .lineNormalizer(StringUtils::htmlEntites) // do not replace tabs
-                .inlineDeltaMerger(DiffRowGenerator.WHITESPACE_EQUALITIES_MERGER).build();
-
-        assertInlineDiffResult(generator, "No diff", "No diff", "No diff");
-        assertInlineDiffResult(generator, " x whitespace before diff", " y whitespace before diff",
-                " ~x~**y** whitespace before diff");
-        assertInlineDiffResult(generator, "Whitespace after diff x ", "Whitespace after diff y ",
-                "Whitespace after diff ~x~**y** ");
-        assertInlineDiffResult(generator, "Diff x x between", "Diff y y between", "Diff ~x x~**y y** between");
-        assertInlineDiffResult(generator, "Hello \t world", "Hi \t universe", "~Hello \t world~**Hi \t universe**");
-        assertInlineDiffResult(generator, "The quick brown fox jumps over the lazy dog", "A lazy dog jumps over a fox",
-                "~The quick brown fox ~**A lazy dog **jumps over ~the lazy dog~**a fox**");
-    }
-
-    @Test
-    public void testGeneratorWithMergingDeltasForShortEqualities() {
-        final Function>> shortEqualitiesMerger = deltaMergeInfo -> DeltaMergeUtils
-                .mergeInlineDeltas(deltaMergeInfo,
-                        equalities -> equalities.stream().mapToInt(String::length).sum() < 6);
-
-        final DiffRowGenerator generator = DiffRowGenerator.create().showInlineDiffs(true).mergeOriginalRevised(true)
-                .inlineDiffByWord(true).oldTag(f -> "~").newTag(f -> "**").inlineDeltaMerger(shortEqualitiesMerger)
-                .build();
-
-        assertInlineDiffResult(generator, "No diff", "No diff", "No diff");
-        assertInlineDiffResult(generator, "aaa bbb ccc", "xxx bbb zzz", "~aaa bbb ccc~**xxx bbb zzz**");
-        assertInlineDiffResult(generator, "aaa bbbb ccc", "xxx bbbb zzz", "~aaa~**xxx** bbbb ~ccc~**zzz**");
-    }
-
-    private void assertInlineDiffResult(DiffRowGenerator generator, String original, String revised, String expected) {
-        final List rows = generator.generateDiffRows(Arrays.asList(original), Arrays.asList(revised));
-        print(rows);
-
-        assertEquals(1, rows.size());
-        assertEquals(expected, rows.get(0).getOldLine().toString());
-    }
-  
-    @Test
-    public void testIssue188HangOnExamples() throws IOException, URISyntaxException {        
-        try (FileSystem zipFs = FileSystems.newFileSystem(Paths.get("target/test-classes/com/github/difflib/text/test.zip"), (ClassLoader) null);) {
-            List original = Files.readAllLines(zipFs.getPath("old.html"));
-            List revised = Files.readAllLines(zipFs.getPath("new.html"));
-
-            DiffRowGenerator generator = DiffRowGenerator.create()
-                    .lineNormalizer(line -> line)
-                    .showInlineDiffs(true)
-                    .mergeOriginalRevised(true)
-                    .inlineDiffByWord(true)
-                    .decompressDeltas(true)
-                    .oldTag(f -> f ? "" : "")
-                    .newTag(f -> f ? "" : "")
-                    .build();
-
-            //List rows = generator.generateDiffRows(original, revised);
-            List rows = generator.generateDiffRows(original, DiffUtils.diff(original, revised, new MyersDiffWithLinearSpace<>() ));
-        
-            System.out.println(rows);
-        }
-    }
+		@Test
+		public void testGenerator_Default() {
+				String first = "anything \n \nother";
+				String second = "anything\n\nother";
+
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.columnWidth(Integer.MAX_VALUE) // do not wrap
+								.build();
+				List rows = generator.generateDiffRows(split(first), split(second));
+				print(rows);
+
+				assertEquals(3, rows.size());
+		}
+
+		/**
+		 * Test of normalize method, of class StringUtils.
+		 */
+		@Test
+		public void testNormalize_List() {
+				DiffRowGenerator generator = DiffRowGenerator.create().build();
+				assertEquals(
+								Collections.singletonList("    test"), generator.normalizeLines(Collections.singletonList("\ttest")));
+		}
+
+		@Test
+		public void testGenerator_Default2() {
+				String first = "anything \n \nother";
+				String second = "anything\n\nother";
+
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.columnWidth(0) // do not wrap
+								.build();
+				List rows = generator.generateDiffRows(split(first), split(second));
+				print(rows);
+
+				assertEquals(3, rows.size());
+		}
+
+		@Test
+		public void testGenerator_InlineDiff() {
+				String first = "anything \n \nother";
+				String second = "anything\n\nother";
+
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.columnWidth(Integer.MAX_VALUE) // do not wrap
+								.build();
+				List rows = generator.generateDiffRows(split(first), split(second));
+				print(rows);
+
+				assertEquals(3, rows.size());
+				assertTrue(rows.get(0).getOldLine().indexOf(" 0);
+		}
+
+		@Test
+		public void testGenerator_IgnoreWhitespaces() {
+				String first = "anything \n \nother\nmore lines";
+				String second = "anything\n\nother\nsome more lines";
+
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.ignoreWhiteSpaces(true)
+								.columnWidth(Integer.MAX_VALUE) // do not wrap
+								.build();
+				List rows = generator.generateDiffRows(split(first), split(second));
+				print(rows);
+
+				assertEquals(4, rows.size());
+				assertEquals(rows.get(0).getTag(), DiffRow.Tag.EQUAL);
+				assertEquals(rows.get(1).getTag(), DiffRow.Tag.EQUAL);
+				assertEquals(rows.get(2).getTag(), DiffRow.Tag.EQUAL);
+				assertEquals(rows.get(3).getTag(), DiffRow.Tag.CHANGE);
+		}
+
+		private List split(String content) {
+				return Arrays.asList(content.split("\n"));
+		}
+
+		private void print(List diffRows) {
+				for (DiffRow row : diffRows) {
+						System.out.println(row);
+				}
+		}
+
+		@Test
+		public void testGeneratorWithWordWrap() {
+				String first = "anything \n \nother";
+				String second = "anything\n\nother";
+
+				DiffRowGenerator generator = DiffRowGenerator.create().columnWidth(5).build();
+				List rows = generator.generateDiffRows(split(first), split(second));
+				print(rows);
+
+				assertEquals(3, rows.size());
+				assertEquals("[CHANGE,anyth
ing ,anyth
ing]", rows.get(0).toString());
+				assertEquals("[CHANGE, ,]", rows.get(1).toString());
+				assertEquals("[EQUAL,other,other]", rows.get(2).toString());
+		}
+
+		@Test
+		public void testGeneratorWithMerge() {
+				String first = "anything \n \nother";
+				String second = "anything\n\nother";
+
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.mergeOriginalRevised(true)
+								.build();
+				List rows = generator.generateDiffRows(split(first), split(second));
+				print(rows);
+
+				assertEquals(3, rows.size());
+				assertEquals(
+								"[CHANGE,anything ,anything]",
+								rows.get(0).toString());
+				assertEquals(
+								"[CHANGE, ,]", rows.get(1).toString());
+				assertEquals("[EQUAL,other,other]", rows.get(2).toString());
+		}
+
+		@Test
+		public void testGeneratorWithMerge2() {
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.mergeOriginalRevised(true)
+								.build();
+				List rows = generator.generateDiffRows(Arrays.asList("Test"), Arrays.asList("ester"));
+				print(rows);
+
+				assertEquals(1, rows.size());
+				assertEquals(
+								"[CHANGE,Tester,ester]",
+								rows.get(0).toString());
+		}
+
+		@Test
+		public void testGeneratorWithMerge3() {
+				String first = "test\nanything \n \nother";
+				String second = "anything\n\nother\ntest\ntest2";
+
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.mergeOriginalRevised(true)
+								.build();
+				List rows = generator.generateDiffRows(split(first), split(second));
+				print(rows);
+
+				assertEquals(6, rows.size());
+				assertEquals(
+								"[CHANGE,test,anything]",
+								rows.get(0).toString());
+				assertEquals(
+								"[CHANGE,anything ,]",
+								rows.get(1).toString());
+				assertEquals(
+								"[DELETE, ,]", rows.get(2).toString());
+				assertEquals("[EQUAL,other,other]", rows.get(3).toString());
+				assertEquals(
+								"[INSERT,test,test]",
+								rows.get(4).toString());
+				assertEquals(
+								"[INSERT,test2,test2]",
+								rows.get(5).toString());
+		}
+
+		@Test
+		public void testGeneratorWithMergeByWord4() {
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.mergeOriginalRevised(true)
+								.inlineDiffByWord(true)
+								.build();
+				List rows = generator.generateDiffRows(Arrays.asList("Test"), Arrays.asList("ester"));
+				print(rows);
+
+				assertEquals(1, rows.size());
+				assertEquals(
+								"[CHANGE,Testester,ester]",
+								rows.get(0).toString());
+		}
+
+		@Test
+		public void testGeneratorWithMergeByWord5() {
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.mergeOriginalRevised(true)
+								.inlineDiffByWord(true)
+								.columnWidth(80)
+								.build();
+				List rows =
+								generator.generateDiffRows(Arrays.asList("Test feature"), Arrays.asList("ester feature best"));
+				print(rows);
+
+				assertEquals(1, rows.size());
+				assertEquals(
+								"[CHANGE,Testester 
feature best,ester feature best]",
+								rows.get(0).toString());
+		}
+
+		@Test
+		public void testSplitString() {
+				List list =
+								DiffRowGenerator.splitStringPreserveDelimiter("test,test2", DiffRowGenerator.SPLIT_BY_WORD_PATTERN);
+				assertEquals(3, list.size());
+				assertEquals("[test, ,, test2]", list.toString());
+		}
+
+		@Test
+		public void testSplitString2() {
+				List list =
+								DiffRowGenerator.splitStringPreserveDelimiter("test , test2", DiffRowGenerator.SPLIT_BY_WORD_PATTERN);
+				System.out.println(list);
+				assertEquals(5, list.size());
+				assertEquals("[test,  , ,,  , test2]", list.toString());
+		}
+
+		@Test
+		public void testSplitString3() {
+				List list =
+								DiffRowGenerator.splitStringPreserveDelimiter("test,test2,", DiffRowGenerator.SPLIT_BY_WORD_PATTERN);
+				System.out.println(list);
+				assertEquals(4, list.size());
+				assertEquals("[test, ,, test2, ,]", list.toString());
+		}
+
+		@Test
+		public void testGeneratorExample1() {
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.mergeOriginalRevised(true)
+								.inlineDiffByWord(true)
+								.oldTag(f -> "~")
+								.newTag(f -> "**")
+								.build();
+				List rows = generator.generateDiffRows(
+								Arrays.asList("This is a test senctence."), Arrays.asList("This is a test for diffutils."));
+
+				System.out.println(rows.get(0).getOldLine());
+
+				assertEquals(1, rows.size());
+				assertEquals("This is a test ~senctence~**for diffutils**.", rows.get(0).getOldLine());
+		}
+
+		@Test
+		public void testGeneratorExample2() {
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.inlineDiffByWord(true)
+								.oldTag(f -> "~")
+								.newTag(f -> "**")
+								.build();
+				List rows = generator.generateDiffRows(
+								Arrays.asList("This is a test senctence.", "This is the second line.", "And here is the finish."),
+								Arrays.asList("This is a test for diffutils.", "This is the second line."));
+
+				System.out.println("|original|new|");
+				System.out.println("|--------|---|");
+				for (DiffRow row : rows) {
+						System.out.println("|" + row.getOldLine() + "|" + row.getNewLine() + "|");
+				}
+
+				assertEquals(3, rows.size());
+				assertEquals("This is a test ~senctence~.", rows.get(0).getOldLine());
+				assertEquals("This is a test **for diffutils**.", rows.get(0).getNewLine());
+		}
+
+		@Test
+		public void testGeneratorUnchanged() {
+				String first = "anything \n \nother";
+				String second = "anything\n\nother";
+
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.columnWidth(5)
+								.reportLinesUnchanged(true)
+								.build();
+				List rows = generator.generateDiffRows(split(first), split(second));
+				print(rows);
+
+				assertEquals(3, rows.size());
+				assertEquals("[CHANGE,anything ,anything]", rows.get(0).toString());
+				assertEquals("[CHANGE, ,]", rows.get(1).toString());
+				assertEquals("[EQUAL,other,other]", rows.get(2).toString());
+		}
+
+		@Test
+		public void testGeneratorIssue14() {
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.mergeOriginalRevised(true)
+								.inlineDiffBySplitter(line -> DiffRowGenerator.splitStringPreserveDelimiter(line, Pattern.compile(",")))
+								.oldTag(f -> "~")
+								.newTag(f -> "**")
+								.build();
+				List rows = generator.generateDiffRows(
+								Arrays.asList("J. G. Feldstein, Chair"), Arrays.asList("T. P. Pastor, Chair"));
+
+				System.out.println(rows.get(0).getOldLine());
+
+				assertEquals(1, rows.size());
+				assertEquals("~J. G. Feldstein~**T. P. Pastor**, Chair", rows.get(0).getOldLine());
+		}
+
+		@Test
+		public void testGeneratorIssue15() throws IOException {
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true) // show the ~ ~ and ** ** symbols on each difference
+								.inlineDiffByWord(true) // show the ~ ~ and ** ** around each different word instead of each letter
+								// .reportLinesUnchanged(true) //experiment
+								.oldTag(f -> "~")
+								.newTag(f -> "**")
+								.build();
+
+				List listOne = Files.lines(new File("target/test-classes/mocks/issue15_1.txt").toPath())
+								.collect(toList());
+
+				List listTwo = Files.lines(new File("target/test-classes/mocks/issue15_2.txt").toPath())
+								.collect(toList());
+
+				List rows = generator.generateDiffRows(listOne, listTwo);
+
+				assertEquals(9, rows.size());
+
+				for (DiffRow row : rows) {
+						System.out.println("|" + row.getOldLine() + "| " + row.getNewLine() + " |");
+						if (!row.getOldLine().startsWith("TABLE_NAME")) {
+								assertTrue(row.getNewLine().startsWith("**ACTIONS_C16913**"));
+								assertTrue(row.getOldLine().startsWith("~ACTIONS_C1700"));
+						}
+				}
+		}
+
+		@Test
+		public void testGeneratorIssue22() {
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.inlineDiffByWord(true)
+								.oldTag(f -> "~")
+								.newTag(f -> "**")
+								.build();
+				String aa = "This is a test senctence.";
+				String bb = "This is a test for diffutils.\nThis is the second line.";
+				List rows = generator.generateDiffRows(Arrays.asList(aa.split("\n")), Arrays.asList(bb.split("\n")));
+
+				assertEquals(
+								"[[CHANGE,This is a test ~senctence~.,This is a test **for diffutils**.], [INSERT,,**This is the second line.**]]",
+								rows.toString());
+
+				System.out.println("|original|new|");
+				System.out.println("|--------|---|");
+				for (DiffRow row : rows) {
+						System.out.println("|" + row.getOldLine() + "|" + row.getNewLine() + "|");
+				}
+		}
+
+		@Test
+		public void testGeneratorIssue22_2() {
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.inlineDiffByWord(true)
+								.oldTag(f -> "~")
+								.newTag(f -> "**")
+								.build();
+				String aa = "This is a test for diffutils.\nThis is the second line.";
+				String bb = "This is a test senctence.";
+				List rows = generator.generateDiffRows(Arrays.asList(aa.split("\n")), Arrays.asList(bb.split("\n")));
+
+				assertEquals(
+								"[[CHANGE,This is a test ~for diffutils~.,This is a test **senctence**.], [DELETE,~This is the second line.~,]]",
+								rows.toString());
+		}
+
+		@Test
+		public void testGeneratorIssue22_3() {
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.inlineDiffByWord(true)
+								.oldTag(f -> "~")
+								.newTag(f -> "**")
+								.build();
+				String aa = "This is a test senctence.";
+				String bb = "This is a test for diffutils.\nThis is the second line.\nAnd one more.";
+				List rows = generator.generateDiffRows(Arrays.asList(aa.split("\n")), Arrays.asList(bb.split("\n")));
+
+				assertEquals(
+								"[[CHANGE,This is a test ~senctence~.,This is a test **for diffutils**.], [INSERT,,**This is the second line.**], [INSERT,,**And one more.**]]",
+								rows.toString());
+		}
+
+		@Test
+		public void testGeneratorIssue41DefaultNormalizer() {
+				DiffRowGenerator generator = DiffRowGenerator.create().build();
+				List rows = generator.generateDiffRows(Arrays.asList("<"), Arrays.asList("<"));
+				assertEquals("[[EQUAL,<,<]]", rows.toString());
+		}
+
+		@Test
+		public void testGeneratorIssue41UserNormalizer() {
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.lineNormalizer(str -> str.replace("\t", "    "))
+								.build();
+				List rows = generator.generateDiffRows(Arrays.asList("<"), Arrays.asList("<"));
+				assertEquals("[[EQUAL,<,<]]", rows.toString());
+				rows = generator.generateDiffRows(Arrays.asList("\t<"), Arrays.asList("<"));
+				assertEquals("[[CHANGE,    <,<]]", rows.toString());
+		}
+
+		@Test
+		public void testGenerationIssue44reportLinesUnchangedProblem() {
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.reportLinesUnchanged(true)
+								.oldTag(f -> "~~")
+								.newTag(f -> "**")
+								.build();
+				List rows =
+								generator.generateDiffRows(Arrays.asList("
To do
"), Arrays.asList("
Done
"));
+				assertEquals("[[CHANGE,
~~T~~o~~ do~~
,
**D**o**ne**
]]", rows.toString());
+		}
+
+		@Test
+		public void testIgnoreWhitespaceIssue66() {
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.inlineDiffByWord(true)
+								.ignoreWhiteSpaces(true)
+								.mergeOriginalRevised(true)
+								.oldTag(f -> "~") // introduce markdown style for strikethrough
+								.newTag(f -> "**") // introduce markdown style for bold
+								.build();
+
+				// compute the differences for two test texts.
+				// CHECKSTYLE:OFF
+				List rows =
+								generator.generateDiffRows(Arrays.asList("This\tis\ta\ttest."), Arrays.asList("This is a test"));
+				// CHECKSTYLE:ON
+
+				assertEquals("This    is    a    test~.~", rows.get(0).getOldLine());
+		}
+
+		@Test
+		public void testIgnoreWhitespaceIssue66_2() {
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.inlineDiffByWord(true)
+								.ignoreWhiteSpaces(true)
+								.mergeOriginalRevised(true)
+								.oldTag(f -> "~") // introduce markdown style for strikethrough
+								.newTag(f -> "**") // introduce markdown style for bold
+								.build();
+
+				// compute the differences for two test texts.
+				List rows =
+								generator.generateDiffRows(Arrays.asList("This  is  a  test."), Arrays.asList("This is a test"));
+
+				assertEquals("This  is  a  test~.~", rows.get(0).getOldLine());
+		}
+
+		@Test
+		public void testIgnoreWhitespaceIssue64() {
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.inlineDiffByWord(true)
+								.ignoreWhiteSpaces(true)
+								.mergeOriginalRevised(true)
+								.oldTag(f -> "~") // introduce markdown style for strikethrough
+								.newTag(f -> "**") // introduce markdown style for bold
+								.build();
+
+				// compute the differences for two test texts.
+				List rows = generator.generateDiffRows(
+								Arrays.asList("test\n\ntestline".split("\n")),
+								Arrays.asList("A new text line\n\nanother one".split("\n")));
+
+				assertThat(rows)
+								.extracting(item -> item.getOldLine())
+								.containsExactly("~test~**A new text line**", "", "~testline~**another one**");
+		}
+
+		@Test
+		public void testReplaceDiffsIssue63() {
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.inlineDiffByWord(true)
+								.mergeOriginalRevised(true)
+								.oldTag(f -> "~") // introduce markdown style for strikethrough
+								.newTag(f -> "**") // introduce markdown style for bold
+								.processDiffs(str -> str.replace(" ", "/"))
+								.build();
+
+				// compute the differences for two test texts.
+				List rows =
+								generator.generateDiffRows(Arrays.asList("This  is  a  test."), Arrays.asList("This is a test"));
+
+				assertEquals("This~//~**/**is~//~**/**a~//~**/**test~.~", rows.get(0).getOldLine());
+		}
+
+		@Test
+		public void testProblemTooManyDiffRowsIssue65() {
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.reportLinesUnchanged(true)
+								.oldTag(f -> "~")
+								.newTag(f -> "**")
+								.mergeOriginalRevised(true)
+								.inlineDiffByWord(false)
+								.replaceOriginalLinefeedInChangesWithSpaces(true)
+								.build();
+
+				List diffRows = generator.generateDiffRows(
+								Arrays.asList("Ich möchte nicht mit einem Bot sprechen.", "Ich soll das schon wieder wiederholen?"),
+								Arrays.asList(
+												"Ich möchte nicht mehr mit dir sprechen. Leite mich weiter.",
+												"Kannst du mich zum Kundendienst weiterleiten?"));
+
+				print(diffRows);
+
+				assertThat(diffRows).hasSize(2);
+		}
+
+		@Test
+		public void testProblemTooManyDiffRowsIssue65_NoMerge() {
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.reportLinesUnchanged(true)
+								.oldTag(f -> "~")
+								.newTag(f -> "**")
+								.mergeOriginalRevised(false)
+								.inlineDiffByWord(false)
+								.build();
+
+				List diffRows = generator.generateDiffRows(
+								Arrays.asList("Ich möchte nicht mit einem Bot sprechen.", "Ich soll das schon wieder wiederholen?"),
+								Arrays.asList(
+												"Ich möchte nicht mehr mit dir sprechen. Leite mich weiter.",
+												"Kannst du mich zum Kundendienst weiterleiten?"));
+
+				System.out.println(diffRows);
+
+				assertThat(diffRows).hasSize(2);
+		}
+
+		@Test
+		public void testProblemTooManyDiffRowsIssue65_DiffByWord() {
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.reportLinesUnchanged(true)
+								.oldTag(f -> "~")
+								.newTag(f -> "**")
+								.mergeOriginalRevised(true)
+								.inlineDiffByWord(true)
+								.build();
+
+				List diffRows = generator.generateDiffRows(
+								Arrays.asList("Ich möchte nicht mit einem Bot sprechen.", "Ich soll das schon wieder wiederholen?"),
+								Arrays.asList(
+												"Ich möchte nicht mehr mit dir sprechen. Leite mich weiter.",
+												"Kannst du mich zum Kundendienst weiterleiten?"));
+
+				System.out.println(diffRows);
+
+				assertThat(diffRows).hasSize(2);
+		}
+
+		@Test
+		public void testProblemTooManyDiffRowsIssue65_NoInlineDiff() {
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(false)
+								.reportLinesUnchanged(true)
+								.oldTag(f -> "~")
+								.newTag(f -> "**")
+								.mergeOriginalRevised(true)
+								.inlineDiffByWord(false)
+								.build();
+
+				List diffRows = generator.generateDiffRows(
+								Arrays.asList("Ich möchte nicht mit einem Bot sprechen.", "Ich soll das schon wieder wiederholen?"),
+								Arrays.asList(
+												"Ich möchte nicht mehr mit dir sprechen. Leite mich weiter.",
+												"Kannst du mich zum Kundendienst weiterleiten?"));
+
+				System.out.println(diffRows);
+
+				assertThat(diffRows).hasSize(2);
+		}
+
+		@Test
+		public void testLinefeedInStandardTagsWithLineWidthIssue81() {
+				List original =
+								Arrays.asList(("American bobtail jaguar. American bobtail bombay but turkish angora and tomcat.\n"
+																+ "Russian blue leopard. Lion. Tabby scottish fold for russian blue, so savannah yet lynx. Tomcat singapura, cheetah.\n"
+																+ "Bengal tiger panther but singapura but bombay munchkin for cougar.")
+												.split("\n"));
+				List revised = Arrays.asList(("bobtail jaguar. American bobtail turkish angora and tomcat.\n"
+												+ "Russian blue leopard. Lion. Tabby scottish folded for russian blue, so savannah yettie? lynx. Tomcat singapura, cheetah.\n"
+												+ "Bengal tiger panther but singapura but bombay munchkin for cougar. And more.")
+								.split("\n"));
+
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.ignoreWhiteSpaces(true)
+								.columnWidth(100)
+								.build();
+				List deltas = generator.generateDiffRows(original, revised);
+
+				System.out.println(deltas);
+		}
+
+		@Test
+		public void testIssue86WrongInlineDiff() throws IOException {
+				String original = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue_86_original.txt"))
+								.collect(joining("\n"));
+				String revised = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue_86_revised.txt"))
+								.collect(joining("\n"));
+
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.mergeOriginalRevised(true)
+								.inlineDiffByWord(true)
+								.oldTag(f -> "~")
+								.newTag(f -> "**")
+								.build();
+				List rows =
+								generator.generateDiffRows(Arrays.asList(original.split("\n")), Arrays.asList(revised.split("\n")));
+
+				rows.stream().filter(item -> item.getTag() != DiffRow.Tag.EQUAL).forEach(System.out::println);
+		}
+
+		@Test
+		public void testCorrectChangeIssue114() throws IOException {
+				List original = Arrays.asList("A", "B", "C", "D", "E");
+				List revised = Arrays.asList("a", "C", "", "E");
+
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(false)
+								.inlineDiffByWord(true)
+								.oldTag(f -> "~")
+								.newTag(f -> "**")
+								.build();
+				List rows = generator.generateDiffRows(original, revised);
+
+				for (DiffRow diff : rows) {
+						System.out.println(diff);
+				}
+
+				assertThat(rows)
+								.extracting(item -> item.getTag().name())
+								.containsExactly("CHANGE", "DELETE", "EQUAL", "CHANGE", "EQUAL");
+		}
+
+		@Test
+		public void testCorrectChangeIssue114_2() throws IOException {
+				List original = Arrays.asList("A", "B", "C", "D", "E");
+				List revised = Arrays.asList("a", "C", "", "E");
+
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.inlineDiffByWord(true)
+								.oldTag(f -> "~")
+								.newTag(f -> "**")
+								.build();
+				List rows = generator.generateDiffRows(original, revised);
+
+				for (DiffRow diff : rows) {
+						System.out.println(diff);
+				}
+
+				assertThat(rows)
+								.extracting(item -> item.getTag().name())
+								.containsExactly("CHANGE", "DELETE", "EQUAL", "CHANGE", "EQUAL");
+				assertThat(rows.get(1).toString()).isEqualTo("[DELETE,~B~,]");
+		}
+
+		@Test
+		public void testIssue119WrongContextLength() throws IOException {
+				String original = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue_119_original.txt"))
+								.collect(joining("\n"));
+				String revised = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue_119_revised.txt"))
+								.collect(joining("\n"));
+
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.mergeOriginalRevised(true)
+								.inlineDiffByWord(true)
+								.oldTag(f -> "~")
+								.newTag(f -> "**")
+								.build();
+				List rows =
+								generator.generateDiffRows(Arrays.asList(original.split("\n")), Arrays.asList(revised.split("\n")));
+
+				rows.stream().filter(item -> item.getTag() != DiffRow.Tag.EQUAL).forEach(System.out::println);
+		}
+
+		@Test
+		public void testIssue129WithDeltaDecompression() {
+				List lines1 = Arrays.asList(
+								"apple1",
+								"apple2",
+								"apple3",
+								"A man named Frankenstein abc to Switzerland for cookies!",
+								"banana1",
+								"banana2",
+								"banana3");
+				List lines2 = Arrays.asList(
+								"apple1",
+								"apple2",
+								"apple3",
+								"A man named Frankenstein",
+								"xyz",
+								"to Switzerland for cookies!",
+								"banana1",
+								"banana2",
+								"banana3");
+				int[] entry = {1};
+				String txt = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.oldTag((tag, isOpening) -> isOpening ? "==old" + tag + "==>" : "<==old==")
+								.newTag((tag, isOpening) -> isOpening ? "==new" + tag + "==>" : "<==new==")
+								.build()
+								.generateDiffRows(lines1, lines2)
+								.stream()
+								.map(row -> row.getTag().toString())
+								.collect(joining(" "));
+				//                .forEachOrdered(row -> {
+				//                    System.out.printf("%4d %-8s %-80s %-80s\n", entry[0]++,
+				//                            row.getTag(), row.getOldLine(), row.getNewLine());
+				//                });
+
+				assertThat(txt).isEqualTo("EQUAL EQUAL EQUAL CHANGE INSERT INSERT EQUAL EQUAL EQUAL");
+		}
+
+		@Test
+		public void testIssue129SkipDeltaDecompression() {
+				List lines1 = Arrays.asList(
+								"apple1",
+								"apple2",
+								"apple3",
+								"A man named Frankenstein abc to Switzerland for cookies!",
+								"banana1",
+								"banana2",
+								"banana3");
+				List lines2 = Arrays.asList(
+								"apple1",
+								"apple2",
+								"apple3",
+								"A man named Frankenstein",
+								"xyz",
+								"to Switzerland for cookies!",
+								"banana1",
+								"banana2",
+								"banana3");
+				int[] entry = {1};
+				String txt = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.decompressDeltas(false)
+								.oldTag((tag, isOpening) -> isOpening ? "==old" + tag + "==>" : "<==old==")
+								.newTag((tag, isOpening) -> isOpening ? "==new" + tag + "==>" : "<==new==")
+								.build()
+								.generateDiffRows(lines1, lines2)
+								.stream()
+								.map(row -> row.getTag().toString())
+								.collect(joining(" "));
+				//                .forEachOrdered(row -> {
+				//                    System.out.printf("%4d %-8s %-80s %-80s\n", entry[0]++,
+				//                            row.getTag(), row.getOldLine(), row.getNewLine());
+				//                });
+
+				assertThat(txt).isEqualTo("EQUAL EQUAL EQUAL CHANGE CHANGE CHANGE EQUAL EQUAL EQUAL");
+		}
+
+		@Test
+		public void testIssue129SkipWhitespaceChanges() throws IOException {
+				String original = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue129_1.txt"))
+								.collect(joining("\n"));
+				String revised = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue129_2.txt"))
+								.collect(joining("\n"));
+
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.mergeOriginalRevised(true)
+								.inlineDiffByWord(true)
+								.ignoreWhiteSpaces(true)
+								.oldTag((tag, isOpening) -> isOpening ? "==old" + tag + "==>" : "<==old==")
+								.newTag((tag, isOpening) -> isOpening ? "==new" + tag + "==>" : "<==new==")
+								.build();
+				List rows =
+								generator.generateDiffRows(Arrays.asList(original.split("\n")), Arrays.asList(revised.split("\n")));
+
+				assertThat(rows).hasSize(13);
+
+				rows.stream().filter(item -> item.getTag() != DiffRow.Tag.EQUAL).forEach(System.out::println);
+		}
+
+		@Test
+		public void testGeneratorWithWhitespaceDeltaMerge() {
+				final DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.mergeOriginalRevised(true)
+								.inlineDiffByWord(true)
+								.oldTag(f -> "~")
+								.newTag(f -> "**") //
+								.lineNormalizer(StringUtils::htmlEntites) // do not replace tabs
+								.inlineDeltaMerger(DiffRowGenerator.WHITESPACE_EQUALITIES_MERGER)
+								.build();
+
+				assertInlineDiffResult(generator, "No diff", "No diff", "No diff");
+				assertInlineDiffResult(
+								generator,
+								" x whitespace before diff",
+								" y whitespace before diff",
+								" ~x~**y** whitespace before diff");
+				assertInlineDiffResult(
+								generator, "Whitespace after diff x ", "Whitespace after diff y ", "Whitespace after diff ~x~**y** ");
+				assertInlineDiffResult(generator, "Diff x x between", "Diff y y between", "Diff ~x x~**y y** between");
+				assertInlineDiffResult(generator, "Hello \t world", "Hi \t universe", "~Hello \t world~**Hi \t universe**");
+				assertInlineDiffResult(
+								generator,
+								"The quick brown fox jumps over the lazy dog",
+								"A lazy dog jumps over a fox",
+								"~The quick brown fox ~**A lazy dog **jumps over ~the lazy dog~**a fox**");
+		}
+
+		@Test
+		public void testGeneratorWithMergingDeltasForShortEqualities() {
+				final Function>> shortEqualitiesMerger =
+								deltaMergeInfo -> DeltaMergeUtils.mergeInlineDeltas(
+												deltaMergeInfo,
+												equalities ->
+																equalities.stream().mapToInt(String::length).sum() < 6);
+
+				final DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.mergeOriginalRevised(true)
+								.inlineDiffByWord(true)
+								.oldTag(f -> "~")
+								.newTag(f -> "**")
+								.inlineDeltaMerger(shortEqualitiesMerger)
+								.build();
+
+				assertInlineDiffResult(generator, "No diff", "No diff", "No diff");
+				assertInlineDiffResult(generator, "aaa bbb ccc", "xxx bbb zzz", "~aaa bbb ccc~**xxx bbb zzz**");
+				assertInlineDiffResult(generator, "aaa bbbb ccc", "xxx bbbb zzz", "~aaa~**xxx** bbbb ~ccc~**zzz**");
+		}
+
+		private void assertInlineDiffResult(DiffRowGenerator generator, String original, String revised, String expected) {
+				final List rows = generator.generateDiffRows(Arrays.asList(original), Arrays.asList(revised));
+				print(rows);
+
+				assertEquals(1, rows.size());
+				assertEquals(expected, rows.get(0).getOldLine().toString());
+		}
+
+		@Test
+		public void testIssue188HangOnExamples() throws IOException, URISyntaxException {
+				try (FileSystem zipFs = FileSystems.newFileSystem(
+								Paths.get("target/test-classes/com/github/difflib/text/test.zip"), (ClassLoader) null); ) {
+						List original = Files.readAllLines(zipFs.getPath("old.html"));
+						List revised = Files.readAllLines(zipFs.getPath("new.html"));
+
+						DiffRowGenerator generator = DiffRowGenerator.create()
+										.lineNormalizer(line -> line)
+										.showInlineDiffs(true)
+										.mergeOriginalRevised(true)
+										.inlineDiffByWord(true)
+										.decompressDeltas(true)
+										.oldTag(f -> f ? "" : "")
+										.newTag(f -> f ? "" : "")
+										.build();
+
+						// List rows = generator.generateDiffRows(original, revised);
+						List rows = generator.generateDiffRows(
+										original, DiffUtils.diff(original, revised, new MyersDiffWithLinearSpace<>()));
+
+						System.out.println(rows);
+				}
+		}
 }
-
diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/StringUtilsTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/StringUtilsTest.java
index 68670723..b2e06de0 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/text/StringUtilsTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/text/StringUtilsTest.java
@@ -15,8 +15,9 @@
  */
 package com.github.difflib.text;
 
-import org.junit.jupiter.api.Assertions;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -25,38 +26,36 @@
  */
 public class StringUtilsTest {
 
-    /**
-     * Test of htmlEntites method, of class StringUtils.
-     */
-    @Test
-    public void testHtmlEntites() {
-        assertEquals("<test>", StringUtils.htmlEntites(""));
-    }
-
-    /**
-     * Test of normalize method, of class StringUtils.
-     */
-    @Test
-    public void testNormalize_String() {
-        assertEquals("    test", StringUtils.normalize("\ttest"));
-    }
+		/**
+		 * Test of htmlEntites method, of class StringUtils.
+		 */
+		@Test
+		public void testHtmlEntites() {
+				assertEquals("<test>", StringUtils.htmlEntites(""));
+		}
 
-    /**
-     * Test of wrapText method, of class StringUtils.
-     */
-    @Test
-    public void testWrapText_String_int() {
-        assertEquals("te
st", StringUtils.wrapText("test", 2));
-        assertEquals("tes
t", StringUtils.wrapText("test", 3));
-        assertEquals("test", StringUtils.wrapText("test", 10));
-        assertEquals(".\uD800\uDC01
.", StringUtils.wrapText(".\uD800\uDC01.", 2));
-        assertEquals("..
\uD800\uDC01", StringUtils.wrapText("..\uD800\uDC01", 3));
-    }
+		/**
+		 * Test of normalize method, of class StringUtils.
+		 */
+		@Test
+		public void testNormalize_String() {
+				assertEquals("    test", StringUtils.normalize("\ttest"));
+		}
 
-    @Test
-    public void testWrapText_String_int_zero() {
-        Assertions.assertThrows(IllegalArgumentException.class, 
-                () -> StringUtils.wrapText("test", -1));
-    }
+		/**
+		 * Test of wrapText method, of class StringUtils.
+		 */
+		@Test
+		public void testWrapText_String_int() {
+				assertEquals("te
st", StringUtils.wrapText("test", 2));
+				assertEquals("tes
t", StringUtils.wrapText("test", 3));
+				assertEquals("test", StringUtils.wrapText("test", 10));
+				assertEquals(".\uD800\uDC01
.", StringUtils.wrapText(".\uD800\uDC01.", 2));
+				assertEquals("..
\uD800\uDC01", StringUtils.wrapText("..\uD800\uDC01", 3));
+		}
 
+		@Test
+		public void testWrapText_String_int_zero() {
+				Assertions.assertThrows(IllegalArgumentException.class, () -> StringUtils.wrapText("test", -1));
+		}
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
index 3d851561..fc272edb 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -15,14 +15,15 @@
  */
 package com.github.difflib.unifieddiff;
 
-import com.github.difflib.patch.AbstractDelta;
-import java.io.IOException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import com.github.difflib.patch.AbstractDelta;
+import java.io.IOException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -31,419 +32,475 @@
  */
 public class UnifiedDiffReaderTest {
 
-    @Test
-    public void testSimpleParse() throws IOException {
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(UnifiedDiffReaderTest.class.getResourceAsStream("jsqlparser_patch_1.diff"));
+		@Test
+		public void testSimpleParse() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+								UnifiedDiffReaderTest.class.getResourceAsStream("jsqlparser_patch_1.diff"));
+
+				assertThat(diff.getFiles().size()).isEqualTo(2);
+
+				UnifiedDiffFile file1 = diff.getFiles().get(0);
+				assertThat(file1.getFromFile()).isEqualTo("src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt");
+				assertThat(file1.getPatch().getDeltas().size()).isEqualTo(3);
+
+				assertThat(diff.getTail()).isEqualTo("2.17.1.windows.2\n");
+		}
+
+		@Test
+		public void testParseDiffBlock() {
+				String[] files = UnifiedDiffReader.parseFileNames(
+								"diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java");
+				assertThat(files)
+								.containsExactly(
+												"src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java",
+												"src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java");
+		}
+
+		@Test
+		public void testChunkHeaderParsing() {
+				Pattern pattern = UnifiedDiffReader.UNIFIED_DIFF_CHUNK_REGEXP;
+				Matcher matcher = pattern.matcher(
+								"@@ -189,6 +189,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */");
+
+				assertTrue(matcher.find());
+				assertEquals("189", matcher.group(1));
+				assertEquals("189", matcher.group(3));
+		}
 
-        System.out.println(diff);
+		@Test
+		public void testChunkHeaderParsing2() {
+				// "^@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@.*$"
+				Pattern pattern = UnifiedDiffReader.UNIFIED_DIFF_CHUNK_REGEXP;
+				Matcher matcher = pattern.matcher("@@ -189,6 +189,7 @@");
 
-        assertThat(diff.getFiles().size()).isEqualTo(2);
+				assertTrue(matcher.find());
+				assertEquals("189", matcher.group(1));
+				assertEquals("189", matcher.group(3));
+		}
 
-        UnifiedDiffFile file1 = diff.getFiles().get(0);
-        assertThat(file1.getFromFile()).isEqualTo("src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt");
-        assertThat(file1.getPatch().getDeltas().size()).isEqualTo(3);
+		@Test
+		public void testChunkHeaderParsing3() {
+				// "^@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@.*$"
+				Pattern pattern = UnifiedDiffReader.UNIFIED_DIFF_CHUNK_REGEXP;
+				Matcher matcher = pattern.matcher("@@ -1,27 +1,27 @@");
 
-        assertThat(diff.getTail()).isEqualTo("2.17.1.windows.2\n");
-    }
+				assertTrue(matcher.find());
+				assertEquals("1", matcher.group(1));
+				assertEquals("1", matcher.group(3));
+		}
 
-    @Test
-    public void testParseDiffBlock() {
-        String[] files = UnifiedDiffReader.parseFileNames("diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java");
-        assertThat(files).containsExactly("src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java", "src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java");
-    }
+		@Test
+		public void testSimpleParse2() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+								UnifiedDiffReaderTest.class.getResourceAsStream("jsqlparser_patch_1.diff"));
 
-    @Test
-    public void testChunkHeaderParsing() {
-        Pattern pattern = UnifiedDiffReader.UNIFIED_DIFF_CHUNK_REGEXP;
-        Matcher matcher = pattern.matcher("@@ -189,6 +189,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */");
+				System.out.println(diff);
 
-        assertTrue(matcher.find());
-        assertEquals("189", matcher.group(1));
-        assertEquals("189", matcher.group(3));
-    }
+				assertThat(diff.getFiles().size()).isEqualTo(2);
 
-    @Test
-    public void testChunkHeaderParsing2() {
-        //"^@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@.*$"
-        Pattern pattern = UnifiedDiffReader.UNIFIED_DIFF_CHUNK_REGEXP;
-        Matcher matcher = pattern.matcher("@@ -189,6 +189,7 @@");
+				UnifiedDiffFile file1 = diff.getFiles().get(0);
+				assertThat(file1.getFromFile()).isEqualTo("src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt");
+				assertThat(file1.getPatch().getDeltas().size()).isEqualTo(3);
 
-        assertTrue(matcher.find());
-        assertEquals("189", matcher.group(1));
-        assertEquals("189", matcher.group(3));
-    }
+				AbstractDelta first = file1.getPatch().getDeltas().get(0);
 
-    @Test
-    public void testChunkHeaderParsing3() {
-        //"^@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@.*$"
-        Pattern pattern = UnifiedDiffReader.UNIFIED_DIFF_CHUNK_REGEXP;
-        Matcher matcher = pattern.matcher("@@ -1,27 +1,27 @@");
+				assertThat(first.getSource().size()).isGreaterThan(0);
+				assertThat(first.getTarget().size()).isGreaterThan(0);
 
-        assertTrue(matcher.find());
-        assertEquals("1", matcher.group(1));
-        assertEquals("1", matcher.group(3));
-    }
+				assertThat(diff.getTail()).isEqualTo("2.17.1.windows.2\n");
+		}
 
-    @Test
-    public void testSimpleParse2() throws IOException {
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(UnifiedDiffReaderTest.class.getResourceAsStream("jsqlparser_patch_1.diff"));
+		@Test
+		public void testParseIssue201() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+								UnifiedDiffReaderTest.class.getResourceAsStream("jsqlparser_patch_1.diff"));
 
-        System.out.println(diff);
+				System.out.println(diff);
 
-        assertThat(diff.getFiles().size()).isEqualTo(2);
+				assertThat(diff.getFiles().size()).isEqualTo(2);
 
-        UnifiedDiffFile file1 = diff.getFiles().get(0);
-        assertThat(file1.getFromFile()).isEqualTo("src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt");
-        assertThat(file1.getPatch().getDeltas().size()).isEqualTo(3);
+				UnifiedDiffFile file1 = diff.getFiles().get(0);
+				assertThat(file1.getFromFile()).isEqualTo("src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt");
+				assertThat(file1.getPatch().getDeltas().size()).isEqualTo(3);
 
-        AbstractDelta first = file1.getPatch().getDeltas().get(0);
+				AbstractDelta first = file1.getPatch().getDeltas().get(0);
 
-        assertThat(first.getSource().size()).isGreaterThan(0);
-        assertThat(first.getTarget().size()).isGreaterThan(0);
+				assertThat(first.getSource().size()).isGreaterThan(0);
+				assertThat(first.getTarget().size()).isGreaterThan(0);
 
-        assertThat(diff.getTail()).isEqualTo("2.17.1.windows.2\n");
-    }
+				assertThat(diff.getTail()).isEqualTo("2.17.1.windows.2\n");
+		}
 
-    @Test
-    public void testSimplePattern() {
-        Pattern pattern = Pattern.compile("^\\+\\+\\+\\s");
+		@Test
+		public void testSimplePattern() {
+				Pattern pattern = Pattern.compile("^\\+\\+\\+\\s");
 
-        Matcher m = pattern.matcher("+++ revised.txt");
-        assertTrue(m.find());
-    }
+				Matcher m = pattern.matcher("+++ revised.txt");
+				assertTrue(m.find());
+		}
 
-    @Test
-    public void testParseIssue46() throws IOException {
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
-                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue46.diff"));
+		@Test
+		public void testParseIssue46() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+								UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue46.diff"));
 
-        System.out.println(diff);
+				System.out.println(diff);
 
-        assertThat(diff.getFiles().size()).isEqualTo(1);
+				assertThat(diff.getFiles().size()).isEqualTo(1);
 
-        UnifiedDiffFile file1 = diff.getFiles().get(0);
-        assertThat(file1.getFromFile()).isEqualTo("a.vhd");
-        assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
+				UnifiedDiffFile file1 = diff.getFiles().get(0);
+				assertThat(file1.getFromFile()).isEqualTo("a.vhd");
+				assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
 
-        assertThat(diff.getTail()).isNull();
-    }
+				assertThat(diff.getTail()).isNull();
+		}
 
-    @Test
-    public void testParseIssue33() throws IOException {
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
-                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue33.diff"));
+		@Test
+		public void testParseIssue33() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+								UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue33.diff"));
 
-        assertThat(diff.getFiles().size()).isEqualTo(1);
+				assertThat(diff.getFiles().size()).isEqualTo(1);
 
-        UnifiedDiffFile file1 = diff.getFiles().get(0);
-        assertThat(file1.getFromFile()).isEqualTo("Main.java");
-        assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
+				UnifiedDiffFile file1 = diff.getFiles().get(0);
+				assertThat(file1.getFromFile()).isEqualTo("Main.java");
+				assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
 
-        assertThat(diff.getTail()).isNull();
-        assertThat(diff.getHeader()).isNull();
-    }
+				assertThat(diff.getTail()).isNull();
+				assertThat(diff.getHeader()).isNull();
+		}
 
-    @Test
-    public void testParseIssue51() throws IOException {
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
-                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue51.diff"));
+		@Test
+		public void testParseIssue51() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+								UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue51.diff"));
 
-        System.out.println(diff);
+				System.out.println(diff);
 
-        assertThat(diff.getFiles().size()).isEqualTo(2);
+				assertThat(diff.getFiles().size()).isEqualTo(2);
 
-        UnifiedDiffFile file1 = diff.getFiles().get(0);
-        assertThat(file1.getFromFile()).isEqualTo("f1");
-        assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
+				UnifiedDiffFile file1 = diff.getFiles().get(0);
+				assertThat(file1.getFromFile()).isEqualTo("f1");
+				assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
 
-        UnifiedDiffFile file2 = diff.getFiles().get(1);
-        assertThat(file2.getFromFile()).isEqualTo("f2");
-        assertThat(file2.getPatch().getDeltas().size()).isEqualTo(1);
+				UnifiedDiffFile file2 = diff.getFiles().get(1);
+				assertThat(file2.getFromFile()).isEqualTo("f2");
+				assertThat(file2.getPatch().getDeltas().size()).isEqualTo(1);
 
-        assertThat(diff.getTail()).isNull();
-    }
+				assertThat(diff.getTail()).isNull();
+		}
 
-    @Test
-    public void testParseIssue79() throws IOException {
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
-                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue79.diff"));
+		@Test
+		public void testParseIssue79() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+								UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue79.diff"));
 
-        assertThat(diff.getFiles().size()).isEqualTo(1);
+				assertThat(diff.getFiles().size()).isEqualTo(1);
 
-        UnifiedDiffFile file1 = diff.getFiles().get(0);
-        assertThat(file1.getFromFile()).isEqualTo("test/Issue.java");
-        assertThat(file1.getPatch().getDeltas().size()).isEqualTo(0);
+				UnifiedDiffFile file1 = diff.getFiles().get(0);
+				assertThat(file1.getFromFile()).isEqualTo("test/Issue.java");
+				assertThat(file1.getPatch().getDeltas().size()).isEqualTo(0);
 
-        assertThat(diff.getTail()).isNull();
-        assertThat(diff.getHeader()).isNull();
-    }
+				assertThat(diff.getTail()).isNull();
+				assertThat(diff.getHeader()).isNull();
+		}
 
-    @Test
-    public void testParseIssue84() throws IOException {
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
-                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue84.diff"));
+		@Test
+		public void testParseIssue84() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+								UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue84.diff"));
 
-        assertThat(diff.getFiles().size()).isEqualTo(2);
+				assertThat(diff.getFiles().size()).isEqualTo(2);
 
-        UnifiedDiffFile file1 = diff.getFiles().get(0);
-        assertThat(file1.getFromFile()).isEqualTo("config/ant-phase-verify.xml");
-        assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
+				UnifiedDiffFile file1 = diff.getFiles().get(0);
+				assertThat(file1.getFromFile()).isEqualTo("config/ant-phase-verify.xml");
+				assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
 
-        UnifiedDiffFile file2 = diff.getFiles().get(1);
-        assertThat(file2.getFromFile()).isEqualTo("/dev/null");
-        assertThat(file2.getPatch().getDeltas().size()).isEqualTo(1);
+				UnifiedDiffFile file2 = diff.getFiles().get(1);
+				assertThat(file2.getFromFile()).isEqualTo("/dev/null");
+				assertThat(file2.getPatch().getDeltas().size()).isEqualTo(1);
 
-        assertThat(diff.getTail()).isEqualTo("2.7.4");
-        assertThat(diff.getHeader()).startsWith("From b53e612a2ab5ff15d14860e252f84c0f343fe93a Mon Sep 17 00:00:00 2001");
-    }
+				assertThat(diff.getTail()).isEqualTo("2.7.4");
+				assertThat(diff.getHeader())
+								.startsWith("From b53e612a2ab5ff15d14860e252f84c0f343fe93a Mon Sep 17 00:00:00 2001");
+		}
 
-    @Test
-    public void testParseIssue85() throws IOException {
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
-                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue85.diff"));
+		@Test
+		public void testParseIssue85() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+								UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue85.diff"));
 
-        assertThat(diff.getFiles().size()).isEqualTo(1);
+				assertThat(diff.getFiles().size()).isEqualTo(1);
 
-        assertEquals(1, diff.getFiles().size());
+				assertEquals(1, diff.getFiles().size());
 
-        final UnifiedDiffFile file1 = diff.getFiles().get(0);
-        assertEquals("diff -r 83e41b73d115 -r a4438263b228 tests/test-check-pyflakes.t",
-                file1.getDiffCommand());
-        assertEquals("tests/test-check-pyflakes.t", file1.getFromFile());
-        assertEquals("tests/test-check-pyflakes.t", file1.getToFile());
-        assertEquals(1, file1.getPatch().getDeltas().size());
+				final UnifiedDiffFile file1 = diff.getFiles().get(0);
+				assertEquals("diff -r 83e41b73d115 -r a4438263b228 tests/test-check-pyflakes.t", file1.getDiffCommand());
+				assertEquals("tests/test-check-pyflakes.t", file1.getFromFile());
+				assertEquals("tests/test-check-pyflakes.t", file1.getToFile());
+				assertEquals(1, file1.getPatch().getDeltas().size());
 
-        assertNull(diff.getTail());
-    }
+				assertNull(diff.getTail());
+		}
 
-    @Test
-    public void testTimeStampRegexp() {
-        assertThat("2019-04-18 13:49:39.516149751 +0200").matches(UnifiedDiffReader.TIMESTAMP_REGEXP);
-    }
+		@Test
+		public void testTimeStampRegexp() {
+				assertThat("2019-04-18 13:49:39.516149751 +0200").matches(UnifiedDiffReader.TIMESTAMP_REGEXP);
+		}
 
-    @Test
-    public void testParseIssue98() throws IOException {
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
-                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue98.diff"));
+		@Test
+		public void testParseIssue98() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+								UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue98.diff"));
 
-        assertThat(diff.getFiles().size()).isEqualTo(1);
+				assertThat(diff.getFiles().size()).isEqualTo(1);
 
-        assertEquals(1, diff.getFiles().size());
+				assertEquals(1, diff.getFiles().size());
 
-        final UnifiedDiffFile file1 = diff.getFiles().get(0);
-        assertEquals("100644",
-                file1.getDeletedFileMode());
-        assertEquals("src/test/java/se/bjurr/violations/lib/model/ViolationTest.java", file1.getFromFile());
-        assertThat(diff.getTail()).isEqualTo("2.25.1");
-    }
+				final UnifiedDiffFile file1 = diff.getFiles().get(0);
+				assertEquals("100644", file1.getDeletedFileMode());
+				assertEquals("src/test/java/se/bjurr/violations/lib/model/ViolationTest.java", file1.getFromFile());
+				assertThat(diff.getTail()).isEqualTo("2.25.1");
+		}
 
-    @Test
-    public void testParseIssue104() throws IOException {
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
-                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_parsing_issue104.diff"));
+		@Test
+		public void testParseIssue104() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+								UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_parsing_issue104.diff"));
 
-        assertThat(diff.getFiles().size()).isEqualTo(6);
+				assertThat(diff.getFiles().size()).isEqualTo(6);
 
-        final UnifiedDiffFile file = diff.getFiles().get(2);
-        assertThat(file.getFromFile()).isEqualTo("/dev/null");
-        assertThat(file.getToFile()).isEqualTo("doc/samba_data_tool_path.xml.in");
+				final UnifiedDiffFile file = diff.getFiles().get(2);
+				assertThat(file.getFromFile()).isEqualTo("/dev/null");
+				assertThat(file.getToFile()).isEqualTo("doc/samba_data_tool_path.xml.in");
 
-        assertThat(file.getPatch().toString()).isEqualTo("Patch{deltas=[[ChangeDelta, position: 0, lines: [] to [@SAMBA_DATA_TOOL@]]]}");
+				assertThat(file.getPatch().toString())
+								.isEqualTo("Patch{deltas=[[ChangeDelta, position: 0, lines: [] to [@SAMBA_DATA_TOOL@]]]}");
 
-        assertThat(diff.getTail()).isEqualTo("2.14.4");
-    }
-
-    @Test
-    public void testParseIssue107BazelDiff() throws IOException {
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
-                UnifiedDiffReaderTest.class.getResourceAsStream("01-bazel-strip-unused.patch_issue107.diff"));
-
-        assertThat(diff.getFiles().size()).isEqualTo(450);
-
-        final UnifiedDiffFile file = diff.getFiles().get(0);
-        assertThat(file.getFromFile()).isEqualTo("./src/main/java/com/amazonaws/AbortedException.java");
-        assertThat(file.getToFile()).isEqualTo("/home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/AbortedException.java");
-
-        assertThat(diff.getFiles().stream()
-                .filter(f -> f.isNoNewLineAtTheEndOfTheFile())
-                .count())
-                .isEqualTo(48);
-    }
-
-    @Test
-    public void testParseIssue107_2() throws IOException {
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
-                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue107.diff"));
-
-        assertThat(diff.getFiles().size()).isEqualTo(2);
-
-        UnifiedDiffFile file1 = diff.getFiles().get(0);
-        assertThat(file1.getFromFile()).isEqualTo("Main.java");
-        assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
-
-    }
-    
-    @Test
-    public void testParseIssue107_3() throws IOException {
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
-                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue107_3.diff"));
-
-        assertThat(diff.getFiles().size()).isEqualTo(1);
-
-        UnifiedDiffFile file1 = diff.getFiles().get(0);
-        assertThat(file1.getFromFile()).isEqualTo("Billion laughs attack.md");
-        assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
-
-    }
-    
-    @Test
-    public void testParseIssue107_4() throws IOException {
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
-                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue107_4.diff"));
-
-        assertThat(diff.getFiles().size()).isEqualTo(27);
-
-        assertThat(diff.getFiles()).extracting(f -> f.getFromFile()).contains("README.md");
-    }
-    
-    @Test
-    public void testParseIssue107_5() throws IOException {
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
-                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue107_5.diff"));
-
-        assertThat(diff.getFiles().size()).isEqualTo(22);
-
-        assertThat(diff.getFiles()).extracting(f -> f.getFromFile()).contains("rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorFactoryTest.java");
-    }
-
-    @Test
-    public void testParseIssue110() throws IOException {
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
-                UnifiedDiffReaderTest.class.getResourceAsStream("0001-avahi-python-Use-the-agnostic-DBM-interface.patch"));
-
-        assertThat(diff.getFiles().size()).isEqualTo(5);
-
-        final UnifiedDiffFile file = diff.getFiles().get(4);
-        assertThat(file.getSimilarityIndex()).isEqualTo(87);
-        assertThat(file.getRenameFrom()).isEqualTo("service-type-database/build-db.in");
-        assertThat(file.getRenameTo()).isEqualTo("service-type-database/build-db");
-
-        assertThat(file.getFromFile()).isEqualTo("service-type-database/build-db.in");
-        assertThat(file.getToFile()).isEqualTo("service-type-database/build-db");
-    }
-
-    @Test
-    public void testParseIssue117() throws IOException {
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
-                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue117.diff"));
-
-        assertThat(diff.getFiles().size()).isEqualTo(2);
-        
-        assertThat(diff.getFiles().get(0).getPatch().getDeltas().get(0).getSource().getChangePosition())
-                .containsExactly(24, 27);
-        assertThat(diff.getFiles().get(0).getPatch().getDeltas().get(0).getTarget().getChangePosition())
-                .containsExactly(24, 27);
-        
-        assertThat(diff.getFiles().get(0).getPatch().getDeltas().get(1).getSource().getChangePosition())
-                .containsExactly(64);
-        assertThat(diff.getFiles().get(0).getPatch().getDeltas().get(1).getTarget().getChangePosition())
-                .containsExactly(64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74);
-
-//        diff.getFiles().forEach(f -> {
-//            System.out.println("File: " + f.getFromFile());
-//            f.getPatch().getDeltas().forEach(delta -> {
-//
-//                System.out.println(delta);
-//                System.out.println("Source: ");
-//                System.out.println(delta.getSource().getPosition());
-//                System.out.println(delta.getSource().getChangePosition());
-//
-//                System.out.println("Target: ");
-//                System.out.println(delta.getTarget().getPosition());
-//                System.out.println(delta.getTarget().getChangePosition());
-//            });
-//        });
-    }
-    
-    @Test
-    public void testParseIssue122() throws IOException {
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
-                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue122.diff"));
-
-        assertThat(diff.getFiles().size()).isEqualTo(1);
-
-        assertThat(diff.getFiles()).extracting(f -> f.getFromFile()).contains("coders/wpg.c");
-    }
-    
-    @Test
-    public void testParseIssue123() throws IOException {
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
-                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue123.diff"));
-
-        assertThat(diff.getFiles().size()).isEqualTo(2);
-
-        assertThat(diff.getFiles()).extracting(f -> f.getFromFile()).contains("src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java");
-    }
-
-    @Test
-    public void testParseIssue141() throws IOException {
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
-                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue141.diff"));
-        UnifiedDiffFile file1 = diff.getFiles().get(0);
-
-        assertThat(file1.getFromFile()).isEqualTo("a.txt");
-        assertThat(file1.getToFile()).isEqualTo("a1.txt");
-    }
-
-    @Test
-    public void testParseIssue182add() throws IOException {
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
-                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue182_add.diff"));
-
-        UnifiedDiffFile file1 = diff.getFiles().get(0);
-
-        assertThat(file1.getBinaryAdded()).isEqualTo("some-image.png");
-    }
-
-    @Test
-    public void testParseIssue182delete() throws IOException {
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
-                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue182_delete.diff"));
-
-        UnifiedDiffFile file1 = diff.getFiles().get(0);
-
-        assertThat(file1.getBinaryDeleted()).isEqualTo("some-image.png");
-    }
-
-    @Test
-    public void testParseIssue182edit() throws IOException {
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
-                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue182_edit.diff"));
-
-        UnifiedDiffFile file1 = diff.getFiles().get(0);
-
-        assertThat(file1.getBinaryEdited()).isEqualTo("some-image.png");
-    }
-
-    @Test
-    public void testParseIssue182mode() throws IOException {
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
-                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue182_mode.diff"));
-
-        UnifiedDiffFile file1 = diff.getFiles().get(0);
-
-        assertThat(file1.getOldMode()).isEqualTo("100644");
-        assertThat(file1.getNewMode()).isEqualTo("100755");
-    }
-    
-    @Test
-    public void testParseIssue193Copy() throws IOException {
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
-                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_parsing_issue193.diff"));
-
-        UnifiedDiffFile file1 = diff.getFiles().get(0);
-
-        assertThat(file1.getCopyFrom()).isEqualTo("modules/configuration/config/web/pcf/account/AccountContactCV.pcf");
-        assertThat(file1.getCopyTo()).isEqualTo("modules/configuration/config/web/pcf/account/AccountContactCV.default.pcf");
-    }
+				assertThat(diff.getTail()).isEqualTo("2.14.4");
+		}
+
+		@Test
+		public void testParseIssue107BazelDiff() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+								UnifiedDiffReaderTest.class.getResourceAsStream("01-bazel-strip-unused.patch_issue107.diff"));
+
+				assertThat(diff.getFiles().size()).isEqualTo(450);
+
+				final UnifiedDiffFile file = diff.getFiles().get(0);
+				assertThat(file.getFromFile()).isEqualTo("./src/main/java/com/amazonaws/AbortedException.java");
+				assertThat(file.getToFile())
+								.isEqualTo(
+												"/home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/AbortedException.java");
+
+				assertThat(diff.getFiles().stream()
+												.filter(f -> f.isNoNewLineAtTheEndOfTheFile())
+												.count())
+								.isEqualTo(48);
+		}
+
+		@Test
+		public void testParseIssue107_2() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+								UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue107.diff"));
+
+				assertThat(diff.getFiles().size()).isEqualTo(2);
+
+				UnifiedDiffFile file1 = diff.getFiles().get(0);
+				assertThat(file1.getFromFile()).isEqualTo("Main.java");
+				assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
+		}
+
+		@Test
+		public void testParseIssue107_3() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+								UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue107_3.diff"));
+
+				assertThat(diff.getFiles().size()).isEqualTo(1);
+
+				UnifiedDiffFile file1 = diff.getFiles().get(0);
+				assertThat(file1.getFromFile()).isEqualTo("Billion laughs attack.md");
+				assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
+		}
+
+		@Test
+		public void testParseIssue107_4() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+								UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue107_4.diff"));
+
+				assertThat(diff.getFiles().size()).isEqualTo(27);
+
+				assertThat(diff.getFiles()).extracting(f -> f.getFromFile()).contains("README.md");
+		}
+
+		@Test
+		public void testParseIssue107_5() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+								UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue107_5.diff"));
+
+				assertThat(diff.getFiles().size()).isEqualTo(22);
+
+				assertThat(diff.getFiles())
+								.extracting(f -> f.getFromFile())
+								.contains(
+												"rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorFactoryTest.java");
+		}
+
+		@Test
+		public void testParseIssue110() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(UnifiedDiffReaderTest.class.getResourceAsStream(
+								"0001-avahi-python-Use-the-agnostic-DBM-interface.patch"));
+
+				assertThat(diff.getFiles().size()).isEqualTo(5);
+
+				final UnifiedDiffFile file = diff.getFiles().get(4);
+				assertThat(file.getSimilarityIndex()).isEqualTo(87);
+				assertThat(file.getRenameFrom()).isEqualTo("service-type-database/build-db.in");
+				assertThat(file.getRenameTo()).isEqualTo("service-type-database/build-db");
+
+				assertThat(file.getFromFile()).isEqualTo("service-type-database/build-db.in");
+				assertThat(file.getToFile()).isEqualTo("service-type-database/build-db");
+		}
+
+		@Test
+		public void testParseIssue117() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+								UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue117.diff"));
+
+				assertThat(diff.getFiles().size()).isEqualTo(2);
+
+				assertThat(diff.getFiles()
+												.get(0)
+												.getPatch()
+												.getDeltas()
+												.get(0)
+												.getSource()
+												.getChangePosition())
+								.containsExactly(24, 27);
+				assertThat(diff.getFiles()
+												.get(0)
+												.getPatch()
+												.getDeltas()
+												.get(0)
+												.getTarget()
+												.getChangePosition())
+								.containsExactly(24, 27);
+
+				assertThat(diff.getFiles()
+												.get(0)
+												.getPatch()
+												.getDeltas()
+												.get(1)
+												.getSource()
+												.getChangePosition())
+								.containsExactly(64);
+				assertThat(diff.getFiles()
+												.get(0)
+												.getPatch()
+												.getDeltas()
+												.get(1)
+												.getTarget()
+												.getChangePosition())
+								.containsExactly(64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74);
+
+				//        diff.getFiles().forEach(f -> {
+				//            System.out.println("File: " + f.getFromFile());
+				//            f.getPatch().getDeltas().forEach(delta -> {
+				//
+				//                System.out.println(delta);
+				//                System.out.println("Source: ");
+				//                System.out.println(delta.getSource().getPosition());
+				//                System.out.println(delta.getSource().getChangePosition());
+				//
+				//                System.out.println("Target: ");
+				//                System.out.println(delta.getTarget().getPosition());
+				//                System.out.println(delta.getTarget().getChangePosition());
+				//            });
+				//        });
+		}
+
+		@Test
+		public void testParseIssue122() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+								UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue122.diff"));
+
+				assertThat(diff.getFiles().size()).isEqualTo(1);
+
+				assertThat(diff.getFiles()).extracting(f -> f.getFromFile()).contains("coders/wpg.c");
+		}
+
+		@Test
+		public void testParseIssue123() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+								UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue123.diff"));
+
+				assertThat(diff.getFiles().size()).isEqualTo(2);
+
+				assertThat(diff.getFiles())
+								.extracting(f -> f.getFromFile())
+								.contains("src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java");
+		}
+
+		@Test
+		public void testParseIssue141() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+								UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue141.diff"));
+				UnifiedDiffFile file1 = diff.getFiles().get(0);
+
+				assertThat(file1.getFromFile()).isEqualTo("a.txt");
+				assertThat(file1.getToFile()).isEqualTo("a1.txt");
+		}
+
+		@Test
+		public void testParseIssue182add() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+								UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue182_add.diff"));
+
+				UnifiedDiffFile file1 = diff.getFiles().get(0);
+
+				assertThat(file1.getBinaryAdded()).isEqualTo("some-image.png");
+		}
+
+		@Test
+		public void testParseIssue182delete() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+								UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue182_delete.diff"));
+
+				UnifiedDiffFile file1 = diff.getFiles().get(0);
+
+				assertThat(file1.getBinaryDeleted()).isEqualTo("some-image.png");
+		}
+
+		@Test
+		public void testParseIssue182edit() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+								UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue182_edit.diff"));
+
+				UnifiedDiffFile file1 = diff.getFiles().get(0);
+
+				assertThat(file1.getBinaryEdited()).isEqualTo("some-image.png");
+		}
+
+		@Test
+		public void testParseIssue182mode() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+								UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue182_mode.diff"));
+
+				UnifiedDiffFile file1 = diff.getFiles().get(0);
+
+				assertThat(file1.getOldMode()).isEqualTo("100644");
+				assertThat(file1.getNewMode()).isEqualTo("100755");
+		}
+
+		@Test
+		public void testParseIssue193Copy() throws IOException {
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+								UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_parsing_issue193.diff"));
+
+				UnifiedDiffFile file1 = diff.getFiles().get(0);
+
+				assertThat(file1.getCopyFrom()).isEqualTo("modules/configuration/config/web/pcf/account/AccountContactCV.pcf");
+				assertThat(file1.getCopyTo())
+								.isEqualTo("modules/configuration/config/web/pcf/account/AccountContactCV.default.pcf");
+		}
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripNewLineTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripNewLineTest.java
index 725e0e2a..22d192d8 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripNewLineTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripNewLineTest.java
@@ -15,32 +15,33 @@
  */
 package com.github.difflib.unifieddiff;
 
+import static java.util.stream.Collectors.joining;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import com.github.difflib.patch.PatchFailedException;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.Arrays;
-import static java.util.stream.Collectors.joining;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 @Disabled("for next release")
 public class UnifiedDiffRoundTripNewLineTest {
-    @Test
-    public void testIssue135MissingNoNewLineInPatched() throws IOException, PatchFailedException {
-        String beforeContent = "rootProject.name = \"sample-repo\"";
-        String afterContent = "rootProject.name = \"sample-repo\"\n";
-        String patch = "diff --git a/settings.gradle b/settings.gradle\n" +
-        "index ef3b8e2..ab30124 100644\n" +
-        "--- a/settings.gradle\n" +
-        "+++ b/settings.gradle\n" +
-        "@@ -1 +1 @@\n" +
-        "-rootProject.name = \"sample-repo\"\n" +
-        "\\ No newline at end of file\n" +
-        "+rootProject.name = \"sample-repo\"\n";
-        UnifiedDiff unifiedDiff = UnifiedDiffReader.parseUnifiedDiff(new ByteArrayInputStream(patch.getBytes()));
-        String unifiedAfterContent = unifiedDiff.getFiles().get(0).getPatch()
-                .applyTo(Arrays.asList(beforeContent.split("\n"))).stream().collect(joining("\n"));
-        assertEquals(afterContent, unifiedAfterContent);
-    }
+		@Test
+		public void testIssue135MissingNoNewLineInPatched() throws IOException, PatchFailedException {
+				String beforeContent = "rootProject.name = \"sample-repo\"";
+				String afterContent = "rootProject.name = \"sample-repo\"\n";
+				String patch = "diff --git a/settings.gradle b/settings.gradle\n" + "index ef3b8e2..ab30124 100644\n"
+								+ "--- a/settings.gradle\n"
+								+ "+++ b/settings.gradle\n"
+								+ "@@ -1 +1 @@\n"
+								+ "-rootProject.name = \"sample-repo\"\n"
+								+ "\\ No newline at end of file\n"
+								+ "+rootProject.name = \"sample-repo\"\n";
+				UnifiedDiff unifiedDiff = UnifiedDiffReader.parseUnifiedDiff(new ByteArrayInputStream(patch.getBytes()));
+				String unifiedAfterContent =
+								unifiedDiff.getFiles().get(0).getPatch().applyTo(Arrays.asList(beforeContent.split("\n"))).stream()
+												.collect(joining("\n"));
+				assertEquals(afterContent, unifiedAfterContent);
+		}
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java
index d1892771..bb8bdcb5 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java
@@ -1,5 +1,9 @@
 package com.github.difflib.unifieddiff;
 
+import static java.util.stream.Collectors.joining;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
 import com.github.difflib.DiffUtils;
 import com.github.difflib.TestConstants;
 import com.github.difflib.patch.Patch;
@@ -13,154 +17,152 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import static java.util.stream.Collectors.joining;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 public class UnifiedDiffRoundTripTest {
 
-    public static List fileToLines(String filename) throws FileNotFoundException, IOException {
-        List lines = new ArrayList<>();
-        String line = "";
-        try (BufferedReader in = new BufferedReader(new FileReader(filename))) {
-            while ((line = in.readLine()) != null) {
-                lines.add(line);
-            }
-        }
-        return lines;
-    }
-
-    @Test
-    public void testGenerateUnified() throws IOException {
-        List origLines = fileToLines(TestConstants.MOCK_FOLDER + "original.txt");
-        List revLines = fileToLines(TestConstants.MOCK_FOLDER + "revised.txt");
-
-        verify(origLines, revLines, "original.txt", "revised.txt");
-    }
-
-    @Test
-    public void testGenerateUnifiedWithOneDelta() throws IOException {
-        List origLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_original.txt");
-        List revLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_revised.txt");
-
-        verify(origLines, revLines, "one_delta_test_original.txt", "one_delta_test_revised.txt");
-    }
-
-    @Test
-    public void testGenerateUnifiedDiffWithoutAnyDeltas() throws IOException {
-        List test = Arrays.asList("abc");
-        Patch patch = DiffUtils.diff(test, test);
-        StringWriter writer = new StringWriter();
-
-        UnifiedDiffWriter.write(
-                UnifiedDiff.from("header", "tail", UnifiedDiffFile.from("abc", "abc", patch)),
-                name -> test,
-                writer, 0);
-
-        System.out.println(writer);
-    }
-
-    @Test
-    public void testDiff_Issue10() throws IOException {
-        final List baseLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_base.txt");
-        final List patchLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_patch.txt");
-
-        UnifiedDiff unifiedDiff = UnifiedDiffReader.parseUnifiedDiff(
-                new ByteArrayInputStream(patchLines.stream().collect(joining("\n")).getBytes())
-        );
-
-        final Patch p = unifiedDiff.getFiles().get(0).getPatch();
-        try {
-            DiffUtils.patch(baseLines, p);
-        } catch (PatchFailedException e) {
-            fail(e.getMessage());
-        }
-    }
-
-    /**
-     * Issue 12
-     */
-    @Test
-    @Disabled
-    public void testPatchWithNoDeltas() throws IOException {
-        final List lines1 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_1.txt");
-        final List lines2 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_2.txt");
-        verify(lines1, lines2, "issue11_1.txt", "issue11_2.txt");
-    }
-
-    @Test
-    public void testDiff5() throws IOException {
-        final List lines1 = fileToLines(TestConstants.MOCK_FOLDER + "5A.txt");
-        final List lines2 = fileToLines(TestConstants.MOCK_FOLDER + "5B.txt");
-        verify(lines1, lines2, "5A.txt", "5B.txt");
-    }
-
-    /**
-     * Issue 19
-     */
-    @Test
-    public void testDiffWithHeaderLineInText() throws IOException {
-        List original = new ArrayList<>();
-        List revised = new ArrayList<>();
-
-        original.add("test line1");
-        original.add("test line2");
-        original.add("test line 4");
-        original.add("test line 5");
-
-        revised.add("test line1");
-        revised.add("test line2");
-        revised.add("@@ -2,6 +2,7 @@");
-        revised.add("test line 4");
-        revised.add("test line 5");
-
-        Patch patch = DiffUtils.diff(original, revised);
-        StringWriter writer = new StringWriter();
-        UnifiedDiffWriter.write(
-                UnifiedDiff.from("header", "tail", UnifiedDiffFile.from("original", "revised", patch)),
-                name -> original,
-                writer, 10);
-
-        System.out.println(writer.toString());
-
-        UnifiedDiff unifiedDiff = UnifiedDiffReader.parseUnifiedDiff(new ByteArrayInputStream(writer.toString().getBytes()));
-    }
-
-    private void verify(List origLines, List revLines,
-            String originalFile, String revisedFile) throws IOException {
-        Patch patch = DiffUtils.diff(origLines, revLines);
-
-        StringWriter writer = new StringWriter();
-        UnifiedDiffWriter.write(
-                UnifiedDiff.from("header", "tail", UnifiedDiffFile.from(originalFile, revisedFile, patch)),
-                name -> origLines,
-                writer, 10);
-
-        System.out.println(writer.toString());
-
-        UnifiedDiff unifiedDiff = UnifiedDiffReader.parseUnifiedDiff(new ByteArrayInputStream(writer.toString().getBytes()));
-
-        List patchedLines;
-        try {
-//            if (unifiedDiff.getFiles().isEmpty()) {
-//                patchedLines = new ArrayList<>(origLines);
-//            } else {
-//                Patch fromUnifiedPatch = unifiedDiff.getFiles().get(0).getPatch();
-//                patchedLines = fromUnifiedPatch.applyTo(origLines);
-//            }
-            patchedLines = unifiedDiff.applyPatchTo(file -> originalFile.equals(file), origLines);
-            assertEquals(revLines.size(), patchedLines.size());
-            for (int i = 0; i < revLines.size(); i++) {
-                String l1 = revLines.get(i);
-                String l2 = patchedLines.get(i);
-                if (!l1.equals(l2)) {
-                    fail("Line " + (i + 1) + " of the patched file did not match the revised original");
-                }
-            }
-        } catch (PatchFailedException e) {
-            fail(e.getMessage());
-        }
-    }
+		public static List fileToLines(String filename) throws FileNotFoundException, IOException {
+				List lines = new ArrayList<>();
+				String line = "";
+				try (BufferedReader in = new BufferedReader(new FileReader(filename))) {
+						while ((line = in.readLine()) != null) {
+								lines.add(line);
+						}
+				}
+				return lines;
+		}
+
+		@Test
+		public void testGenerateUnified() throws IOException {
+				List origLines = fileToLines(TestConstants.MOCK_FOLDER + "original.txt");
+				List revLines = fileToLines(TestConstants.MOCK_FOLDER + "revised.txt");
+
+				verify(origLines, revLines, "original.txt", "revised.txt");
+		}
+
+		@Test
+		public void testGenerateUnifiedWithOneDelta() throws IOException {
+				List origLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_original.txt");
+				List revLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_revised.txt");
+
+				verify(origLines, revLines, "one_delta_test_original.txt", "one_delta_test_revised.txt");
+		}
+
+		@Test
+		public void testGenerateUnifiedDiffWithoutAnyDeltas() throws IOException {
+				List test = Arrays.asList("abc");
+				Patch patch = DiffUtils.diff(test, test);
+				StringWriter writer = new StringWriter();
+
+				UnifiedDiffWriter.write(
+								UnifiedDiff.from("header", "tail", UnifiedDiffFile.from("abc", "abc", patch)), name -> test, writer, 0);
+
+				System.out.println(writer);
+		}
+
+		@Test
+		public void testDiff_Issue10() throws IOException {
+				final List baseLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_base.txt");
+				final List patchLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_patch.txt");
+
+				UnifiedDiff unifiedDiff = UnifiedDiffReader.parseUnifiedDiff(new ByteArrayInputStream(
+								patchLines.stream().collect(joining("\n")).getBytes()));
+
+				final Patch p = unifiedDiff.getFiles().get(0).getPatch();
+				try {
+						DiffUtils.patch(baseLines, p);
+				} catch (PatchFailedException e) {
+						fail(e.getMessage());
+				}
+		}
+
+		/**
+		 * Issue 12
+		 */
+		@Test
+		@Disabled
+		public void testPatchWithNoDeltas() throws IOException {
+				final List lines1 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_1.txt");
+				final List lines2 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_2.txt");
+				verify(lines1, lines2, "issue11_1.txt", "issue11_2.txt");
+		}
+
+		@Test
+		public void testDiff5() throws IOException {
+				final List lines1 = fileToLines(TestConstants.MOCK_FOLDER + "5A.txt");
+				final List lines2 = fileToLines(TestConstants.MOCK_FOLDER + "5B.txt");
+				verify(lines1, lines2, "5A.txt", "5B.txt");
+		}
+
+		/**
+		 * Issue 19
+		 */
+		@Test
+		public void testDiffWithHeaderLineInText() throws IOException {
+				List original = new ArrayList<>();
+				List revised = new ArrayList<>();
+
+				original.add("test line1");
+				original.add("test line2");
+				original.add("test line 4");
+				original.add("test line 5");
+
+				revised.add("test line1");
+				revised.add("test line2");
+				revised.add("@@ -2,6 +2,7 @@");
+				revised.add("test line 4");
+				revised.add("test line 5");
+
+				Patch patch = DiffUtils.diff(original, revised);
+				StringWriter writer = new StringWriter();
+				UnifiedDiffWriter.write(
+								UnifiedDiff.from("header", "tail", UnifiedDiffFile.from("original", "revised", patch)),
+								name -> original,
+								writer,
+								10);
+
+				System.out.println(writer.toString());
+
+				UnifiedDiff unifiedDiff = UnifiedDiffReader.parseUnifiedDiff(
+								new ByteArrayInputStream(writer.toString().getBytes()));
+		}
+
+		private void verify(List origLines, List revLines, String originalFile, String revisedFile)
+						throws IOException {
+				Patch patch = DiffUtils.diff(origLines, revLines);
+
+				StringWriter writer = new StringWriter();
+				UnifiedDiffWriter.write(
+								UnifiedDiff.from("header", "tail", UnifiedDiffFile.from(originalFile, revisedFile, patch)),
+								name -> origLines,
+								writer,
+								10);
+
+				System.out.println(writer.toString());
+
+				UnifiedDiff unifiedDiff = UnifiedDiffReader.parseUnifiedDiff(
+								new ByteArrayInputStream(writer.toString().getBytes()));
+
+				List patchedLines;
+				try {
+						//            if (unifiedDiff.getFiles().isEmpty()) {
+						//                patchedLines = new ArrayList<>(origLines);
+						//            } else {
+						//                Patch fromUnifiedPatch = unifiedDiff.getFiles().get(0).getPatch();
+						//                patchedLines = fromUnifiedPatch.applyTo(origLines);
+						//            }
+						patchedLines = unifiedDiff.applyPatchTo(file -> originalFile.equals(file), origLines);
+						assertEquals(revLines.size(), patchedLines.size());
+						for (int i = 0; i < revLines.size(); i++) {
+								String l1 = revLines.get(i);
+								String l2 = patchedLines.get(i);
+								if (!l1.equals(l2)) {
+										fail("Line " + (i + 1) + " of the patched file did not match the revised original");
+								}
+						}
+				} catch (PatchFailedException e) {
+						fail(e.getMessage());
+				}
+		}
 }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java
index af48d485..ccbff82d 100644
--- a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java
+++ b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java
@@ -15,6 +15,8 @@
  */
 package com.github.difflib.unifieddiff;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import com.github.difflib.DiffUtils;
 import com.github.difflib.patch.Patch;
 import java.io.ByteArrayInputStream;
@@ -28,7 +30,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -37,49 +38,51 @@
  */
 public class UnifiedDiffWriterTest {
 
-    public UnifiedDiffWriterTest() {
-    }
+		public UnifiedDiffWriterTest() {}
+
+		@Test
+		public void testWrite() throws URISyntaxException, IOException {
+				String str = readFile(
+								UnifiedDiffReaderTest.class
+												.getResource("jsqlparser_patch_1.diff")
+												.toURI(),
+								Charset.defaultCharset());
+				UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(new ByteArrayInputStream(str.getBytes()));
+
+				StringWriter writer = new StringWriter();
+				UnifiedDiffWriter.write(diff, f -> Collections.emptyList(), writer, 5);
+				System.out.println(writer.toString());
+		}
+
+		/**
+		 * Issue 47
+		 */
+		@Test
+		public void testWriteWithNewFile() throws URISyntaxException, IOException {
+
+				List original = new ArrayList<>();
+				List revised = new ArrayList<>();
 
-    @Test
-    public void testWrite() throws URISyntaxException, IOException {
-        String str = readFile(UnifiedDiffReaderTest.class.getResource("jsqlparser_patch_1.diff").toURI(), Charset.defaultCharset());
-        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(new ByteArrayInputStream(str.getBytes()));
+				revised.add("line1");
+				revised.add("line2");
 
-        StringWriter writer = new StringWriter();
-        UnifiedDiffWriter.write(diff, f -> Collections.emptyList(), writer, 5);
-        System.out.println(writer.toString());
-    }
-    
-    /**
-     * Issue 47
-     */
-    @Test
-    public void testWriteWithNewFile() throws URISyntaxException, IOException {
-        
-        List original = new ArrayList<>();
-        List revised = new ArrayList<>();
+				Patch patch = DiffUtils.diff(original, revised);
+				UnifiedDiff diff = new UnifiedDiff();
+				diff.addFile(UnifiedDiffFile.from(null, "revised", patch));
 
-        revised.add("line1");
-        revised.add("line2");
+				StringWriter writer = new StringWriter();
+				UnifiedDiffWriter.write(diff, f -> original, writer, 5);
+				System.out.println(writer.toString());
 
-        Patch patch = DiffUtils.diff(original, revised);
-        UnifiedDiff diff = new UnifiedDiff();
-        diff.addFile( UnifiedDiffFile.from(null, "revised", patch) );
+				String[] lines = writer.toString().split("\\n");
 
-        StringWriter writer = new StringWriter();
-        UnifiedDiffWriter.write(diff, f -> original, writer, 5);
-        System.out.println(writer.toString());
-        
-        String[] lines = writer.toString().split("\\n");
-        
-        assertEquals("--- /dev/null", lines[0]);
-        assertEquals("+++ revised", lines[1]);
-        assertEquals("@@ -0,0 +1,2 @@", lines[2]);
-    }
+				assertEquals("--- /dev/null", lines[0]);
+				assertEquals("+++ revised", lines[1]);
+				assertEquals("@@ -0,0 +1,2 @@", lines[2]);
+		}
 
-    static String readFile(URI path, Charset encoding)
-            throws IOException {
-        byte[] encoded = Files.readAllBytes(Paths.get(path));
-        return new String(encoded, encoding);
-    }
+		static String readFile(URI path, Charset encoding) throws IOException {
+				byte[] encoded = Files.readAllBytes(Paths.get(path));
+				return new String(encoded, encoding);
+		}
 }
diff --git a/pom.xml b/pom.xml
index aa1deae3..6dc5de72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,246 +1,272 @@
 
 
-    4.0.0
-    io.github.java-diff-utils
-    java-diff-utils-parent
-    4.16-SNAPSHOT
-    java-diff-utils-parent
-    pom
-    
-        java-diff-utils
-        java-diff-utils-jgit
-    
-    The DiffUtils library for computing diffs, applying patches, generationg side-by-side view in Java.
-    https://github.com/java-diff-utils/java-diff-utils
-    2009 
-	
-    
-        
-            sonatype-nexus-staging
-            https://oss.sonatype.org/service/local/staging/deploy/maven2
-        
-        
-            sonatype-nexus-snapshots
-            https://oss.sonatype.org/content/repositories/snapshots
-        
-    
-	
-    
-        scm:git:https://github.com/java-diff-utils/java-diff-utils.git
-        scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
-        https://github.com/java-diff-utils/java-diff-utils.git
-        HEAD
-    
-    
-        GitHub Issues
-        https://github.com/java-diff-utils/java-diff-utils/issues
-    
-	
-    
-        java-diff-utils
-    
-	
-    
-        
-            Tobias Warneke
-            t.warneke@gmx.net
-        
-    
-	
-    
-        
-            The Apache Software License, Version 2.0
-            http://www.apache.org/licenses/LICENSE-2.0.txt
-            repo
-            A business-friendly OSS license
-        
-    
-    
-        UTF-8
-        1.8
-        1.8
-    
-    
+  4.0.0
+  io.github.java-diff-utils
+  java-diff-utils-parent
+  4.16-SNAPSHOT
+  pom
+  java-diff-utils-parent
+  The DiffUtils library for computing diffs, applying patches, generationg side-by-side view in Java.
+  https://github.com/java-diff-utils/java-diff-utils
+  2009
+
+  
+    java-diff-utils
+  
+
+  
+    
+      The Apache Software License, Version 2.0
+      http://www.apache.org/licenses/LICENSE-2.0.txt
+      repo
+      A business-friendly OSS license
+    
+  
+
+  
+    
+      Tobias Warneke
+      t.warneke@gmx.net
+    
+  
+  
+    java-diff-utils
+    java-diff-utils-jgit
+  
+
+  
+    scm:git:https://github.com/java-diff-utils/java-diff-utils.git
+    scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
+    HEAD
+    https://github.com/java-diff-utils/java-diff-utils.git
+  
+  
+    GitHub Issues
+    https://github.com/java-diff-utils/java-diff-utils/issues
+  
+
+  
+    
+      sonatype-nexus-staging
+      https://oss.sonatype.org/service/local/staging/deploy/maven2
+    
+    
+      sonatype-nexus-snapshots
+      https://oss.sonatype.org/content/repositories/snapshots
+    
+  
+  
+    UTF-8
+    1.8
+    1.8
+  
+  
+    
+      
+        org.junit.jupiter
+        junit-jupiter
+        5.11.4
+        test
+      
+      
+        org.assertj
+        assertj-core
+        3.27.3
+        test
+      
+    
+  
+  
+    
+      
+        org.apache.maven.plugins
+        maven-release-plugin
+        2.5.3
+        
+          true
+          false
+          forked-path
+          sign-release-artifacts
+        
+      
+      
+        org.apache.felix
+        maven-bundle-plugin
+        3.5.1
+        
+          
+            bundle-manifest
+            
+              manifest
+            
+            process-classes
+          
+        
+      
+      
+        org.apache.maven.plugins
+        maven-javadoc-plugin
+        3.1.1
+        
+          ${javadoc.opts}
+          none
+        
+        
+          
+            attach-javadocs
+            
+              jar
+            
+          
+        
+      
+      
+        org.apache.maven.plugins
+        maven-checkstyle-plugin
+        3.6.0
+        
+          true
+          true
+          ${project.build.sourceDirectory}
+          
+            
+              
+              
+                
+                
+                
+                
+                
+                
+                
+                
+                
+                
+                
+
+                
+
+                
+                
+                
+                
+
+                
+              
+            
+          
+        
         
-            
-                org.junit.jupiter
-                junit-jupiter
-                5.11.4
-                test
-            
-            
-                org.assertj
-                assertj-core
-                3.27.3
-                test
-            
+          
+            com.puppycrawl.tools
+            checkstyle
+            8.29
+          
         
-    
-    
+        
+          
+            verify-style
+            
+              check
+            
+            process-classes
+          
+        
+      
+      
+        org.apache.maven.plugins
+        maven-surefire-plugin
+        3.5.2
+        
+          
+            **/LR*.java
+          
+        
+      
+      
+        com.diffplug.spotless
+        spotless-maven-plugin
+        2.30.0
+        
+          
+            
+            
+              true
+              2
+            
+          
+          
+            
+              false
+            
+          
+        
+        
+          
+            
+              apply
+            
+            validate
+          
+        
+      
+    
+  
+  
+    
+      sign-release-artifacts
+      
+        
+          performRelease
+          true
+        
+      
+      
         
-            
-                org.apache.maven.plugins
-                maven-release-plugin
-                2.5.3
+          
+            org.apache.maven.plugins
+            maven-gpg-plugin
+            1.6
+            
+              
+                sign-artifacts
+                
+                  sign
+                
+                verify
                 
-                    true
-                    false
-                    forked-path
-                    sign-release-artifacts
+                  f22e0543
                 
-            
-            
-                org.apache.felix
-                maven-bundle-plugin
-                3.5.1
-                
-                    
-                        bundle-manifest
-                        process-classes
-                        
-                            manifest
-                        
-                    
-                
-            
-            
-                org.apache.maven.plugins
-                maven-javadoc-plugin
-                3.1.1
-                
-                    ${javadoc.opts}
-                    none
-                
-                
-                    
-                        attach-javadocs
-                        
-                            jar
-                        
-                    
-                
-            
-            
-                org.apache.maven.plugins
-                maven-checkstyle-plugin
-                3.6.0
-                
-                    
-                        verify-style
-                        process-classes
-                        
-                            check
-                        
-                    
-                
-                
-                    true
-                    true
-                    ${project.build.sourceDirectory}
-                    
-                        
-                            
-                            
-                            
-                                
-                                
-                                
-                                
-                                
-                                
-                                
-                                
-                                
-                                
-                                
-                                        
-                                
-										
-                                
-                                
-                                
-                                
-                                        
-                                
-                            
-                        
-                    
-                
-                
-                    
-                        com.puppycrawl.tools
-                        checkstyle
-                        8.29
-                    
-                
-            
-            
-                org.apache.maven.plugins
-                maven-surefire-plugin
-                3.5.2
-                
-                    
-                        **/LR*.java
-                    
-                
-            
+              
+            
+          
+        
+      
+    
+    
+      doclint-java8-disable
+      
+        [1.8,)
+      
+      
+        -Xdoclint:none
+      
+    
+    
+      long-running-tests
+      
+        
+          
+            org.apache.maven.plugins
+            maven-surefire-plugin
+            
+              
+                xxx
+              
+            
+          
         
-    
-    
-        
-            sign-release-artifacts
-            
-                
-                    performRelease
-                    true
-                
-            
-            
-                
-                    
-                        org.apache.maven.plugins
-                        maven-gpg-plugin
-                        1.6
-                        
-                            
-                                sign-artifacts
-                                verify
-                                
-                                    sign
-                                
-                                
-                                    f22e0543
-                                
-                            
-                        
-                    
-                
-            
-        
-        
-            doclint-java8-disable
-            
-                [1.8,)
-            
-            
-                -Xdoclint:none
-            
-        
-        
-            long-running-tests
-            
-                
-                    
-                        org.apache.maven.plugins
-                        maven-surefire-plugin
-                        
-                            
-                                xxx
-                            
-                        
-                    
-                
-            
-        
-    
+      
+    
+  
 

From c4b752fa51a2e6dc743d410f4706b8a89c458bb9 Mon Sep 17 00:00:00 2001
From: tw 
Date: Mon, 7 Jul 2025 23:00:25 +0200
Subject: [PATCH 256/266] fixes #211

---
 pom.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6dc5de72..61b466b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,7 @@
     https://github.com/java-diff-utils/java-diff-utils/issues
   
 
+  
   
     UTF-8
     1.8
@@ -210,6 +212,15 @@
           
         
       
+      
+        org.sonatype.central
+        central-publishing-maven-plugin
+        0.8.0
+        true
+        
+          sonatype-nexus
+        
+      
     
   
   

From 637cb7b6a309d66ff5e0cec2b3ffea52f867edc7 Mon Sep 17 00:00:00 2001
From: tw 
Date: Tue, 8 Jul 2025 01:00:59 +0200
Subject: [PATCH 257/266] [maven-release-plugin] prepare release
 java-diff-utils-parent-4.16

---
 java-diff-utils-jgit/pom.xml | 2 +-
 java-diff-utils/pom.xml      | 2 +-
 pom.xml                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index 766719b6..98db8553 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
   
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.16-SNAPSHOT
+    4.16
   
   java-diff-utils-jgit
   jar
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index e0c1139f..fb2d1b9d 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -4,7 +4,7 @@
   
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.16-SNAPSHOT
+    4.16
   
   io.github.java-diff-utils
   java-diff-utils
diff --git a/pom.xml b/pom.xml
index 61b466b3..e5dd60af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   4.0.0
   io.github.java-diff-utils
   java-diff-utils-parent
-  4.16-SNAPSHOT
+  4.16
   pom
   java-diff-utils-parent
   The DiffUtils library for computing diffs, applying patches, generationg side-by-side view in Java.
@@ -37,7 +37,7 @@
   
     scm:git:https://github.com/java-diff-utils/java-diff-utils.git
     scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
-    HEAD
+    java-diff-utils-parent-4.16
     https://github.com/java-diff-utils/java-diff-utils.git
   
   

From b117553de7ca8590ee77dcb207e2886b2836edc3 Mon Sep 17 00:00:00 2001
From: tw 
Date: Tue, 8 Jul 2025 01:01:01 +0200
Subject: [PATCH 258/266] [maven-release-plugin] prepare for next development
 iteration

---
 java-diff-utils-jgit/pom.xml |  2 +-
 java-diff-utils/pom.xml      |  2 +-
 pom.xml                      | 42 ++++++++++++++++++------------------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml
index 98db8553..a5203b3f 100644
--- a/java-diff-utils-jgit/pom.xml
+++ b/java-diff-utils-jgit/pom.xml
@@ -4,7 +4,7 @@
   
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.16
+    4.17-SNAPSHOT
   
   java-diff-utils-jgit
   jar
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
index fb2d1b9d..cbe4f34b 100644
--- a/java-diff-utils/pom.xml
+++ b/java-diff-utils/pom.xml
@@ -4,7 +4,7 @@
   
     io.github.java-diff-utils
     java-diff-utils-parent
-    4.16
+    4.17-SNAPSHOT
   
   io.github.java-diff-utils
   java-diff-utils
diff --git a/pom.xml b/pom.xml
index e5dd60af..e39a81d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   4.0.0
   io.github.java-diff-utils
   java-diff-utils-parent
-  4.16
+  4.17-SNAPSHOT
   pom
   java-diff-utils-parent
   The DiffUtils library for computing diffs, applying patches, generationg side-by-side view in Java.
@@ -37,7 +37,7 @@
   
     scm:git:https://github.com/java-diff-utils/java-diff-utils.git
     scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git
-    java-diff-utils-parent-4.16
+    HEAD
     https://github.com/java-diff-utils/java-diff-utils.git
   
   
@@ -132,28 +132,28 @@
           ${project.build.sourceDirectory}
           
             
-              
+              
               
-                
-                
-                
-                
-                
-                
-                
-                
-                
-                
-                
+                
+                
+                
+                
+                
+                
+                
+                
+                
+                
+                
 
-                
+                
 
-                
-                
-                
-                
+                
+                
+                
+                
 
-                
+                
               
             
           
@@ -191,7 +191,7 @@
         2.30.0
         
           
-            
+            
             
               true
               2

From 8b70f765919898d29568f97b7c77e9d6df93a66b Mon Sep 17 00:00:00 2001
From: Alexander Nikitin 
Date: Fri, 1 Aug 2025 20:47:55 +0300
Subject: [PATCH 259/266] Fix typo

---
 .../java/com/github/difflib/algorithm/jgit/HistogramDiff.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-diff-utils-jgit/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java b/java-diff-utils-jgit/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java
index 0476b269..a1cc1ce8 100644
--- a/java-diff-utils-jgit/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java
+++ b/java-diff-utils-jgit/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java
@@ -28,7 +28,7 @@
 import org.eclipse.jgit.diff.SequenceComparator;
 
 /**
- * HistorgramDiff using JGit - Library. This one is much more performant than the original Myers
+ * HistogramDiff using JGit - Library. This one is much more performant than the original Myers
  * implementation.
  *
  * @author toben

From 1ef6162ec61d34dca0aec2f94e9318e4389b3ba4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Go=C3=9F?=
 <75903169+agoss94@users.noreply.github.com>
Date: Fri, 5 Sep 2025 21:42:32 +0200
Subject: [PATCH 260/266] Adjust generic parameters for PECS principle. (#214)

Spotless update

Co-authored-by: Andreas Goss 
---
 .../difflib/algorithm/jgit/HistogramDiff.java |  7 ++--
 .../java/com/github/difflib/DiffUtils.java    | 26 +++++++-----
 .../algorithm/DiffAlgorithmFactory.java       |  2 +-
 .../difflib/algorithm/DiffAlgorithmI.java     |  2 +-
 .../difflib/algorithm/myers/MyersDiff.java    | 18 +++++----
 .../myers/MyersDiffWithLinearSpace.java       | 15 +++----
 .../com/github/difflib/patch/EqualDelta.java  |  4 +-
 .../java/com/github/difflib/patch/Patch.java  |  8 ++--
 pom.xml                                       | 40 +++++++++----------
 9 files changed, 66 insertions(+), 56 deletions(-)

diff --git a/java-diff-utils-jgit/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java b/java-diff-utils-jgit/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java
index a1cc1ce8..62ac4b97 100644
--- a/java-diff-utils-jgit/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java
+++ b/java-diff-utils-jgit/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java
@@ -36,7 +36,8 @@
 public class HistogramDiff implements DiffAlgorithmI {
 
 		@Override
-		public List computeDiff(List source, List target, DiffAlgorithmListener progress) {
+		public List computeDiff(
+						List source, List target, DiffAlgorithmListener progress) {
 				Objects.requireNonNull(source, "source list must not be null");
 				Objects.requireNonNull(target, "target list must not be null");
 				if (progress != null) {
@@ -92,9 +93,9 @@ public int hash(DataList s, int i) {
 
 class DataList extends Sequence {
 
-		final List data;
+		final List data;
 
-		public DataList(List data) {
+		public DataList(List data) {
 				this.data = data;
 		}
 
diff --git a/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
index e43be506..8448a760 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java
@@ -57,7 +57,8 @@ public static void withDefaultDiffAlgorithmFactory(DiffAlgorithmFactory factory)
 		 * @param progress a {@link DiffAlgorithmListener} representing the progress listener. Can be {@code null}.
 		 * @return The patch describing the difference between the original and revised sequences. Never {@code null}.
 		 */
-		public static  Patch diff(List original, List revised, DiffAlgorithmListener progress) {
+		public static  Patch diff(
+						List original, List revised, DiffAlgorithmListener progress) {
 				return DiffUtils.diff(original, revised, DEFAULT_DIFF.create(), progress);
 		}
 
@@ -69,7 +70,7 @@ public static  Patch diff(List original, List revised, DiffAlgorithm
 		 * @param revised a {@link List} representing the revised sequence of elements. Must not be {@code null}.
 		 * @return The patch describing the difference between the original and revised sequences. Never {@code null}.
 		 */
-		public static  Patch diff(List original, List revised) {
+		public static  Patch diff(List original, List revised) {
 				return DiffUtils.diff(original, revised, DEFAULT_DIFF.create(), null);
 		}
 
@@ -82,7 +83,7 @@ public static  Patch diff(List original, List revised) {
 		 * @param includeEqualParts a {@link boolean} representing whether to include equal parts in the resulting patch.
 		 * @return The patch describing the difference between the original and revised sequences. Never {@code null}.
 		 */
-		public static  Patch diff(List original, List revised, boolean includeEqualParts) {
+		public static  Patch diff(List original, List revised, boolean includeEqualParts) {
 				return DiffUtils.diff(original, revised, DEFAULT_DIFF.create(), null, includeEqualParts);
 		}
 
@@ -110,7 +111,8 @@ public static Patch diff(String sourceText, String targetText, DiffAlgor
 		 * @return The patch describing the difference between the original and
 		 * revised sequences. Never {@code null}.
 		 */
-		public static  Patch diff(List source, List target, BiPredicate equalizer) {
+		public static  Patch diff(
+						List source, List target, BiPredicate equalizer) {
 				if (equalizer != null) {
 						return DiffUtils.diff(source, target, DEFAULT_DIFF.create(equalizer));
 				}
@@ -118,7 +120,10 @@ public static  Patch diff(List source, List target, BiPredicate Patch diff(
-						List original, List revised, DiffAlgorithmI algorithm, DiffAlgorithmListener progress) {
+						List original,
+						List revised,
+						DiffAlgorithmI algorithm,
+						DiffAlgorithmListener progress) {
 				return diff(original, revised, algorithm, progress, false);
 		}
 
@@ -135,8 +140,8 @@ public static  Patch diff(
 		 * revised sequences. Never {@code null}.
 		 */
 		public static  Patch diff(
-						List original,
-						List revised,
+						List original,
+						List revised,
 						DiffAlgorithmI algorithm,
 						DiffAlgorithmListener progress,
 						boolean includeEqualParts) {
@@ -157,7 +162,8 @@ public static  Patch diff(
 		 * @return The patch describing the difference between the original and
 		 * revised sequences. Never {@code null}.
 		 */
-		public static  Patch diff(List original, List revised, DiffAlgorithmI algorithm) {
+		public static  Patch diff(
+						List original, List revised, DiffAlgorithmI algorithm) {
 				return diff(original, revised, algorithm, null);
 		}
 
@@ -196,7 +202,7 @@ public static Patch diffInline(String original, String revised) {
 		 * @return the revised list.
 		 * @throws PatchFailedException if the patch cannot be applied.
 		 */
-		public static  List patch(List original, Patch patch) throws PatchFailedException {
+		public static  List patch(List original, Patch patch) throws PatchFailedException {
 				return patch.applyTo(original);
 		}
 
@@ -208,7 +214,7 @@ public static  List patch(List original, Patch patch) throws PatchFa
 		 * @return the original list.
 		 * @throws PatchFailedException if the patch cannot be applied.
 		 */
-		public static  List unpatch(List revised, Patch patch) {
+		public static  List unpatch(List revised, Patch patch) {
 				return patch.restore(revised);
 		}
 
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmFactory.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmFactory.java
index 307ee7e3..5b9d71c9 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmFactory.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmFactory.java
@@ -25,5 +25,5 @@
 public interface DiffAlgorithmFactory {
 		 DiffAlgorithmI create();
 
-		 DiffAlgorithmI create(BiPredicate equalizer);
+		 DiffAlgorithmI create(BiPredicate equalizer);
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmI.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmI.java
index a12b499a..ee421c59 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmI.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmI.java
@@ -34,7 +34,7 @@ public interface DiffAlgorithmI {
 		 * @param progress progress listener
 		 * @return
 		 */
-		List computeDiff(List source, List target, DiffAlgorithmListener progress);
+		List computeDiff(List source, List target, DiffAlgorithmListener progress);
 
 		/**
 		 * Simple extension to compute a changeset using arrays.
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java
index 5233e02b..c990208a 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java
@@ -31,13 +31,13 @@
  */
 public final class MyersDiff implements DiffAlgorithmI {
 
-		private final BiPredicate equalizer;
+		private final BiPredicate equalizer;
 
 		public MyersDiff() {
 				equalizer = Object::equals;
 		}
 
-		public MyersDiff(final BiPredicate equalizer) {
+		public MyersDiff(final BiPredicate equalizer) {
 				Objects.requireNonNull(equalizer, "equalizer must not be null");
 				this.equalizer = equalizer;
 		}
@@ -48,7 +48,8 @@ public MyersDiff(final BiPredicate equalizer) {
 		 * Return empty diff if get the error while procession the difference.
 		 */
 		@Override
-		public List computeDiff(final List source, final List target, DiffAlgorithmListener progress) {
+		public List computeDiff(
+						final List source, final List target, DiffAlgorithmListener progress) {
 				Objects.requireNonNull(source, "source list must not be null");
 				Objects.requireNonNull(target, "target list must not be null");
 
@@ -71,9 +72,10 @@ public List computeDiff(final List source, final List target, Diff
 		 * @param orig The original sequence.
 		 * @param rev The revised sequence.
 		 * @return A minimum {@link PathNode Path} accross the differences graph.
-		 * @throws DifferentiationFailedException if a diff path could not be found.
+		 * @throws IllegalStateException if a diff path could not be found.
 		 */
-		private PathNode buildPath(final List orig, final List rev, DiffAlgorithmListener progress) {
+		private PathNode buildPath(
+						final List orig, final List rev, DiffAlgorithmListener progress) {
 				Objects.requireNonNull(orig, "original sequence is null");
 				Objects.requireNonNull(rev, "revised sequence is null");
 
@@ -140,10 +142,10 @@ private PathNode buildPath(final List orig, final List rev, DiffAlgorithmL
 		 * @param orig The original sequence.
 		 * @param rev The revised sequence.
 		 * @return A {@link Patch} script corresponding to the path.
-		 * @throws DifferentiationFailedException if a {@link Patch} could not be
+		 * @throws IllegalStateException if a {@link Patch} could not be
 		 * built from the given path.
 		 */
-		private List buildRevision(PathNode actualPath, List orig, List rev) {
+		private List buildRevision(PathNode actualPath, List orig, List rev) {
 				Objects.requireNonNull(actualPath, "path is null");
 				Objects.requireNonNull(orig, "original sequence is null");
 				Objects.requireNonNull(rev, "revised sequence is null");
@@ -190,7 +192,7 @@ public  DiffAlgorithmI create() {
 						}
 
 						@Override
-						public  DiffAlgorithmI create(BiPredicate equalizer) {
+						public  DiffAlgorithmI create(BiPredicate equalizer) {
 								return new MyersDiff<>(equalizer);
 						}
 				};
diff --git a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiffWithLinearSpace.java b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiffWithLinearSpace.java
index f8c734ba..2e1a53c4 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiffWithLinearSpace.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiffWithLinearSpace.java
@@ -32,19 +32,20 @@
  */
 public class MyersDiffWithLinearSpace implements DiffAlgorithmI {
 
-		private final BiPredicate equalizer;
+		private final BiPredicate equalizer;
 
 		public MyersDiffWithLinearSpace() {
 				equalizer = Object::equals;
 		}
 
-		public MyersDiffWithLinearSpace(final BiPredicate equalizer) {
+		public MyersDiffWithLinearSpace(final BiPredicate equalizer) {
 				Objects.requireNonNull(equalizer, "equalizer must not be null");
 				this.equalizer = equalizer;
 		}
 
 		@Override
-		public List computeDiff(List source, List target, DiffAlgorithmListener progress) {
+		public List computeDiff(
+						List source, List target, DiffAlgorithmListener progress) {
 				Objects.requireNonNull(source, "source list must not be null");
 				Objects.requireNonNull(target, "target list must not be null");
 
@@ -200,10 +201,10 @@ private class DiffData {
 				final int[] vDown;
 				final int[] vUp;
 				final List script;
-				final List source;
-				final List target;
+				final List source;
+				final List target;
 
-				public DiffData(List source, List target) {
+				public DiffData(List source, List target) {
 						this.source = source;
 						this.target = target;
 						size = source.size() + target.size() + 2;
@@ -237,7 +238,7 @@ public  DiffAlgorithmI create() {
 						}
 
 						@Override
-						public  DiffAlgorithmI create(BiPredicate equalizer) {
+						public  DiffAlgorithmI create(BiPredicate equalizer) {
 								return new MyersDiffWithLinearSpace<>(equalizer);
 						}
 				};
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java
index 64f05685..98cb561f 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java
@@ -18,7 +18,7 @@
 import java.util.List;
 
 /**
- * This delta contains equal lines of data. Therefore nothing is to do in applyTo and restore.
+ * This delta contains equal lines of data. Therefore, nothing is to do in applyTo and restore.
  * @author tobens
  */
 public class EqualDelta extends AbstractDelta {
@@ -49,6 +49,6 @@ public String toString() {
 
 		@Override
 		public AbstractDelta withChunks(Chunk original, Chunk revised) {
-				return new EqualDelta(original, revised);
+				return new EqualDelta<>(original, revised);
 		}
 }
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
index 6a54d820..31c2c3e4 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
@@ -54,7 +54,7 @@ public Patch(int estimatedPatchSize) {
 		 * @return A new list containing the applied patch.
 		 * @throws PatchFailedException if the patch cannot be applied
 		 */
-		public List applyTo(List target) throws PatchFailedException {
+		public List applyTo(List target) throws PatchFailedException {
 				List result = new ArrayList<>(target);
 				applyToExisting(result);
 				return result;
@@ -244,7 +244,7 @@ public Patch withConflictOutput(ConflictOutput conflictOutput) {
 		 * @param target The list to copy and apply changes to.
 		 * @return A new list, containing the restored state.
 		 */
-		public List restore(List target) {
+		public List restore(List target) {
 				List result = new ArrayList<>(target);
 				restoreToExisting(result);
 				return result;
@@ -294,12 +294,12 @@ public static  Patch generate(List original, List revised, List Chunk buildChunk(int start, int end, List data) {
+		private static  Chunk buildChunk(int start, int end, List data) {
 				return new Chunk<>(start, new ArrayList<>(data.subList(start, end)));
 		}
 
 		public static  Patch generate(
-						List original, List revised, List _changes, boolean includeEquals) {
+						List original, List revised, List _changes, boolean includeEquals) {
 				Patch patch = new Patch<>(_changes.size());
 				int startOriginal = 0;
 				int startRevised = 0;
diff --git a/pom.xml b/pom.xml
index e39a81d8..d0d5b28c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,28 +132,28 @@
           ${project.build.sourceDirectory}
           
             
-              
+              
               
-                
-                
-                
-                
-                
-                
-                
-                
-                
-                
-                
+                
+                
+                
+                
+                
+                
+                
+                
+                
+                
+                
 
-                
+                
 
-                
-                
-                
-                
+                
+                
+                
+                
 
-                
+                
               
             
           
@@ -188,10 +188,10 @@
       
         com.diffplug.spotless
         spotless-maven-plugin
-        2.30.0
+        2.46.0
         
           
-            
+            
             
               true
               2

From 9b13cc8199e2a7fd7a66f1b7e017a1c46e4776c0 Mon Sep 17 00:00:00 2001
From: tw 
Date: Fri, 5 Sep 2025 21:47:34 +0200
Subject: [PATCH 261/266] downgrade spotless

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d0d5b28c..12c736d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -188,7 +188,7 @@
       
         com.diffplug.spotless
         spotless-maven-plugin
-        2.46.0
+        2.30.0
         
           
             

From ba008888abf56c7f2675608bb5222418e0698060 Mon Sep 17 00:00:00 2001
From: tw 
Date: Fri, 5 Sep 2025 21:48:49 +0200
Subject: [PATCH 262/266] downgrade spotless


From 8a6206e3d4ecaee04bb17109d2b538ebfa1cb6db Mon Sep 17 00:00:00 2001
From: Matthias Braun 
Date: Mon, 29 Sep 2025 20:11:23 +0200
Subject: [PATCH 263/266] Update README.md

Fix spelling.
---
 README.md | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index cbcba7af..d2d459a7 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 [![Build Status](https://travis-ci.org/java-diff-utils/java-diff-utils.svg?branch=master)](https://travis-ci.org/java-diff-utils/java-diff-utils)
 
-[![Build Status using Github Actions](https://github.com/java-diff-utils/java-diff-utils/workflows/Java%20CI%20with%20Maven/badge.svg)](https://github.com/java-diff-utils/java-diff-utils/actions?query=workflow%3A%22Java+CI+with+Maven%22)
+[![Build Status using GitHub Actions](https://github.com/java-diff-utils/java-diff-utils/workflows/Java%20CI%20with%20Maven/badge.svg)](https://github.com/java-diff-utils/java-diff-utils/actions?query=workflow%3A%22Java+CI+with+Maven%22)
 
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/002c53aa0c924f71ac80a2f65446dfdd)](https://www.codacy.com/gh/java-diff-utils/java-diff-utils/dashboard?utm_source=github.com&utm_medium=referral&utm_content=java-diff-utils/java-diff-utils&utm_campaign=Badge_Grade)
 
@@ -12,30 +12,30 @@
 
 ## Intro
 
-Diff Utils library is an OpenSource library for performing the comparison operations between texts: computing diffs, applying patches, generating unified diffs or parsing them, generating diff output for easy future displaying (like side-by-side view) and so on.
+Diff Utils library is an open source library for performing comparison operations between texts: computing diffs, applying patches, generating unified diffs or parsing them, generating diff output for easy future displaying (like side-by-side view) and so on.
 
-Main reason to build this library was the lack of easy-to-use libraries with all the usual stuff you need while working with diff files. Originally it was inspired by JRCS library and it's nice design of diff module.
+The main reason to build this library was the lack of easy-to-use libraries with all the usual stuff you need while working with diff files. Originally it was inspired by JRCS library and its nice design of diff module.
 
 **This is originally a fork of java-diff-utils from Google Code Archive.**
 
 ## GPG Signature Validation
 
-The gpg singing key in [KEYS] is used for this projects artifacts.
+The gpg singing key in [KEYS] is used for this project's artifacts.
 
 ## API
 
-Javadocs of the actual release version: [JavaDocs java-diff-utils](https://java-diff-utils.github.io/java-diff-utils/4.10/docs/apidocs/)
+Javadocs of the actual release version: [Javadocs java-diff-utils](https://java-diff-utils.github.io/java-diff-utils/4.10/docs/apidocs/)
 
 ## Examples
 
-Look [here](https://github.com/java-diff-utils/java-diff-utils/wiki) to find more helpful informations and examples.
+Look [here](https://github.com/java-diff-utils/java-diff-utils/wiki) to find more helpful information and examples.
 
-These two outputs are generated using this java-diff-utils. The source code can also be found at the *Examples* page:
+These two outputs are generated using java-diff-utils. The source code can also be found at the *Examples* page:
 
 **Producing a one liner including all difference information.**
 
 ```Java
-//create a configured DiffRowGenerator
+// Create a configured DiffRowGenerator
 DiffRowGenerator generator = DiffRowGenerator.create()
                 .showInlineDiffs(true)
                 .mergeOriginalRevised(true)
@@ -44,15 +44,15 @@ DiffRowGenerator generator = DiffRowGenerator.create()
                 .newTag(f -> "**")     //introduce markdown style for bold
                 .build();
 
-//compute the differences for two test texts.
+// Compute the differences for two test texts
 List rows = generator.generateDiffRows(
-                Arrays.asList("This is a test senctence."),
+                Arrays.asList("This is a test sentence."),
                 Arrays.asList("This is a test for diffutils."));
-        
+
 System.out.println(rows.get(0).getOldLine());
 ```
 
-This is a test ~senctence~**for diffutils**.
+This is a test ~sentence~**for diffutils**.
 
 **Producing a side by side view of computed differences.**
 
@@ -64,9 +64,9 @@ DiffRowGenerator generator = DiffRowGenerator.create()
                 .newTag(f -> "**")
                 .build();
 List rows = generator.generateDiffRows(
-                Arrays.asList("This is a test senctence.", "This is the second line.", "And here is the finish."),
+                Arrays.asList("This is a test sentence.", "This is the second line.", "And here is the finish."),
                 Arrays.asList("This is a test for diffutils.", "This is the second line."));
-        
+
 System.out.println("|original|new|");
 System.out.println("|--------|---|");
 for (DiffRow row : rows) {
@@ -76,14 +76,14 @@ for (DiffRow row : rows) {
 
 |original|new|
 |--------|---|
-|This is a test ~senctence~.|This is a test **for diffutils**.|
+|This is a test ~sentence~.|This is a test **for diffutils**.|
 |This is the second line.|This is the second line.|
 |~And here is the finish.~||
 
 ## Main Features
 
-* computing the difference between two texts.
-* capable to hand more than plain ascii. Arrays or List of any type that implements hashCode() and equals() correctly can be subject to differencing using this library
+* Computing the difference between two texts.
+* Capable to handle more than plain ASCII. Arrays or List of any type that implements hashCode() and equals() correctly can be subject to differencing using this library
 * patch and unpatch the text with the given patch
 * parsing the unified diff format
 * producing human-readable differences
@@ -95,10 +95,10 @@ for (DiffRow row : rows) {
 
 ### Algorithms
 
-* Myer's diff
+* Myers diff
 * HistogramDiff
 
-But it can easily replaced by any other which is better for handing your texts. I have plan to add implementation of some in future.
+But it can easily be replaced by any other which is better for handling your texts. I have a plan to add the implementation of some in the future.
 
 ## Source Code conventions
 
@@ -123,7 +123,7 @@ This is a valid piece of source code:
 
 ### To Install
 
-Just add the code below to your maven dependencies:
+Just add the code below to your Maven dependencies:
 
 ```xml
 
@@ -133,7 +133,7 @@ Just add the code below to your maven dependencies:
 
 ```
 
-or using gradle:
+or using Gradle:
 
 ```groovy
 // https://mvnrepository.com/artifact/io.github.java-diff-utils/java-diff-utils

From c42ba091c5f965963b4cc024d0d274103bbf3bc0 Mon Sep 17 00:00:00 2001
From: Matthias Braun 
Date: Sun, 5 Oct 2025 20:36:53 +0200
Subject: [PATCH 264/266] Update README.md

More typo fixing.
---
 README.md | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index d2d459a7..924342db 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ The main reason to build this library was the lack of easy-to-use libraries with
 
 ## GPG Signature Validation
 
-The gpg singing key in [KEYS] is used for this project's artifacts.
+The GPG signing key in [KEYS] is used for this project's artifacts.
 
 ## API
 
@@ -30,18 +30,18 @@ Javadocs of the actual release version: [Javadocs java-diff-utils](https://java-
 
 Look [here](https://github.com/java-diff-utils/java-diff-utils/wiki) to find more helpful information and examples.
 
-These two outputs are generated using java-diff-utils. The source code can also be found at the *Examples* page:
+These two outputs are generated using java-diff-utils. The source code can also be found on the [Examples](https://github.com/java-diff-utils/java-diff-utils/wiki/Examples) page:
 
 **Producing a one liner including all difference information.**
 
-```Java
+```java
 // Create a configured DiffRowGenerator
 DiffRowGenerator generator = DiffRowGenerator.create()
                 .showInlineDiffs(true)
                 .mergeOriginalRevised(true)
                 .inlineDiffByWord(true)
-                .oldTag(f -> "~")      //introduce markdown style for strikethrough
-                .newTag(f -> "**")     //introduce markdown style for bold
+                .oldTag(f -> "~")      // Introduce markdown style for strikethrough
+                .newTag(f -> "**")     // Introduce markdown style for bold
                 .build();
 
 // Compute the differences for two test texts
@@ -54,9 +54,9 @@ System.out.println(rows.get(0).getOldLine());
 
 This is a test ~sentence~**for diffutils**.
 
-**Producing a side by side view of computed differences.**
+**Producing a side-by-side view of computed differences.**
 
-```Java
+```java
 DiffRowGenerator generator = DiffRowGenerator.create()
                 .showInlineDiffs(true)
                 .inlineDiffByWord(true)
@@ -83,15 +83,15 @@ for (DiffRow row : rows) {
 ## Main Features
 
 * Computing the difference between two texts.
-* Capable to handle more than plain ASCII. Arrays or List of any type that implements hashCode() and equals() correctly can be subject to differencing using this library
-* patch and unpatch the text with the given patch
-* parsing the unified diff format
-* producing human-readable differences
-* inline difference construction
+* Capable of handling more than plain ASCII. Arrays or lists of any type that implement `hashCode()` and `equals()` correctly can be subject to differencing using this library
+* Patch and unpatch the text with the given patch
+* Parsing the unified diff format
+* Producing human-readable differences
+* Inline difference construction
 * Algorithms:
-  * Myers Standard Algorithm
+  * Myers standard algorithm
   * Myers with linear space improvement
-  * HistogramDiff using JGit Library
+  * HistogramDiff using the JGit library
 
 ### Algorithms
 
@@ -102,7 +102,7 @@ But it can easily be replaced by any other which is better for handling your tex
 
 ## Source Code conventions
 
-Recently a checkstyle process was integrated into the build process. java-diff-utils follows the sun java format convention. There are no TABs allowed. Use spaces.
+Recently a checkstyle process was integrated into the build process. java-diff-utils follows the Sun Java format convention. There are no tabs allowed. Use spaces.
 
 ```java
 public static  Patch diff(List original, List revised,

From 696edc4c1a26d3021082cf643842d534aa8e07d7 Mon Sep 17 00:00:00 2001
From: tusharsoni52 <116971475+tusharsoni52@users.noreply.github.com>
Date: Thu, 11 Dec 2025 01:48:26 +0530
Subject: [PATCH 265/266] feat(diffrow): add processEqualities hook and ensure
 equalities are processed for unchanged lines (Fixes #219) (#224)

- Introduces a new protected method `processEqualities(String)` in DiffRowGenerator
- Builder exposes `.processEqualities(Function)`
- Equal (unchanged) lines now invoke processEqualities()
- Inline diffs remain unchanged (as expected in Option 3)
- Added new test suite DiffRowGeneratorEqualitiesTest
- Updated documentation and Javadoc for new extension point
- Fixes #219 (HTML escaping issue when inline diff by word)

Co-authored-by: Tushar Soni 
---
 .../github/difflib/text/DiffRowGenerator.java | 38 +++++++-
 .../text/DiffRowGeneratorEqualitiesTest.java  | 92 +++++++++++++++++++
 2 files changed, 128 insertions(+), 2 deletions(-)
 create mode 100644 java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorEqualitiesTest.java

diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
index e7e09ac5..82a5b94e 100644
--- a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
+++ b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
@@ -189,6 +189,8 @@ static void wrapInTag(
 		private final Function lineNormalizer;
 		private final Function processDiffs;
 		private final Function>> inlineDeltaMerger;
+		// processor for equal (unchanged) lines
+		private final Function equalityProcessor;
 
 		private final boolean showInlineDiffs;
 		private final boolean replaceOriginalLinefeedInChangesWithSpaces;
@@ -214,6 +216,7 @@ private DiffRowGenerator(Builder builder) {
 				lineNormalizer = builder.lineNormalizer;
 				processDiffs = builder.processDiffs;
 				inlineDeltaMerger = builder.inlineDeltaMerger;
+				equalityProcessor = builder.equalityProcessor;
 
 				replaceOriginalLinefeedInChangesWithSpaces = builder.replaceOriginalLinefeedInChangesWithSpaces;
 
@@ -262,7 +265,8 @@ public List generateDiffRows(final List original, Patch
 
 				// Copy the final matching chunk if any.
 				for (String line : original.subList(endPos, original.size())) {
-						diffRows.add(buildDiffRow(Tag.EQUAL, line, line));
+						String processed = processEqualities(line);
+						diffRows.add(buildDiffRow(Tag.EQUAL, processed, processed));
 				}
 				return diffRows;
 		}
@@ -276,7 +280,8 @@ private int transformDeltaIntoDiffRow(
 				Chunk rev = delta.getTarget();
 
 				for (String line : original.subList(endPos, orig.getPosition())) {
-						diffRows.add(buildDiffRow(Tag.EQUAL, line, line));
+						String processed = processEqualities(line);
+						diffRows.add(buildDiffRow(Tag.EQUAL, processed, processed));
 				}
 
 				switch (delta.getType()) {
@@ -496,6 +501,19 @@ private String preprocessLine(String line) {
 				}
 		}
 
+		/**
+		 * Hook for processing equal (unchanged) text segments.
+		 * Delegates to the builder-configured equalityProcessor if present.
+		 *
+		 * @author tusharsoni52
+		 * @param text
+		 * @return
+		 *
+		 */
+		protected String processEqualities(final String text) {
+				return equalityProcessor != null ? equalityProcessor.apply(text) : text;
+		}
+
 		/**
 		 * This class used for building the DiffRowGenerator.
 		 *
@@ -521,6 +539,8 @@ public static class Builder {
 				private boolean replaceOriginalLinefeedInChangesWithSpaces = false;
 				private Function>> inlineDeltaMerger =
 								DEFAULT_INLINE_DELTA_MERGER;
+				// Processor for equalities
+				private Function equalityProcessor = null;
 
 				private Builder() {}
 
@@ -613,6 +633,20 @@ public Builder processDiffs(Function processDiffs) {
 						return this;
 				}
 
+				/**
+				 * Processor for equal (unchanged) text parts.
+				 * Allows applying the same escaping/transformation as for diffs.
+				 *
+				 * @author tusharsoni52
+				 * @param equalityProcessor
+				 * @return
+				 *
+				 */
+				public Builder processEqualities(Function equalityProcessor) {
+						this.equalityProcessor = equalityProcessor;
+						return this;
+				}
+
 				/**
 				 * Set the column width of generated lines of original and revised
 				 * texts.
diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorEqualitiesTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorEqualitiesTest.java
new file mode 100644
index 00000000..c71f455b
--- /dev/null
+++ b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorEqualitiesTest.java
@@ -0,0 +1,92 @@
+package com.github.difflib.text;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Arrays;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+
+public class DiffRowGeneratorEqualitiesTest {
+
+		@Test
+		public void testDefaultEqualityProcessingLeavesTextUnchanged() {
+				DiffRowGenerator generator =
+								DiffRowGenerator.create().showInlineDiffs(false).build();
+
+				List rows = generator.generateDiffRows(Arrays.asList("hello world"), Arrays.asList("hello world"));
+
+				assertEquals(1, rows.size());
+				assertEquals("hello world", rows.get(0).getOldLine());
+				assertEquals("hello world", rows.get(0).getNewLine());
+				assertEquals(DiffRow.Tag.EQUAL, rows.get(0).getTag());
+		}
+
+		@Test
+		public void testCustomEqualityProcessingIsApplied() {
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(false)
+								.processEqualities(text -> "[" + text + "]")
+								.build();
+
+				List rows = generator.generateDiffRows(Arrays.asList("A", "B"), Arrays.asList("A", "B"));
+
+				assertEquals(2, rows.size());
+				assertEquals("[A]", rows.get(0).getOldLine());
+				assertEquals("[B]", rows.get(1).getOldLine());
+		}
+
+		/**
+		 * Verifies that processEqualities can be used to HTML-escape unchanged
+		 * lines while still working together with the default HTML-oriented
+		 * lineNormalizer.
+		 */
+		@Test
+		public void testHtmlEscapingEqualitiesWorksWithDefaultNormalizer() {
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.inlineDiffByWord(true)
+								.processEqualities(s -> s.replace("<", "<").replace(">", ">"))
+								.build();
+
+				// both lines are equal -> Tag.EQUAL, processEqualities is invoked
+				List rows = generator.generateDiffRows(Arrays.asList("hello "), Arrays.asList("hello "));
+
+				DiffRow row = rows.get(0);
+
+				assertTrue(row.getOldLine().contains("<world>"));
+				assertTrue(row.getNewLine().contains("<world>"));
+		}
+
+		/**
+		 * Ensures equalities are processed while inline diff markup is still
+		 * present somewhere in the line.
+		 */
+		@Test
+		public void testEqualitiesProcessedButInlineDiffStillPresent() {
+				DiffRowGenerator generator = DiffRowGenerator.create()
+								.showInlineDiffs(true)
+								.inlineDiffByWord(true)
+								.processEqualities(s -> "(" + s + ")")
+								.build();
+
+				List rows = generator.generateDiffRows(Arrays.asList("hello world"), Arrays.asList("hello there"));
+
+				DiffRow row = rows.get(0);
+
+				System.out.println("OLD = " + row.getOldLine());
+				System.out.println("NEW = " + row.getNewLine());
+
+				// Row must be CHANGE
+				assertEquals(DiffRow.Tag.CHANGE, row.getTag());
+
+				// Inline diff markup must appear
+				assertTrue(
+								row.getOldLine().contains("span") || row.getNewLine().contains("span"),
+								"Expected inline  diff markup in old or new line");
+
+				// Equalities inside CHANGE row must NOT be wrapped by processEqualities
+				// Option 3 does NOT modify inline equalities
+				assertTrue(row.getOldLine().startsWith("hello "), "Equal (unchanged) inline segment should remain unchanged");
+		}
+}

From b35ebf420274e1cf18e322218ed92b713a166b18 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 Mar 2026 08:08:13 +0200
Subject: [PATCH 266/266] Bump org.assertj:assertj-core from 3.27.3 to 3.27.7
 (#226)

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.7.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.7)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.7
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 12c736d1..90da69f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@
       
         org.assertj
         assertj-core
-        3.27.3
+        3.27.7
         test