Skip to content

Commit 9b9c7eb

Browse files
authored
Merge pull request #566 from MikeEdgar/issue-565
Bump microprofile-parent to 2.7, remove Java 8 GitHub CI
2 parents b6a0778 + 83cbec3 commit 9b9c7eb

File tree

104 files changed

+542
-542
lines changed

Some content is hidden

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

104 files changed

+542
-542
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
java: [8, 11, 17]
11+
java: [11, 17]
1212
name: build with jdk ${{matrix.java}}
1313

1414
steps:

api/src/main/java/org/eclipse/microprofile/openapi/OASConfig.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -25,45 +25,45 @@ private OASConfig() {
2525

2626
/**
2727
* Configuration property to specify the fully qualified name of the OASModelReader implementation.
28-
*
28+
*
2929
* @see org.eclipse.microprofile.openapi.OASModelReader
3030
*/
3131
public static final String MODEL_READER = "mp.openapi.model.reader";
3232

3333
/**
3434
* Configuration property to specify the fully qualified name of the OASFilter implementation.
35-
*
35+
*
3636
* @see org.eclipse.microprofile.openapi.OASFilter
3737
*/
3838
public static final String FILTER = "mp.openapi.filter";
3939

4040
/**
4141
* Configuration property to disable annotation scanning.
42-
*
42+
*
4343
*/
4444
public static final String SCAN_DISABLE = "mp.openapi.scan.disable";
4545

4646
/**
4747
* Configuration property to specify the list of packages to scan.
48-
*
48+
*
4949
*/
5050
public static final String SCAN_PACKAGES = "mp.openapi.scan.packages";
5151

5252
/**
5353
* Configuration property to specify the list of classes to scan.
54-
*
54+
*
5555
*/
5656
public static final String SCAN_CLASSES = "mp.openapi.scan.classes";
5757

5858
/**
5959
* Configuration property to specify the list of packages to exclude from scans.
60-
*
60+
*
6161
*/
6262
public static final String SCAN_EXCLUDE_PACKAGES = "mp.openapi.scan.exclude.packages";
6363

6464
/**
6565
* Configuration property to specify the list of classes to exclude from scans.
66-
*
66+
*
6767
*/
6868
public static final String SCAN_EXCLUDE_CLASSES = "mp.openapi.scan.exclude.classes";
6969

@@ -74,32 +74,32 @@ private OASConfig() {
7474

7575
/**
7676
* Configuration property to specify the list of global servers that provide connectivity information.
77-
*
77+
*
7878
*/
7979
public static final String SERVERS = "mp.openapi.servers";
8080

8181
/**
8282
* Prefix of the configuration property to specify an alternative list of servers to service all operations in a
8383
* path.
84-
*
84+
*
8585
*/
8686
public static final String SERVERS_PATH_PREFIX = "mp.openapi.servers.path.";
8787

8888
/**
8989
* Prefix of the configuration property to specify an alternative list of servers to service an operation.
90-
*
90+
*
9191
*/
9292
public static final String SERVERS_OPERATION_PREFIX = "mp.openapi.servers.operation.";
9393

9494
/**
9595
* Prefix of the configuration property to specify a schema for a specific class, in JSON format.
96-
*
96+
*
9797
*/
9898
public static final String SCHEMA_PREFIX = "mp.openapi.schema.";
9999

100100
/**
101101
* Recommended prefix for vendor specific configuration properties.
102-
*
102+
*
103103
*/
104104
public static final String EXTENSIONS_PREFIX = "mp.openapi.extensions.";
105105

api/src/main/java/org/eclipse/microprofile/openapi/OASFactory.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@
5151

5252
/**
5353
* This class allows application developers to build new OpenAPI model elements.
54-
*
54+
*
5555
* <br>
5656
* <br>
5757
* For example, to start a new top-level OpenAPI element with an ExternalDocument inside of it an application developer
5858
* would write:
59-
*
59+
*
6060
* <pre>
6161
* <code>OASFactory.createObject(OpenAPI.class)
6262
* .setExternalDocs(OASFactory.createObject(ExternalDocumentation.class).url("http://myDoc"));</code>
@@ -73,20 +73,20 @@ private OASFactory() {
7373
* <br>
7474
* <br>
7575
* Example:
76-
*
76+
*
7777
* <pre>
7878
* <code>OASFactory.createObject(Info.class).title("Airlines").description("Airlines APIs").version("1.0.0");
7979
* </code>
8080
* </pre>
81-
*
81+
*
8282
* @param <T>
8383
* describes the type parameter
8484
* @param clazz
8585
* represents a model which extends the {@link org.eclipse.microprofile.openapi.models.Constructible}
8686
* interface
8787
*
8888
* @return a new instance of the requested model class
89-
*
89+
*
9090
* @throws NullPointerException
9191
* if the specified class is null
9292
* @throws IllegalArgumentException

api/src/main/java/org/eclipse/microprofile/openapi/OASFilter.java

+15-15
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131

3232
/**
3333
* This interface allows application developers to filter different parts of the OpenAPI model tree.
34-
*
34+
*
3535
* A common scenario is to dynamically augment (update or remove) OpenAPI elements based on the environment that the
3636
* application is currently in.
37-
*
37+
*
3838
* The registration of this filter is controlled by setting the key <b>mp.openapi.filter</b> using one of the
3939
* configuration sources specified in <a href="https://github.com/eclipse/microprofile-config">MicroProfile Config</a>.
4040
* The value is the fully qualified name of the filter implementation, which needs to be visible to the application's
@@ -46,7 +46,7 @@ public interface OASFilter {
4646
/**
4747
* Allows filtering of a particular PathItem. Implementers of this method can choose to update the given PathItem,
4848
* pass it back as-is, or return null if removing this PathItem.
49-
*
49+
*
5050
* @param pathItem
5151
* the current PathItem element
5252
* @return the PathItem to be used or null
@@ -58,7 +58,7 @@ default PathItem filterPathItem(PathItem pathItem) {
5858
/**
5959
* Allows filtering of a particular Operation. Implementers of this method can choose to update the given Operation,
6060
* pass it back as-is, or return null if removing this Operation.
61-
*
61+
*
6262
* @param operation
6363
* the current Operation element
6464
* @return the Operation to be used or null
@@ -70,7 +70,7 @@ default Operation filterOperation(Operation operation) {
7070
/**
7171
* Allows filtering of a particular Parameter. Implementers of this method can choose to update the given Parameter,
7272
* pass it back as-is, or return null if removing this Parameter.
73-
*
73+
*
7474
* @param parameter
7575
* the current Parameter element
7676
* @return the Parameter to be used or null
@@ -82,7 +82,7 @@ default Parameter filterParameter(Parameter parameter) {
8282
/**
8383
* Allows filtering of a particular Header. Implementers of this method can choose to update the given Header, pass
8484
* it back as-is, or return null if removing this Header.
85-
*
85+
*
8686
* @param header
8787
* the current Header element
8888
* @return the Header to be used or null
@@ -94,7 +94,7 @@ default Header filterHeader(Header header) {
9494
/**
9595
* Allows filtering of a particular RequestBody. Implementers of this method can choose to update the given
9696
* RequestBody, pass it back as-is, or return null if removing this RequestBody.
97-
*
97+
*
9898
* @param requestBody
9999
* the current RequestBody element
100100
* @return the RequestBody to be used or null
@@ -106,7 +106,7 @@ default RequestBody filterRequestBody(RequestBody requestBody) {
106106
/**
107107
* Allows filtering of a particular APIResponse. Implementers of this method can choose to update the given
108108
* APIResponse, pass it back as-is, or return null if removing this APIResponse.
109-
*
109+
*
110110
* @param apiResponse
111111
* the current APIResponse element
112112
* @return the APIResponse to be used or null
@@ -118,7 +118,7 @@ default APIResponse filterAPIResponse(APIResponse apiResponse) {
118118
/**
119119
* Allows filtering of a particular Schema. Implementers of this method can choose to update the given Schema, pass
120120
* it back as-is, or return null if removing this Schema.
121-
*
121+
*
122122
* @param schema
123123
* the current Schema element
124124
* @return the Schema to be used or null
@@ -130,7 +130,7 @@ default Schema filterSchema(Schema schema) {
130130
/**
131131
* Allows filtering of a particular SecurityScheme. Implementers of this method can choose to update the given
132132
* SecurityScheme, pass it back as-is, or return null if removing this SecurityScheme.
133-
*
133+
*
134134
* @param securityScheme
135135
* the current SecurityScheme element
136136
* @return the SecurityScheme to be used or null
@@ -142,7 +142,7 @@ default SecurityScheme filterSecurityScheme(SecurityScheme securityScheme) {
142142
/**
143143
* Allows filtering of a particular Server. Implementers of this method can choose to update the given Server, pass
144144
* it back as-is, or return null if removing this Server.
145-
*
145+
*
146146
* @param server
147147
* the current Server element
148148
* @return the Server to be used or null
@@ -154,7 +154,7 @@ default Server filterServer(Server server) {
154154
/**
155155
* Allows filtering of a particular Tag. Implementers of this method can choose to update the given Tag, pass it
156156
* back as-is, or return null if removing this Tag.
157-
*
157+
*
158158
* @param tag
159159
* the current Tag element
160160
* @return the Tag to be used or null
@@ -166,7 +166,7 @@ default Tag filterTag(Tag tag) {
166166
/**
167167
* Allows filtering of a particular Link. Implementers of this method can choose to update the given Link, pass it
168168
* back as-is, or return null if removing this Link.
169-
*
169+
*
170170
* @param link
171171
* the current Link element
172172
* @return the Link to be used or null
@@ -178,7 +178,7 @@ default Link filterLink(Link link) {
178178
/**
179179
* Allows filtering of a particular Callback. Implementers of this method can choose to update the given Callback,
180180
* pass it back as-is, or return null if removing this Callback.
181-
*
181+
*
182182
* @param callback
183183
* the current Callback element
184184
* @return the Callback to be used or null
@@ -192,7 +192,7 @@ default Callback filterCallback(Callback callback) {
192192
* or do nothing if no change is required. Note that one cannot remove this element from the model tree, hence the
193193
* return type of void. This is the last method called for a given filter, therefore it symbolizes the end of
194194
* processing by the vendor framework.
195-
*
195+
*
196196
* @param openAPI
197197
* the current OpenAPI element
198198
*/

api/src/main/java/org/eclipse/microprofile/openapi/OASModelReader.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
/**
2121
* This interface allows application developers to programmatically contribute an OpenAPI model tree.
22-
*
22+
*
2323
* In this scenario the developer can choose whether to provide the entire OpenAPI model while disabling annotation
2424
* scanning, or they can provide a starting OpenAPI model to be augmented with the application annotations.
2525
*
@@ -34,7 +34,7 @@ public interface OASModelReader {
3434
* This method is called by the vendor's OpenAPI processing framework. It can be a fully complete and valid OpenAPI
3535
* model tree, or a partial base model tree that will be augmented by either annotations or pre-generated OpenAPI
3636
* documents.
37-
*
37+
*
3838
* @return the OpenAPI model to be used by the vendor
3939
*/
4040
OpenAPI buildModel();

api/src/main/java/org/eclipse/microprofile/openapi/annotations/Components.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
/**
3636
* Describes the Components object that holds various reusable objects for different aspects of the OpenAPI
3737
* Specification (OAS).
38-
*
38+
*
3939
* @see <a href= "https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#componentsObject"> OpenAPI
4040
* Specification Components Object</a>
4141
*/
@@ -112,7 +112,7 @@
112112
* corresponding to the containing annotation.
113113
*
114114
* @return array of extensions
115-
*
115+
*
116116
* @since 3.1
117117
*/
118118
Extension[] extensions() default {};

api/src/main/java/org/eclipse/microprofile/openapi/annotations/ExternalDocumentation.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* When it is applied to a type and one or more of the fields are not empty strings the annotation value is added to the
3535
* OpenAPI document root. If more than one non-empty annotation is applied to a type in the application or if the
3636
* externalDocs field of the OpenAPIDefinition annotation is supplied the results are not defined.
37-
*
37+
*
3838
* @see <a href=
3939
* "https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#externalDocumentationObject">OpenAPI
4040
* Specification External Documentation Object</a>
@@ -46,14 +46,14 @@
4646

4747
/**
4848
* A short description of the target documentation.
49-
*
49+
*
5050
* @return the documentation description
5151
**/
5252
String description() default "";
5353

5454
/**
5555
* The URL for the target documentation. Value must be in the format of a URL.
56-
*
56+
*
5757
* @return the documentation URL
5858
**/
5959
String url() default "";
@@ -63,7 +63,7 @@
6363
* ExternalDocumentation} model corresponding to the containing annotation.
6464
*
6565
* @return array of extensions
66-
*
66+
*
6767
* @since 3.1
6868
*/
6969
Extension[] extensions() default {};

api/src/main/java/org/eclipse/microprofile/openapi/annotations/OpenAPIDefinition.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* OpenAPI
3535
* <p>
3636
* This is the root document object of the OpenAPI document. It contains required and optional fields.
37-
*
37+
*
3838
* @see <a href= "https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#openapi-object">OpenAPI
3939
* Specification OpenAPI Object</a>
4040
*/
@@ -71,7 +71,7 @@
7171
* <p>
7272
* Adding a {@code SecurityRequirement} to this array is equivalent to adding a {@code SecurityRequirementsSet}
7373
* containing a single {@code SecurityRequirement} to {@link #securitySets()}.
74-
*
74+
*
7575
* @return the array of security requirements for this API
7676
*/
7777
SecurityRequirement[] security() default {};
@@ -82,7 +82,7 @@
8282
* All of the security requirements within any one of the sets must be satisfied to authorize a request.
8383
* <p>
8484
* Including an empty set within this list indicates that the other requirements are optional.
85-
*
85+
*
8686
* @return the array of security requirement sets for this API
8787
*/
8888
SecurityRequirementsSet[] securitySets() default {};
@@ -109,7 +109,7 @@
109109
* corresponding to the containing annotation.
110110
*
111111
* @return array of extensions
112-
*
112+
*
113113
* @since 3.1
114114
*/
115115
Extension[] extensions() default {};

0 commit comments

Comments
 (0)