From 88e27ede80d7f3e591682eb07e4db1534a56273d Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin.grzejszczak@gmail.com>
Date: Mon, 16 Nov 2020 08:19:11 +0100
Subject: [PATCH] Removed jetbrains imports

---
 .../cloud/contract/stubrunner/PactStubDownloaderBuilder.java   | 3 ---
 .../contract/stubrunner/PactStubDownloaderBuilderSpec.groovy   | 2 --
 .../cloud/contract/verifier/http/OkHttpHttpVerifier.java       | 2 --
 3 files changed, 7 deletions(-)

diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/java/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilder.java b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/java/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilder.java
index c1e0fb7cbf..9ac4256039 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/java/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilder.java
+++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/java/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilder.java
@@ -43,7 +43,6 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jetbrains.annotations.NotNull;
 
 import org.springframework.cloud.contract.spec.Contract;
 import org.springframework.cloud.contract.stubrunner.spring.StubRunnerProperties;
@@ -228,7 +227,6 @@ class PactStubDownloader implements StubDownloader {
 		return stubConfiguration.getArtifactId();
 	}
 
-	@NotNull
 	PactLoader pactBrokerLoader(ValueResolver resolver, List<String> tags) throws IOException {
 		Resource repo = this.stubRunnerOptions.getStubRepositoryRoot();
 		String schemeSpecificPart = schemeSpecificPart(repo.getURI());
@@ -312,7 +310,6 @@ class PactStubDownloader implements StubDownloader {
 		return part.startsWith("//") ? part.substring(2) : part;
 	}
 
-	@NotNull
 	private List<String> tags(String version, ValueResolver resolver) {
 		String defaultTag = StubConfiguration.DEFAULT_VERSION.equals(version) ? "latest" : version;
 		return new ArrayList<>(Arrays.asList(StringUtils
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/groovy/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilderSpec.groovy b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/groovy/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilderSpec.groovy
index 005738aa0f..204a4675c3 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/groovy/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilderSpec.groovy
+++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/groovy/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilderSpec.groovy
@@ -23,7 +23,6 @@ import au.com.dius.pact.core.model.PactSource
 import au.com.dius.pact.provider.junit.loader.PactLoader
 import au.com.dius.pact.core.support.expressions.ValueResolver
 import com.github.tomakehurst.wiremock.stubbing.StubMapping
-import org.jetbrains.annotations.NotNull
 import spock.lang.Ignore
 import spock.lang.Specification
 
@@ -61,7 +60,6 @@ class PactStubDownloaderBuilderSpec extends Specification {
 					.withProperties(props())
 					.build()
 			PactStubDownloader downloader = new PactStubDownloader(options) {
-				@NotNull
 				@Override
 				PactLoader pactBrokerLoader(ValueResolver resolver,
 						List<String> tags) {
diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/http/OkHttpHttpVerifier.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/http/OkHttpHttpVerifier.java
index 4396e0dde3..8cffb4fac1 100644
--- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/http/OkHttpHttpVerifier.java
+++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/http/OkHttpHttpVerifier.java
@@ -30,7 +30,6 @@ import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Protocol;
 import okhttp3.RequestBody;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * {@link HttpVerifier} implementation that uses {@link OkHttpClient}. Has an inbuilt
@@ -115,7 +114,6 @@ public class OkHttpHttpVerifier implements HttpVerifier {
 				.build();
 	}
 
-	@Nullable
 	private RequestBody requestBody(Request request, String requestContentType) {
 		if (request.body() == null) {
 			return null;