From b430a887965f3cb4c2f15060e67ce5b666538333 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Wed, 10 Aug 2016 17:08:18 +0100
Subject: [PATCH] Polishing

---
 .../restdocs/curl/CurlRequestSnippet.java              |  5 +----
 .../org/springframework/restdocs/hypermedia/Link.java  |  7 ++-----
 .../springframework/restdocs/test/SnippetMatchers.java | 10 +++++++---
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/spring-restdocs-core/src/main/java/org/springframework/restdocs/curl/CurlRequestSnippet.java b/spring-restdocs-core/src/main/java/org/springframework/restdocs/curl/CurlRequestSnippet.java
index 4f4ea07b..50764ecd 100644
--- a/spring-restdocs-core/src/main/java/org/springframework/restdocs/curl/CurlRequestSnippet.java
+++ b/spring-restdocs-core/src/main/java/org/springframework/restdocs/curl/CurlRequestSnippet.java
@@ -223,10 +223,7 @@ public class CurlRequestSnippet extends TemplatedSnippet {
 
 		@Override
 		public boolean allow(String name, List<String> value) {
-			if (HttpHeaders.AUTHORIZATION.equals(name) && isBasicAuthHeader(value)) {
-				return false;
-			}
-			return true;
+			return !(HttpHeaders.AUTHORIZATION.equals(name) && isBasicAuthHeader(value));
 		}
 
 		static boolean isBasicAuthHeader(List<String> value) {
diff --git a/spring-restdocs-core/src/main/java/org/springframework/restdocs/hypermedia/Link.java b/spring-restdocs-core/src/main/java/org/springframework/restdocs/hypermedia/Link.java
index 112886f0..5e8a34f3 100644
--- a/spring-restdocs-core/src/main/java/org/springframework/restdocs/hypermedia/Link.java
+++ b/spring-restdocs-core/src/main/java/org/springframework/restdocs/hypermedia/Link.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 the original author or authors.
+ * Copyright 2014-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -80,10 +80,7 @@ public class Link {
 		if (!this.href.equals(other.href)) {
 			return false;
 		}
-		if (!this.rel.equals(other.rel)) {
-			return false;
-		}
-		return true;
+		return this.rel.equals(other.rel);
 	}
 
 	@Override
diff --git a/spring-restdocs-core/src/test/java/org/springframework/restdocs/test/SnippetMatchers.java b/spring-restdocs-core/src/test/java/org/springframework/restdocs/test/SnippetMatchers.java
index 98c1ccd1..7f23ad8e 100644
--- a/spring-restdocs-core/src/test/java/org/springframework/restdocs/test/SnippetMatchers.java
+++ b/spring-restdocs-core/src/test/java/org/springframework/restdocs/test/SnippetMatchers.java
@@ -82,10 +82,14 @@ public final class SnippetMatchers {
 		}
 
 		protected void addLine(int index, String line) {
-			if (index < 0) {
-				index = index + this.lines.size();
+			this.lines.add(determineIndex(index), line);
+		}
+
+		private int determineIndex(int index) {
+			if (index >= 0) {
+				return index;
 			}
-			this.lines.add(index, line);
+			return index + this.lines.size();
 		}
 
 		@Override