From 1b41c2b1a8df151a9ed61a5de33c3e18de40fc04 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 13 Nov 2018 00:22:17 +0100 Subject: [PATCH] FIxed the algorithm of when to fetch contracts --- .../verifier/plugin/GradleContractsDownloader.groovy | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/GradleContractsDownloader.groovy b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/GradleContractsDownloader.groovy index 5b3bdc81ef..a8b7f61bbd 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/GradleContractsDownloader.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/GradleContractsDownloader.groovy @@ -1,21 +1,19 @@ package org.springframework.cloud.contract.verifier.plugin -import java.util.concurrent.ConcurrentHashMap - import groovy.transform.CompileStatic import groovy.transform.PackageScope import org.gradle.api.Project import org.gradle.api.logging.Logger - import org.springframework.cloud.contract.stubrunner.ContractDownloader import org.springframework.cloud.contract.stubrunner.StubConfiguration import org.springframework.cloud.contract.stubrunner.StubDownloader import org.springframework.cloud.contract.stubrunner.StubDownloaderBuilderProvider import org.springframework.cloud.contract.stubrunner.StubRunnerOptions import org.springframework.cloud.contract.stubrunner.StubRunnerOptionsBuilder -import org.springframework.cloud.contract.stubrunner.spring.StubRunnerProperties import org.springframework.cloud.contract.verifier.config.ContractVerifierConfigProperties import org.springframework.util.StringUtils + +import java.util.concurrent.ConcurrentHashMap /** * @author Marcin Grzejszczak */ @@ -64,7 +62,9 @@ class GradleContractsDownloader { } private boolean shouldDownloadContracts(ContractVerifierExtension extension) { - return extension.contractsMode != StubRunnerProperties.StubsMode.CLASSPATH + return extension.contractDependency != null && + StringUtils.hasText(extension.contractDependency.getArtifactId()) || + StringUtils.hasText(extension.contractRepository.repositoryUrl) } protected ContractDownloader contractDownloader(ContractVerifierExtension extension, StubConfiguration configuration) {