Skip to content
This repository was archived by the owner on Dec 19, 2023. It is now read-only.

Commit 4e1a864

Browse files
fbenzfbenz
authored
1.0.13-SNAPSHOT and backport of required bean property support for Kotlin (#213)
1 parent 3801a6c commit 4e1a864

File tree

9 files changed

+27
-22
lines changed

9 files changed

+27
-22
lines changed

‎docs/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@
425425
<h1>Spring Auto REST Docs</h1>
426426
<div class="details">
427427
<span id="author" class="author">Scalable Capital</span><br>
428-
<span id="revnumber">version 1.0.12</span>
428+
<span id="revnumber">version 1.0.13-SNAPSHOT</span>
429429
</div>
430430
<div id="toc" class="toc2">
431431
<div id="toctitle">Table of Contents</div>
@@ -1841,8 +1841,8 @@ <h4 id="contributing-building-build"><a class="link" href="#contributing-buildin
18411841
</div>
18421842
<div id="footer">
18431843
<div id="footer-text">
1844-
Version 1.0.12<br>
1845-
Last updated 2018-03-23 13:37:35 CET
1844+
Version 1.0.13-SNAPSHOT<br>
1845+
Last updated 2018-03-23 17:38:01 CET
18461846
</div>
18471847
</div>
18481848
<link rel="stylesheet" href="highlight/styles/github.min.css">

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>capital.scalable</groupId>
77
<artifactId>spring-auto-restdocs-parent</artifactId>
8-
<version>1.0.12</version>
8+
<version>1.0.13-SNAPSHOT</version>
99
<packaging>pom</packaging>
1010

1111
<name>Spring Auto REST Docs Parent POM</name>

‎spring-auto-restdocs-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>capital.scalable</groupId>
99
<artifactId>spring-auto-restdocs-parent</artifactId>
10-
<version>1.0.12</version>
10+
<version>1.0.13-SNAPSHOT</version>
1111
<relativePath>..</relativePath>
1212
</parent>
1313

‎spring-auto-restdocs-core/src/main/java/capital/scalable/restdocs/jackson/FieldDocumentationObjectVisitor.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.
99
* You may obtain a copy of the License at
10-
*
10+
*
1111
* http://www.apache.org/licenses/LICENSE-2.0
12-
*
12+
*
1313
* Unless required by applicable law or agreed to in writing, software
1414
* distributed under the License is distributed on an "AS IS" BASIS,
1515
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -51,6 +51,11 @@ public FieldDocumentationObjectVisitor(SerializerProvider provider,
5151
this.typeFactory = typeFactory;
5252
}
5353

54+
@Override
55+
public void property(BeanProperty prop) throws JsonMappingException {
56+
optionalProperty(prop);
57+
}
58+
5459
@Override
5560
public void optionalProperty(BeanProperty prop) throws JsonMappingException {
5661
String jsonName = prop.getName();

‎spring-auto-restdocs-docs/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>capital.scalable</groupId>
88
<artifactId>spring-auto-restdocs-parent</artifactId>
9-
<version>1.0.12</version>
9+
<version>1.0.13-SNAPSHOT</version>
1010
<relativePath>..</relativePath>
1111
</parent>
1212

‎spring-auto-restdocs-example/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ apply plugin: "org.springframework.boot"
1717
apply plugin: "org.asciidoctor.convert"
1818

1919
group = "capital.scalable"
20-
version = "1.0.12"
20+
version = "1.0.13-SNAPSHOT"
2121

2222
description = """Spring Auto REST Docs Example Project"""
2323

‎spring-auto-restdocs-example/generated-docs/index.html

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1122,7 +1122,7 @@ <h4 id="_example_request"><a class="anchor" href="#_example_request"></a><a clas
11221122
<div class="content">
11231123
<pre class="highlightjs highlight"><code class="language-bash" data-lang="bash">$ curl 'http://localhost:8080/items' -i -X POST \
11241124
-H 'Content-Type: application/json' \
1125-
-H 'Authorization: Bearer d9bc0f66-a8df-4027-b68c-0b2cbd097099' \
1125+
-H 'Authorization: Bearer 2a36e8fa-c94b-447e-9fd8-64ac096be8f3' \
11261126
-d '{"description":"Hot News"}'</code></pre>
11271127
</div>
11281128
</div>
@@ -1359,7 +1359,7 @@ <h4 id="_example_request_2"><a class="anchor" href="#_example_request_2"></a><a
13591359
<div class="content">
13601360
<pre class="highlightjs highlight"><code class="language-bash" data-lang="bash">$ curl 'http://localhost:8080/items/1' -i -X PUT \
13611361
-H 'Content-Type: application/json' \
1362-
-H 'Authorization: Bearer d9bc0f66-a8df-4027-b68c-0b2cbd097099' \
1362+
-H 'Authorization: Bearer 2a36e8fa-c94b-447e-9fd8-64ac096be8f3' \
13631363
-d '{"description":"Hot News"}'</code></pre>
13641364
</div>
13651365
</div>
@@ -1465,7 +1465,7 @@ <h4 id="_example_request_3"><a class="anchor" href="#_example_request_3"></a><a
14651465
<div class="listingblock">
14661466
<div class="content">
14671467
<pre class="highlightjs highlight"><code class="language-bash" data-lang="bash">$ curl 'http://localhost:8080/items/1' -i -X DELETE \
1468-
-H 'Authorization: Bearer d9bc0f66-a8df-4027-b68c-0b2cbd097099'</code></pre>
1468+
-H 'Authorization: Bearer 2a36e8fa-c94b-447e-9fd8-64ac096be8f3'</code></pre>
14691469
</div>
14701470
</div>
14711471
</div>
@@ -1950,19 +1950,19 @@ <h4 id="_example_response_5"><a class="anchor" href="#_example_response_5"></a><
19501950
"page" : 0,
19511951
"size" : 20,
19521952
"sort" : null,
1953-
"offset" : 0,
19541953
"pageNumber" : 0,
1955-
"pageSize" : 20
1954+
"pageSize" : 20,
1955+
"offset" : 0
19561956
},
19571957
"total" : 1,
1958+
"totalElements" : 1,
19581959
"totalPages" : 1,
19591960
"last" : true,
1960-
"totalElements" : 1,
1961-
"size" : 20,
1962-
"number" : 0,
19631961
"sort" : null,
19641962
"numberOfElements" : 1,
1965-
"first" : true
1963+
"first" : true,
1964+
"size" : 20,
1965+
"number" : 0
19661966
}</code></pre>
19671967
</div>
19681968
</div>
@@ -2537,7 +2537,7 @@ <h4 id="_example_request_response_3"><a class="anchor" href="#_example_request_r
25372537
</div>
25382538
<div id="footer">
25392539
<div id="footer-text">
2540-
Last updated 2018-01-10 11:52:27 CET
2540+
Last updated 2018-01-30 18:01:20 CET
25412541
</div>
25422542
</div>
25432543
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.9.1/styles/github.min.css">

