From 5fe9299461a8d17f79ddf68ee4269fd69663882f Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Mon, 11 Mar 2019 19:56:09 +0100
Subject: [PATCH] Fixed checkstyle

---
 .../contract/verifier/assertion/CollectionAssert.java    | 9 ++++++++-
 src/checkstyle/checkstyle-suppressions.xml               | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/assertion/CollectionAssert.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/assertion/CollectionAssert.java
index 770a648f4e..e40bf29372 100644
--- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/assertion/CollectionAssert.java
+++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/assertion/CollectionAssert.java
@@ -21,6 +21,9 @@ import java.util.Iterator;
 import java.util.Map;
 
 import org.assertj.core.api.IterableAssert;
+import org.assertj.core.util.Streams;
+
+import static java.util.stream.Collectors.toList;
 
 /**
  * Extension to {@link Iterable} assertions.
@@ -36,7 +39,11 @@ public class CollectionAssert<ELEMENT> extends IterableAssert<ELEMENT> {
 	}
 
 	public CollectionAssert(Iterator<? extends ELEMENT> actual) {
-		super(actual);
+		super(toIterable(actual));
+	}
+
+	private static <T> Iterable<T> toIterable(Iterator<T> iterator) {
+		return Streams.stream(iterator).collect(toList());
 	}
 
 	/**
diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml
index e72a9972d0..c1c361e37c 100644
--- a/src/checkstyle/checkstyle-suppressions.xml
+++ b/src/checkstyle/checkstyle-suppressions.xml
@@ -33,6 +33,9 @@
 	<suppress files=".*RabbitManager.*" checks="LineLengthCheck"/>
 	<suppress files=".*GenerateTestsMojo.*" checks="LineLengthCheck"/>
 	<suppress files=".*StubRunnerBoot.*" checks="LineLengthCheck"/>
+	<suppress files=".*StubRunnerBoot.*" checks="HideUtilityClassConstructor"/>
+	<suppress files=".*StubRunnerBoot.*" checks="FinalClass"/>
+	<suppress files=".*StubRunnerMain.*" checks="FinalClass"/>
 	<suppress files=".*StubRunnerJUnit5ExtensionCustomMessageVerifierTests.*" checks="RegexpSinglelineJavaCheck"/>
 	<suppress files=".*StubRunnerJUnit5ExtensionExceptionThrowingTests.*" checks="RegexpSinglelineJavaCheck"/>
 	<suppress files=".*StubRunnerSliceTests.*" checks="LineLengthCheck"/>