Skip to content

Commit d999a35

Browse files
authored
Replaced swagger2markup maven plugin with openapi-generator (#928)
* Replaced swagger2markup maven plugin with openapi-generator Signed-off-by: Paolo Patierno <[email protected]> * Fixed local path issue to the snippet dir Signed-off-by: Paolo Patierno <[email protected]> * Added OpenAPI validation during documentation build Fixed OpenAPI v3 spec for missing items def under array types Signed-off-by: Paolo Patierno <[email protected]> * Fixed scholzj comments Signed-off-by: Paolo Patierno <[email protected]> * Removed JCenter repository Signed-off-by: Paolo Patierno <[email protected]> * Fixed key and value schemas to be consistent across consumer and producer records Signed-off-by: Paolo Patierno <[email protected]> * Fixed key and value schemas to be consistent across consumer and producer records on OpenAPI v2 Signed-off-by: Paolo Patierno <[email protected]> * Extracted a common RecordKey and RecordValue components for consumer and producer record definitions Signed-off-by: Paolo Patierno <[email protected]> * Fixed openapi related test Signed-off-by: Paolo Patierno <[email protected]> --------- Signed-off-by: Paolo Patierno <[email protected]>
1 parent 4cb7075 commit d999a35

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+4627
-2047
lines changed

Makefile

+5-3
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,19 @@ release_package: java_package
5050
docu_html: docu_htmlclean docu_check
5151
mkdir -p documentation/html
5252
$(CP) -vrL documentation/book/images documentation/html/images
53-
asciidoctor -v --failure-level WARN -t -dbook -a ProductVersion=$(RELEASE_VERSION) documentation/book/bridge.adoc -o documentation/html/bridge.html
53+
# override snippetDir for asciidoctor to get right path to the snippets
54+
asciidoctor -v --failure-level WARN -t -dbook -a ProductVersion=$(RELEASE_VERSION) -a snippetDir=${PWD}/documentation/book/api/snippet/ documentation/book/bridge.adoc -o documentation/html/bridge.html
5455

5556
.PHONY: docu_htmlnoheader
5657
docu_htmlnoheader: docu_htmlnoheaderclean docu_check
5758
mkdir -p documentation/htmlnoheader
5859
$(CP) -vrL documentation/book/images documentation/htmlnoheader/images
59-
asciidoctor -v --failure-level WARN -t -dbook -a ProductVersion=$(RELEASE_VERSION) -s documentation/book/bridge.adoc -o documentation/htmlnoheader/bridge.html
60+
# override snippetDir for asciidoctor to get right path to the snippets
61+
asciidoctor -v --failure-level WARN -t -dbook -a ProductVersion=$(RELEASE_VERSION) -a snippetDir=${PWD}/documentation/book/api/snippet/ -s documentation/book/bridge.adoc -o documentation/htmlnoheader/bridge.html
6062

6163
.PHONY: docu_api
6264
docu_api:
63-
mvn $(MVN_ARGS) -P apidoc io.github.swagger2markup:swagger2markup-maven-plugin:convertSwagger2markup@generate-apidoc
65+
mvn $(MVN_ARGS) -P apidoc org.openapitools:openapi-generator-maven-plugin:generate@generate-apidoc
6466

6567
.PHONY: docu_check
6668
docu_check: docu_api
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# OpenAPI Generator Ignore
2+
# Generated by openapi-generator https://github.com/openapitools/openapi-generator
3+
4+
# Use this file to prevent files from being overwritten by the generator.
5+
# The patterns follow closely to .gitignore or .dockerignore.
6+
7+
# As an example, the C# client generator defines ApiClient.cs.
8+
# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
9+
#ApiClient.cs
10+
11+
# You can match any string of characters against a directory, file or extension with a single asterisk (*):
12+
#foo/*/qux
13+
# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
14+
15+
# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
16+
#foo/**/qux
17+
# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
18+
19+
# You can also negate patterns with an exclamation (!).
20+
# For example, you can ignore all files in a docs folder with the file extension .md:
21+
#docs/*.md
22+
# Then explicitly reverse the ignore rule for a single file:
23+
#!docs/README.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
index.adoc
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7.8.0
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e4a70d99cdac5e8dddb45ce30c39817fa9402463074478e0fd3a05d6a7f849d5

documentation/book/api/definitions.adoc

-321
This file was deleted.

0 commit comments

Comments
 (0)