SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed deprecations

Browse Source
This commit is contained in:
Marcin Grzejszczak
2021-11-16 22:59:15 +01:00
parent bf1c8af2e3
commit 6fd4280d12
32 changed files with 197 additions and 659 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/BaseClassProvider.java
View File

@@ -49,7 +49,7 @@ class BaseClassProvider {
return mapping.get().getValue();
}
}
if (StringUtils.isEmpty(packageWithBaseClasses)) {
if (!StringUtils.hasText(packageWithBaseClasses)) {
return baseClassForTests;
}
String generatedClassName = generateDefaultBaseClassName(contractPackage, packageWithBaseClasses);

4
spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/file/ContractFileScanner.java
View File

@@ -37,7 +37,6 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import org.codehaus.plexus.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import wiremock.com.google.common.collect.HashMultiset;
@@ -52,6 +51,7 @@ import org.springframework.cloud.contract.verifier.util.ContractVerifierDslConve
import org.springframework.core.io.support.SpringFactoriesLoader;
import org.springframework.util.CollectionUtils;
import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils;
/**
* Scans the provided file path for the DSLs. There's a possibility to provide inclusion
@@ -257,7 +257,7 @@ public class ContractFileScanner {
boolean excluded = matchesPattern(file, excludeMatchers);
if (!excluded) {
boolean contractFile = isContractFile(file);
boolean included = StringUtils.isEmpty(includeMatcher)
boolean included = !StringUtils.hasText(includeMatcher)
|| file.getAbsolutePath().matches(includeMatcher);
included = !CollectionUtils.isEmpty(includeMatchers) ? matchesPattern(file, includeMatchers) : included;
if (contractFile && included) {

2
spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/amqp/SpringAmqpStubMessages.java
View File

@@ -44,7 +44,7 @@ import org.springframework.cloud.contract.verifier.util.MetadataUtil;
import org.springframework.messaging.MessageHeaders;
import org.springframework.util.Assert;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mockingDetails;
import static org.mockito.Mockito.verify;

3
spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/util/ToFileContractsTransformer.java
View File

@@ -82,7 +82,8 @@ public final class ToFileContractsTransformer {
Collection<Contract> contracts = collectContractDescriptors(new File(path));
log.info("Found [{}] contract definition", contracts.size());
Class<?> name = Class.forName(fqn);
ContractConverter<Collection> contractConverter = (ContractConverter) name.newInstance();
ContractConverter<Collection> contractConverter = (ContractConverter) name.getDeclaredConstructors()[0]
.newInstance();
Collection converted = contractConverter.convertTo(contracts);
log.info("Successfully converted contracts definitions");
Map<String, byte[]> stored = contractConverter.store(converted);