Commit Graph

545 Commits

Author SHA1 Message Date
Andy Wilkinson
a8e1df3fd8 Raise the minimum support version of Java to 8
Closes gh-388
2017-05-18 16:45:27 +02:00
Andy Wilkinson
ce8a296df0 Start work on 2.0 2017-05-16 16:12:02 +01:00
Andy Wilkinson
56a0495288 Update the samples to use the latest snapshots 2017-05-12 20:10:47 +01:00
Spring Buildmaster
add6e6932e Next development version 2017-05-12 19:04:54 +00:00
Andy Wilkinson
a440c28283 Merge branch '1.1.x' 2017-05-12 12:39:29 +01:00
Andy Wilkinson
bd63fae662 Update dependency versions in the samples to use latest snapshots 2017-05-12 12:39:14 +01:00
Andy Wilkinson
113976f2d9 Support documenting fields in XML payloads with any content type
Previously, the document fields in an XML payload, the request or
response had to have an application/xml content type. This prevented
documenting standard XML content types such as text/xml and
application/rss+xml as well as payloads with custom XML content types.

This commit updates the logic that sets up the ContentHandler to
first attempt to parse the content as JSON. If that fails it then
parses it as XML. If that fails an exception is thrown. This allows
any JSON or XML content, irrespective of the actual content type, to
be documented.

Closes gh-393
2017-05-12 12:35:15 +01:00
Andy Wilkinson
88db798b25 Update the dependency versions in the samples to use latest snapshots 2017-05-12 12:35:05 +01:00
Andy Wilkinson
a996041384 Merge branch '1.1.x' 2017-05-11 15:17:41 +01:00
Andy Wilkinson
b00b13fed5 Upgrade to spring-asciidoctor-extensions 0.1.1.RELEASE 2017-05-11 15:17:30 +01:00
Andy Wilkinson
cf77eabe04 Use code block switch extension from separate project
This should have been merged forwards following the changes in
70df55d413.

See gh-229
2017-05-11 15:15:00 +01:00
Andy Wilkinson
835c1a5546 Merge pull request #389 from jd1
* gh-389:
  Add missing quotes around value of snippets attribute
2017-04-26 14:49:15 +01:00
JD
9d4a118993 Add missing quotes around value of snippets attribute
Closes gh-389
2017-04-26 14:47:52 +01:00
Andy Wilkinson
6a3535c559 Exclude spring-restdocs-asciidoctor from Spring IO checks 2017-04-26 12:12:43 +01:00
Andy Wilkinson
a5e3e153ad Do not include spring-restdocs-asciidoctor in API documentation
Closes gh-391
2017-04-26 12:10:16 +01:00
Andy Wilkinson
d6eacfd819 Avoid duplicate cookies with Spring Framework 5's MockMvc
Closes gh-390
2017-04-26 11:57:18 +01:00
Spring Buildmaster
3ea51f2afa Next development version 2017-04-24 15:18:10 +00:00
Andy Wilkinson
d1424c90ca Ensure that provided dependency on asciidoctorj appears in generated pom
Closes gh-385
2017-04-24 15:58:17 +01:00
Andy Wilkinson
a11423d1f5 Merge branch '1.1.x' 2017-04-24 15:56:35 +01:00
Spring Buildmaster
72d692107f Next development version 2017-04-24 13:19:52 +00:00
Andy Wilkinson
12b5927396 Merge pull request #383 from Gerrit Meier
* gh-383:
  Add plugin snapshot repository to Data REST sample
2017-04-24 13:09:22 +01:00
Gerrit Meier
419547dcdf Add plugin snapshot repository to Data REST sample
Previously, if the main project hadn't been installed in the local
Maven repository (./gradlew install), rest-notes-spring-data-rest
would fail to build as the plugin dependency,
spring-restdocs-asciidoctor, was not available.

This commit corrects the problem by adding
repo.spring.io/libs-snapshot as a plugin repository in addition to
its existing declaration as a "normal" repository.

Fixes gh-382
Closes gh-383
2017-04-24 13:08:53 +01:00
Andy Wilkinson
1e2f2fdd35 Upgrade Spring Boot-based samples to use 1.5.3.RELEASE
Closes gh-358
2017-04-24 12:59:50 +01:00
Andy Wilkinson
a91bc22b8e Merge pull request #379 from Tomasz Kopczynski
* gh-379:
  Include request body and response body default snippets list
2017-04-10 09:35:12 +01:00
Tomasz Kopczynski
30fa6bcc5f Include request body and response body default snippets list
Closes gh-379
2017-04-10 09:32:38 +01:00
Andy Wilkinson
9f67eaab70 List REST Assured dependencies as optional in pom
Previously, the use of compileOnly meant that the REST Assured
dependencies were omitted from pom for spring-restdocs-restassured.
This commit correct thr problem by using the propdeps' plugin's
optional configuration instead.

