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

Merge branch '2.1.x'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2019-11-08 15:05:01 +01:00
parent ec64e93d8d 207617d4ce
commit 1f8ea546d2
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/OptionalProperty.java
View File

@@ -44,14 +44,21 @@ public class OptionalProperty implements Serializable, CanBeDynamic {
}
public String value() {
if (this.value == null) {
return valueToCheck(this.value).toString();
}
private Object valueToCheck(Object value) {
if (value == null) {
return "";
}
else if (this.value instanceof RegexProperty) {
return ((RegexProperty) this.value).pattern();
else if (value instanceof ClientDslProperty) {
return valueToCheck(((ClientDslProperty) value).getClientValue());
}
else if (value instanceof RegexProperty || value instanceof Pattern) {
return new RegexProperty(value).pattern();
}
else {
return this.value.toString();
return value.toString();
}
}