Add xml support #855
Merged
Add xml support #855
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/BodyMatchers.groovy # spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/converter/YamlContractConverterSpec.groovy
from xml while generating stubs. Fix and adjust tests to recent changes.
# Conflicts: # spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilder.groovy # spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/converter/ContractsToYaml.groovy # spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockRequestStubStrategy.groovy # spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/JsonToJsonPathsConverter.groovy # spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/converter/YamlContractConverterSpec.groovy
# Conflicts: # spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilder.groovy # spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/converter/ContractsToYaml.groovy # spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockRequestStubStrategy.groovy # spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/JsonToJsonPathsConverter.groovy # spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/converter/YamlContractConverterSpec.groovy
…andling XML lists in assertions.
…ons. Move XML-assert lib content to project sources. Add tests.
matchers processing.
| } | ||
|
|
||
| List<BodyMatcher> jsonPathMatchers() { |
There was a problem hiding this comment.
leave this method, deprecate it and delegate to the new one
.../main/groovy/org/springframework/cloud/contract/verifier/builder/BodyMethodGeneration.groovy
Show resolved
Hide resolved
| * @author Olga Maciaszek-Sharma | ||
| * @since 2.1.0 | ||
| */ | ||
| trait ClassVerifier { |
There was a problem hiding this comment.
@CompileStatic + a description of what it is used for?
| * @param path - the xPath expression to retrieve the value with | ||
| * @return {@link String} value of the XML node | ||
| */ | ||
| public static String valueFromXPath(Document parsedXml, String path) { |
There was a problem hiding this comment.
add @since to the public methods
Codecov Report
@@ Coverage Diff @@
## master #855 +/- ##
===========================================
+ Coverage 49.43% 51.04% +1.6%
- Complexity 2189 2316 +127
===========================================
Files 271 286 +15
Lines 10649 11134 +485
Branches 1723 1763 +40
===========================================
+ Hits 5264 5683 +419
- Misses 4542 4584 +42
- Partials 843 867 +24
Continue to review full report at Codecov.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes gh-322