‎spring-auto-restdocs-example/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<groupId>capital.scalable</groupId>
1515
<artifactId>spring-auto-restdocs-example</artifactId>
16-
<version>1.0.12</version> <!-- not related to spring-auto-restdocs version -->
16+
<version>1.0.13-SNAPSHOT</version> <!-- not related to spring-auto-restdocs version -->
1717

1818
<name>Spring Auto REST Docs Example Project</name>
1919
<description>Example project for Spring Auto REST Docs</description>
@@ -36,7 +36,7 @@
3636
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3737
<start-class>capital.scalable.restdocs.example.Application</start-class>
3838
<spring-restdocs.version>1.2.3.RELEASE</spring-restdocs.version>
39-
<spring-auto-restdocs.version>1.0.12</spring-auto-restdocs.version>
39+
<spring-auto-restdocs.version>1.0.13-SNAPSHOT</spring-auto-restdocs.version>
4040
</properties>
4141

4242
<dependencies>

‎spring-auto-restdocs-json-doclet/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>capital.scalable</groupId>
77
<artifactId>spring-auto-restdocs-parent</artifactId>
8-
<version>1.0.12</version>
8+
<version>1.0.13-SNAPSHOT</version>
99
<relativePath>..</relativePath>
1010
</parent>
1111

0 commit comments

Comments
 (0)