Removed deprecations (#2307)

- removed some unused methods and parameters
- removed one, deprecated kotlin DSL method
- removed Gradle plugin reading src/test/resources/contracts folder

Signed-off-by: marcin <[email protected]>

Author: marcingrzejszczak

specs/spring-cloud-contract-spec-kotlin/src/main/kotlin/org/springframework/cloud/contract/spec/internal/ResponseDsl.kt

@@ -71,11 +71,6 @@ class ResponseDsl : CommonDsl() {
 
     fun fixedMilliseconds(delay: Int): DslProperty<Any> = delay.toDslProperty()
 
-	/**
-	 * @deprecated Use the {@link #fixedMilliseconds(int) fixedMilliseconds} method.
-	 */
-	fun fixedMilliseconds(delay: Long): DslProperty<Any> = fixedMilliseconds(delay.toInt())
-
     fun headers(headers: HeadersDsl.() -> Unit) {
         this.headers = ResponseHeadersDsl().apply(headers).get()
     }

specs/spring-cloud-contract-spec-kotlin/src/test/kotlin/org/springframework/cloud/contract/spec/ContractTests.kt

@@ -781,7 +781,7 @@ then:
 				}
 			}
 			response {
-				delay = fixedMilliseconds(1000L)
+				delay = fixedMilliseconds(1000)
 				status = OK
 				body = body(
 						listOf(

spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRepository.java

@@ -136,15 +136,6 @@ public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) throws IO
 		return mappingDescriptors;
 	}
 
-	private ContractConverter contractConverter(File file) {
-		for (ContractConverter converter : this.contractConverters) {
-			if (converter.isAccepted(file)) {
-				return converter;
-			}
-		}
-		return null;
-	}
-
 	private boolean httpServerStubAccepts(File file) {
 		for (HttpServerStub httpServerStub : this.httpServerStubs) {
 			if (httpServerStub.isAccepted(file)) {

spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/AbstractGitTest.java

@@ -61,7 +61,7 @@ File createNewFile(File project) throws Exception {
 		return newFile;
 	}
 
-	void setOriginOnProjectToTmp(File origin, File project, boolean push)
+	void setOriginOnProjectToTmp(File origin, File project)
 			throws GitAPIException, IOException, URISyntaxException {
 		try (Git git = openGitProject(project)) {
 			RemoteRemoveCommand remove = git.remoteRemove();

spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/ContractProjectUpdaterTest.java

@@ -59,7 +59,7 @@ public void setup() throws Exception {
 		this.origin = clonedProject(this.tmp.newFolder(), this.originalProject);
 		this.project = this.gitRepo.cloneProject(this.originalProject.toURI());
 		this.gitRepo.checkout(this.project, "master");
-		setOriginOnProjectToTmp(this.origin, this.project, true);
+		setOriginOnProjectToTmp(this.origin, this.project);
 		StubRunnerOptions options = new StubRunnerOptionsBuilder()
 			.withStubRepositoryRoot("file://" + this.project.getAbsolutePath() + "/")
 			.withStubsMode(StubRunnerProperties.StubsMode.REMOTE)

spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/GitRepoTests.java

@@ -133,7 +133,7 @@ public void should_not_commit_empty_changes() throws Exception {
 	public void should_push_changes_to_current_branch() throws Exception {
 		File origin = clonedProject(this.tmp.newFolder(), this.project);
 		File project = this.gitRepo.cloneProject(this.project.toURI());
-		setOriginOnProjectToTmp(origin, project, true);
+		setOriginOnProjectToTmp(origin, project);
 		createNewFile(project);
 		this.gitRepo.commit(project, "some message");
 
@@ -149,7 +149,7 @@ public void should_push_changes_to_current_branch() throws Exception {
 	public void should_pull_changes_to_current_branch() throws Exception {
 		File origin = clonedProject(this.tmp.newFolder(), this.project);
 		File project = this.gitRepo.cloneProject(this.project.toURI());
-		setOriginOnProjectToTmp(origin, project, false);
+		setOriginOnProjectToTmp(origin, project);
 		createNewFile(origin);
 		this.gitRepo.commit(origin, "some message");
 

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.java

@@ -383,18 +383,7 @@ private TaskProvider<ContractsCopyTask> registerCopyContractsTask(ContractVerifi
 									if (contractsDslDir.getAsFile().exists()) {
 										return contractsDslDir;
 									}
-									else {
-										Directory legacyContractsDslDir = layout.getProjectDirectory()
-												.dir("src/test/resources/contracts");
-										if (legacyContractsDslDir.getAsFile().exists()) {
-											logger.warn(
-													"Spring Cloud Contract Verifier Plugin: Locating contracts in <src/test/resources/contracts> has been removed. Please move them to <src/contractTest/resources/contracts>. This warning message will be removed in a future release.");
-											return contractsDslDir;
-										}
-										else {
-											return null;
-										}
-									}
+									return null;
 								});
 							}));
 					contractsCopyTask.getContractDependency().getGroupId()