Closes gh-372
2017-04-07 17:03:32 +01:00
Andy Wilkinson
704257e93b Align generated Set-Cookie header with RFC 6265
Closes gh-378
2017-04-07 16:59:49 +01:00
Andy Wilkinson
93f4f11260 Merge pull request #377 from Johnny Lim
* gh-377:
  Fix typo in Asciidoctor attributes configuration
2017-03-31 11:36:59 +01:00
Johnny Lim
dd00ce05aa Fix typo in Asciidoctor attributes configuration
Closes gh-377
2017-03-31 11:36:51 +01:00
Andy Wilkinson
11483d738d Merge pull request #375 from Johnny Lim
* gh-375:
  Fix typo in name of local variable in CurlRequestSnippet
2017-03-28 09:22:50 +01:00
Johnny Lim
4a1facd1e6 Fix typo in name of local variable in CurlRequestSnippet
Closes gh-375
2017-03-28 09:22:37 +01:00
Andy Wilkinson
3262149283 Merge branch '1.1.x' 2017-03-24 14:46:38 +00:00
Andy Wilkinson
af0cd029c7 Ensure that samples' REST Docs version is updated before they are built 2017-03-24 14:42:09 +00:00
Andy Wilkinson
ea20363c62 Merge branch '1.1.x' 2017-03-23 12:36:19 +00:00
Andy Wilkinson
b6120cd539 Fix broken cross-reference 2017-03-23 12:33:09 +00:00
Andy Wilkinson
b1227ce019 Remove recommendation about tweaking Surefire's configuration
Configuring Surefire to run tests found in files ending in
Documentation.java has the unwanted side-effect of switching off its
defaults, i.e. you end up with your documentation tests being run and
nothing else. While using a specific name for your documentation tests
can make them easier to identify, it isn't required. The documentation
also doesn't explicitly recommend using a Documentation suffix.

This commit simplifies things by removing the configuration that
changes Surefire's default inclusions.

Closes gh-368
2017-03-23 12:19:08 +00:00
Andy Wilkinson
14da4b954a Upgrade main build and Gradle-based samples to Gradle 3.4.1 2017-03-23 11:59:13 +00:00
Andy Wilkinson
ab1613ed63 Add support for using a wildcard when documenting a payload field
Closes gh-265
2017-03-23 11:05:48 +00:00
Andy Wilkinson
78982cf515 Add support for REST Assured 3
Closes gh-262
2017-03-20 21:39:25 +00:00
Andy Wilkinson
7fe5efab86 Merge pull request #348 from Tomasz Kopczynski
* gh-348:
  Polish "Provide more control of formatting of curl and HTTPie commands"
  Line breaks in cURL and HTTPie snippets
2017-03-20 20:11:34 +00:00
Andy Wilkinson
a6d322007b Polish "Provide more control of formatting of curl and HTTPie commands"
See gh-348
Closes gh-260
2017-03-20 20:11:31 +00:00
Tomasz Kopczynski
2cb9d36ef1 Line breaks in cURL and HTTPie snippets
Closes gh-260
2017-03-20 20:11:31 +00:00
Andy Wilkinson
82164348f3 Merge pull request #369 from Johnny Lim
* gh-369:
  Fix typo in value of snippets attribute
2017-03-20 09:27:43 +00:00
Johnny Lim
39fabc28d4 Fix typo in value of snippets attribute
Closes gh-369
2017-03-20 09:26:42 +00:00
Andy Wilkinson
d486a16714 Reduce the complexity of MockMvcResponseConverter.generateSetCookieHeader 2017-03-13 21:28:20 +00:00
Andy Wilkinson
5e2be5554c Merge pull request #340 from Tomasz Kopczynski
* gh-305:
  Polish "Include cookies in the HTTP response snippet"
  Include cookies in the HTTP response snippet
2017-03-13 20:47:16 +00:00
Andy Wilkinson
1b5e75ff2c Polish "Include cookies in the HTTP response snippet"
See gh-340
Closes gh-305
2017-03-13 20:46:05 +00:00
Tomasz Kopczynski
46190535f7 Include cookies in the HTTP response snippet
See gh-305
Closes gh-340
2017-03-13 20:44:33 +00:00
Andy Wilkinson
ece826166f Merge branch '1.1.x' 2017-03-08 13:07:50 +00:00
Andy Wilkinson
5a76decc11 Link to correct branch on GitHub in snapshot documentation
Closes gh-367
2017-03-08 13:07:09 +00:00