Commit Graph

593 Commits

Author SHA1 Message Date
Andy Wilkinson
39733893c1 Upgrade to Spring Framework 4.3.15
Closes gh-499
2018-04-04 09:08:05 +01:00
Andy Wilkinson
baa8e6bb90 Document an example of the operation macro's equivalent Asciidoctor
Closes gh-470
2018-03-28 10:10:10 +01:00
Andy Wilkinson
1c08000bcf Retain subsection extractor when adding field descriptors with prefix
Closes gh-480
2018-03-28 09:46:27 +01:00
Andy Wilkinson
7924d5fb01 Disable formatting of monospaced text in Asciidoctor templates
Previously, if text enclosed in ` characters contained multiple *
characters, the *s would be removed and the characters they enclosed
would become bold.

This commit escapes the text by enclosing it in + characters in
addition to the existing, enclosing ` characters. The `+text+`
arrangement retains the monospace formatting be disables any further
formatting of the text.

Closes gh-474
2018-03-27 16:08:11 +01:00
Andy Wilkinson
0b0c9e1cc4 Perform attribute substitution on operation macro's target
Closes gh-491
2018-03-27 15:24:00 +01:00
Andy Wilkinson
ecbb3a8d67 Merge pull request #477 from Pierre-Jean Vardanega
* gh-477:
  Convert query parameters list as param=1&param=2 instead of param=1,2
2018-03-27 14:26:14 +01:00
Pierre-Jean Vardanega
586de30212 Convert query parameters list as param=1&param=2 instead of param=1,2
Closes gh-477
2018-03-27 14:25:33 +01:00
Andy Wilkinson
a7e91ad63f Merge pull request #488 from Johnny Lim
* gh-488:
  Add HTTP method option unconditionally in curl command
2018-03-27 14:08:31 +01:00
Johnny Lim
da64c55fce Add HTTP method option unconditionally in curl command
Closes gh-488
2018-03-27 14:07:47 +01:00
Andy Wilkinson
95c4234c99 Format core code with Eclipse Oxygen's formatter 2018-03-27 12:53:34 +01:00
Andy Wilkinson
f651c30e03 Merge pull request #482 from bartolom
* gh-482:
  Quote cols attribute in Asciidoc table example
2018-02-19 12:37:48 +00:00
bartolom
7e3417e124 Quote cols attribute in Asciidoc table example
Closes gh-482
2018-02-19 12:36:25 +00:00
Andy Wilkinson
80bb632849 Warn against the use of org.asciidoctor.convert 1.5.6
Closes gh-438
2018-02-05 12:25:12 +00:00
Andy Wilkinson
874bfd119e Update samples to use 1.2.4 snapshots 2017-11-28 09:23:03 +00:00
Spring Buildmaster
fe9ec0ea1c Next development version 2017-11-28 09:19:01 +00:00
Andy Wilkinson
4d710d9143 Merge pull request #449 from Michael Simons
* gh-449:
  Fix name of self rel in reference documentation
2017-11-11 18:58:18 +00:00
Michael J. Simons
92b6268da4 Fix name of self rel in reference documentation
Closes gh-449
2017-11-11 18:57:42 +00:00
Andy Wilkinson
90c3549f55 Refine ordering of default, operation, and additional snippets
Previously, the ordering was:

1. Operation snippets
2. Default snippets
3. Additional snippets

This meant that any operation snippets (those specifically configured
for the documentation of the particular operation) would be
overwritten by the output of the default snippets.

This commit updates the ordering to the following:

1. Default snippets
2. Operation snippets
3. Additional snippets

Closes gh-453
2017-11-07 17:52:02 +00:00
Andy Wilkinson
abe36e3b54 Ensure that section heading appears in reference documentation
Asciidoctor appears to apply two blanks lines beneath a code block
at the end of an included file otherwise the section heading that
opens the following included file will be omitted.

Closes gh-442
2017-10-27 12:08:11 +01:00
Andy Wilkinson
473e3e1a7b Correct end tag in included source so that it matches opening tag
Closes gh-441
2017-10-23 15:47:42 +01:00
Andy Wilkinson
dfe856815d Correct section IDs so that all sections are uniquely identified
Closes gh-440
2017-10-23 15:46:42 +01:00
Andy Wilkinson
07bca1875f Replace placeholders in snippet name as well as the operation name
Previously, StandardWriterResolver only replaced placeholders in the
operation name. This meant that the name and location of generated
snippets was unnecessarily limited.

This commit makes things more flexible by updating
StandardWriterResolver to replace placeholders in the snippet name
as well.

Closes gh-403
2017-10-20 10:56:07 +01:00
Andy Wilkinson
f62b0f3ce7 Support documentation of a required field beneath an optional field
Previously, if a field nested beneath an optional field was documented
and was required, it would be identified as missing even if its
optional ancestor was missing. This made it impossible to document
required fields of an optional subsection of a payload.

This commit updates JsonContentHandler to consider a field’s ancestors
when determining if it should be reported as missing. If the field
field has an optional ancestor that is not present, the field is not
considered to be missing if it too is not present. If the field has
an optional ancestor that is present then the field is considered to
be missing if it is not present.

Closes gh-429
2017-10-20 10:05:26 +01:00
Andy Wilkinson
ead32c3f88 Merge pull request #436 from Johnny Lim
* gh-436:
  Polish tests
2017-10-20 09:57:22 +01:00
Johnny Lim
aeb12673ae Polish tests
Closes gh-436
2017-10-20 09:39:59 +01:00
Andy Wilkinson
caf01d1f21 Revert "Make sure that spring-aop is available at test runtime"
This reverts commit 26707cd7ac.

