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

Bumped RestAssured to 6.0.0

Browse Source
This commit is contained in:
Marcin Grzejszczak
2022-05-04 14:35:12 +02:00
parent b7a9e29062
commit adc513b45b
63 changed files with 1052 additions and 1224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/JsonToJsonPathsConverter.groovy
View File

@@ -62,12 +62,6 @@ class JsonToJsonPathsConverter {
private final boolean assertJsonSize
// Use constructor with dedicated input param instead
@Deprecated
JsonToJsonPathsConverter(ContractVerifierConfigProperties configProperties) {
assertJsonSize = configProperties.assertJsonSize
}
JsonToJsonPathsConverter(boolean assertJsonSize) {
this.assertJsonSize = assertJsonSize
}

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

@@ -108,130 +108,6 @@ public class ContractFileScanner {
return pathMatchers;
}
/**
* @return for a map of paths for which a list of matching contracts has been found
* @deprecated use the {@link ContractFileScanner#findContractsRecursively} version
*/
@Deprecated
public ListMultimap<Path, ContractMetadata> findContracts() {
MultiValueMap<Path, ContractMetadata> contracts = findContractsRecursively();
return new ListMultimap<Path, ContractMetadata>() {
@Override
public List<ContractMetadata> get(Path key) {
return contracts.get(key);
}
@Override
public List<ContractMetadata> removeAll(Object key) {
return contracts.remove(key);
}
@Override
public List<ContractMetadata> replaceValues(Path key, Iterable<? extends ContractMetadata> values) {
return contracts.put(key, asList(values));
}
List<ContractMetadata> asList(Iterable<? extends ContractMetadata> self) {
if (self instanceof List) {
return (List<ContractMetadata>) self;
}
else {
return toList(self.iterator());
}
}
private List<ContractMetadata> toList(Iterator<? extends ContractMetadata> self) {
List<ContractMetadata> answer = new ArrayList<>();
while (self.hasNext()) {
answer.add(self.next());
}
return answer;
}
@Override
public Map<Path, Collection<ContractMetadata>> asMap() {
return contracts.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
}
@Override
public int size() {
return contracts.size();
}
@Override
public boolean isEmpty() {
return contracts.isEmpty();
}
@Override
public boolean containsKey(Object key) {
return contracts.containsKey(key);
}
@Override
public boolean containsValue(Object value) {
return contracts.entrySet().stream().anyMatch(it -> it.getValue().contains(value));
}
@Override
public boolean containsEntry(Object key, Object value) {
return contracts.entrySet().stream()
.anyMatch(it -> it.getKey().equals(key) && it.getValue().contains(value));
}
@Override
public boolean put(Path key, ContractMetadata value) {
contracts.add(key, value);
return true;
}
@Override
public boolean remove(Object key, Object value) {
return contracts.getOrDefault(key, new ArrayList<>()).remove(value);
}
@Override
public boolean putAll(Path key, Iterable<? extends ContractMetadata> values) {
return contracts.getOrDefault(key, new ArrayList<>())
.addAll(StreamSupport.stream(values.spliterator(), false).collect(Collectors.toList()));
}
@Override
public boolean putAll(Multimap<? extends Path, ? extends ContractMetadata> multimap) {
multimap.entries().forEach(it -> contracts.add(it.getKey(), it.getValue()));
return true;
}
@Override
public void clear() {
contracts.clear();
}
@Override
public Set<Path> keySet() {
return contracts.keySet();
}
@Override
public Multiset<Path> keys() {
return HashMultiset.create(contracts.keySet());
}
@Override
public Collection<ContractMetadata> values() {
return contracts.values().stream().flatMap(Collection::stream).collect(Collectors.toList());
}
@Override
public Collection<Map.Entry<Path, ContractMetadata>> entries() {
Collection<Map.Entry<Path, ContractMetadata>> entries = new LinkedList<>();
contracts.forEach(
(path, list) -> list.forEach(c -> entries.add(new AbstractMap.SimpleEntry<>(path, c))));
return entries;
}
};
}
public MultiValueMap<Path, ContractMetadata> findContractsRecursively() {
MultiValueMap<Path, ContractMetadata> result = CollectionUtils.toMultiValueMap(new LinkedHashMap<>());
appendRecursively(baseDir, result);

19
spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/util/ContractVerifierDslConverter.java
View File

@@ -67,25 +67,6 @@ public class ContractVerifierDslConverter implements ContractConverter<Collectio
private static final RuntimeJavaCompiler COMPILER = new RuntimeJavaCompiler();
/**
* @deprecated - use
* {@link ContractVerifierDslConverter#convertAsCollection(java.io.File, java.lang.String)}
*/
@Deprecated
public static Collection<Contract> convertAsCollection(String dsl) {
try {
Object object = groovyShell().evaluate(dsl);
return listOfContracts(object);
}
catch (DslParseException e) {
throw e;
}
catch (Exception e) {
LOG.error("Exception occurred while trying to evaluate the contract", e);
throw new DslParseException(e);
}
}
public static Collection<Contract> convertAsCollection(File rootFolder, String dsl) {
ClassLoader classLoader = ContractVerifierDslConverter.class.getClassLoader();
try {