See gh-411
2017-10-13 11:42:33 +01:00
Andy Wilkinson
440997c72b Merge pull request #431 from Johnny Lim
* gh-431:
  Polish “Reuse ObjectMapper in FieldPathPayloadSubsectionExtractor”
  Reuse ObjectMapper in FieldPathPayloadSubsectionExtractor
2017-10-12 10:36:57 +01:00
Andy Wilkinson
0c8ec11c9c Polish “Reuse ObjectMapper in FieldPathPayloadSubsectionExtractor” 2017-10-12 10:36:23 +01:00
Johnny Lim
9bd9fa31dc Reuse ObjectMapper in FieldPathPayloadSubsectionExtractor
Closes gh-431
2017-10-12 10:33:40 +01:00
Andy Wilkinson
d1881c30e2 Update the samples to use the latest snapshots 2017-09-28 06:57:44 +01:00
Spring Buildmaster
f6002a00a3 Next development version 2017-09-28 05:54:30 +00:00
Andy Wilkinson
9e3a3c0536 Upgrade to latest version of JRuby to avoid problems on Windows
See https://github.com/jruby/jruby/issues/4745
2017-09-23 19:45:59 +01:00
Andy Wilkinson
47bcc45e45 Upgrade dependencies 2017-09-23 18:00:17 +01:00
Andy Wilkinson
d22dc1e211 Include filename in Content-Disposition header when available
Closes gh-425
2017-09-23 17:40:22 +01:00
Andy Wilkinson
7c6c2e7523 Polish 2017-09-23 17:20:03 +01:00
Andy Wilkinson
a084175afd Fix field extraction and type resolution beneath arrays and wildcards
Fixes gh-422
Fixes gh-423
2017-09-23 16:40:12 +01:00
Andy Wilkinson
4854bc949f Fix type resolution for fields with null and non-null values
Closes gh-398
2017-09-23 16:40:07 +01:00
Andy Wilkinson
a123e06d06 Update build status image URL following changes to Bamboo 2017-07-17 09:02:55 +01:00
Andy Wilkinson
26707cd7ac Make sure that spring-aop is available at test runtime
Closes gh-411
2017-07-09 11:08:15 +01:00
Andy Wilkinson
a38a512033 Require occasionally null or absent field in array to be marked optional
Closes gh-402
2017-07-02 10:29:27 +01:00
Andy Wilkinson
a84bb0c569 Make new snippet relaxed when adding descriptors to relaxed snippet
Closes gh-400
2017-07-01 16:27:40 +01:00
Andy Wilkinson
214c068ece Remove Accept: */* header from REST Assured requests
Closes gh-404
2017-07-01 16:05:31 +01:00
Andy Wilkinson
eac0e2c2d3 Merge branch 'gh-398' into 1.2.x 2017-07-01 11:13:10 +01:00
Andy Wilkinson
6bf1edcd09 Improve handling of null fields beneath an array
Previously, if an array contained objects where a field was sometimes
null and sometimes had a value of a consistent type, the type inferred
type was varies. Furthermore, it was not possible for the user to
specify a type other than varies as a mismatch would be detected.

This commit updates JsonFieldTypeResolver so that, when dealing with
an imprecise field path (i.e. a path for a field within an array),
null values that don't match the common type for the field are
ignored. This produces the following behavior when nulls are involved:

- All null fields results in the null type
- A mixture of nulls and a particular type results in the particular
  type
- A mixture of nulls and two or more other types results in the varies
  type

Closes gh-398
2017-07-01 11:07:38 +01:00
Andy Wilkinson
5cef4745f7 Polish new response fields test and add equivalent for request fields
See gh-399
2017-07-01 10:57:26 +01:00
Nakul Chaudhari
288ebf771a Add a test that shows problem with sometimes null field within an array
Closes gh-399
2017-07-01 10:52:26 +01:00
Andy Wilkinson
dff9062a32 Fix formatting problems in the documentation
Previously, the included .adoc files did not consistently end with a 
blank line. In certain cases, Asciidoctor requires a blank line before a
new section. As a result, the lack of blank lines meant that some
section headings did not appear correctly.

This commit updates each of the included .adoc files in the
documentation to ensure that each ends with a blank line.
2017-06-30 19:56:56 +01:00
Andy Wilkinson
2650bd3bac Merge pull request #409 from Oliver Zeit
* gh-409:
  Fix formatting of reference to HeaderDocumentation in the docs
2017-06-30 19:56:19 +01:00
ooz
a8d51da4f4 Fix formatting of reference to HeaderDocumentation in the docs
Closes gh-409
2017-06-30 19:56:08 +01:00
Andy Wilkinson
ba327f1e9a Ensure that all nodes for a snippet refer to main document
Previously, when the operation block macro rendered the fragment
for a snippet, every top-level block in the fragment had its parent
set. Setting the parent has the side-effect of also setting the
block's document to be that of its parent. This meant that every
top-level block's document referred to the main document, but any
descendents were left with their document referring to the fragment
document. This did not cause a problem with the HTML backend (which
does not consider a block's document) but the PDF backend does
consider a block's document resulting in the descendents being
omitted from the generated PDF.

This commit updates the operation block macro to set the parent of
every block in the fragment to its correct value. This has the
side-effect of causing the block to update its document reference to
point to the main document.

Closes gh-396
2017-05-30 13:11:01 +01:00