CHORE[DEPENDENCIES]: bump swagger-parser => 2.0.22#7597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 1 commit into from
Dec 8, 2020
Merged

CHORE[DEPENDENCIES]: bump swagger-parser => 2.0.22 #7597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -472,14 +472,22 @@ private void flattenComponents(OpenAPI openAPI) {
* @param m Schema implementation
*/
private void fixStringModel(Schema m) {
if (m.getType() != null && m.getType().equals("string") && m.getExample() != null) {
if (schemaIsOfType(m, "string") && schemaContainsExample(m)) {
String example = m.getExample().toString();
if (example.substring(0, 1).equals("\"") && example.substring(example.length() - 1).equals("\"")) {
if (example.startsWith("\"") && example.endsWith("\"")) {
m.setExample(example.substring(1, example.length() - 1));
}
}
}

private boolean schemaIsOfType(Schema m, String type) {
return m.getType() != null && m.getType().equals(type);
}

private boolean schemaContainsExample(Schema m) {
return m.getExample() != null && m.getExample() != "";
}

/**
* Generates a unique model name. Non-alphanumeric characters will be replaced
* with underscores
Expand Down
3 changes: 2 additions & 1 deletion ...les/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@
import io.swagger.v3.oas.models.responses.ApiResponses;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.utils.ModelUtils;
import org.testng.Assert;
import org.testng.annotations.Test;

import java.util.HashMap;
Expand DownExpand Up@@ -927,7 +928,7 @@ public void emptyExampleOnStringTypeModels() {
assertEquals("#/components/schemas/EmptyExampleOnStringTypeModels", schema.getItems().get$ref());

assertTrue(ModelUtils.getReferencedSchema(openAPI, schema.getItems()) instanceof StringSchema);
assertNull(ModelUtils.getReferencedSchema(openAPI, schema.getItems()).getExample());
Assert.assertSame(ModelUtils.getReferencedSchema(openAPI, schema.getItems()).getExample(), "");
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1510,7 +1510,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<swagger-core-version>2.1.2</swagger-core-version>
<swagger-parser-groupid>io.swagger.parser.v3</swagger-parser-groupid>
<swagger-parser-version>2.0.20</swagger-parser-version>
<swagger-parser-version>2.0.22</swagger-parser-version>
<felix-version>3.3.1</felix-version>
<commons-io-version>2.4</commons-io-version>
<commons-cli-version>1.2</commons-cli-version>
Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/go/go-petstore/api/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2126,3 +2126,4 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"

@jimschubertjimschubertOct 5, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sebastien-rosset I see you added this to swagger-parser, but it doesn't seem to be consumed anywhere.

Do you need to create a follow up to consume this as mentioned in #6290?

Limitation: due to issue swagger-parser #1369, achieving OAS compliance is not possible when the input document uses the OAS 2.0 schema. For OAS 2.0 documents, the legacy behavior should be used by setting the disallowAdditionalPropertiesIfNotPresent CLI option to true.

@sebastien-rossetsebastien-rossetOct 5, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, there needs to be a follow up. Actually even better would be to ensure the 2.0 parser is converting additionalProperties properly.
With x-original-swagger-version, at least we know the source is 2.0, but if the converter is not converting properly to 3.0 (and retaining the semantics), it's still going to be a problem.

1 change: 1 addition & 0 deletions samples/client/petstore/haskell-http-client/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2126,3 +2126,4 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"
1 change: 1 addition & 0 deletions samples/client/petstore/java/feign-no-nullable/api/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions samples/client/petstore/java/feign/api/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions samples/client/petstore/java/google-api-client/api/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions samples/client/petstore/java/jersey1/api/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions samples/client/petstore/java/jersey2-java8/api/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions samples/client/petstore/java/native-async/api/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions samples/client/petstore/java/native/api/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions samples/client/petstore/java/okhttp-gson-parcelableModel/api/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions samples/client/petstore/java/okhttp-gson/api/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions samples/client/petstore/java/rest-assured-jackson/api/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions samples/client/petstore/java/rest-assured/api/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions samples/client/petstore/java/resteasy/api/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions samples/client/petstore/java/resttemplate/api/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions samples/client/petstore/java/retrofit2-play26/api/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions samples/client/petstore/java/retrofit2/api/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions samples/client/petstore/java/retrofit2rx2/api/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions samples/client/petstore/java/retrofit2rx3/api/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions samples/client/petstore/java/vertx-no-nullable/api/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions samples/client/petstore/java/vertx/api/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions samples/client/petstore/java/webclient/api/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"

3 changes: 2 additions & 1 deletion samples/server/petstore/java-play-framework-api-package-override/public/openapi.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
"type" : "apiKey"
}
}
}
},
"x-original-swagger-version" : "2.0"
}
3 changes: 2 additions & 1 deletion samples/server/petstore/java-play-framework-async/public/openapi.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
"type" : "apiKey"
}
}
}
},
"x-original-swagger-version" : "2.0"
}
3 changes: 2 additions & 1 deletion samples/server/petstore/java-play-framework-controller-only/public/openapi.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
"type" : "apiKey"
}
}
}
},
"x-original-swagger-version" : "2.0"
}
3 changes: 2 additions & 1 deletion samples/server/petstore/java-play-framework-fake-endpoints/public/openapi.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2880,5 +2880,6 @@
"type" : "http"
}
}
}
},
"x-original-swagger-version" : "2.0"
}
3 changes: 2 additions & 1 deletion samples/server/petstore/java-play-framework-no-bean-validation/public/openapi.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
"type" : "apiKey"
}
}
}
},
"x-original-swagger-version" : "2.0"
}
3 changes: 2 additions & 1 deletion samples/server/petstore/java-play-framework-no-exception-handling/public/openapi.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
"type" : "apiKey"
}
}
}
},
"x-original-swagger-version" : "2.0"
}
3 changes: 2 additions & 1 deletion samples/server/petstore/java-play-framework-no-interface/public/openapi.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
"type" : "apiKey"
}
}
}
},
"x-original-swagger-version" : "2.0"
}
3 changes: 2 additions & 1 deletion samples/server/petstore/java-play-framework-no-nullable/public/openapi.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
"type" : "apiKey"
}
}
}
},
"x-original-swagger-version" : "2.0"
}
3 changes: 2 additions & 1 deletion samples/server/petstore/java-play-framework-no-wrap-calls/public/openapi.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
"type" : "apiKey"
}
}
}
},
"x-original-swagger-version" : "2.0"
}
3 changes: 2 additions & 1 deletion samples/server/petstore/java-play-framework/public/openapi.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
"type" : "apiKey"
}
}
}
},
"x-original-swagger-version" : "2.0"
}
1 change: 1 addition & 0 deletions samples/server/petstore/jaxrs-spec-interface/src/main/openapi/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2261,3 +2261,4 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"
1 change: 1 addition & 0 deletions samples/server/petstore/jaxrs-spec/src/main/openapi/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2261,3 +2261,4 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"
1 change: 1 addition & 0 deletions samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/openapi/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -794,3 +794,4 @@ components:
name: api_key
type: apiKey
x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
x-original-swagger-version: "2.0"
1 change: 1 addition & 0 deletions samples/server/petstore/python-aiohttp/openapi_server/openapi/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -794,3 +794,4 @@ components:
name: api_key
type: apiKey
x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
x-original-swagger-version: "2.0"
1 change: 1 addition & 0 deletions samples/server/petstore/python-flask/openapi_server/openapi/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -783,3 +783,4 @@ components:
name: api_key
type: apiKey
x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
x-original-swagger-version: "2.0"
1 change: 1 addition & 0 deletions ...store/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1591,4 +1591,5 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions samples/server/petstore/rust-server/output/rust-server-test/api/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -212,4 +212,5 @@ components:
required:
- required_thing
type: object
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2261,3 +2261,4 @@ components:
http_basic_test:
scheme: basic
type: http
x-original-swagger-version: "2.0"
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
CHORE[DEPENDENCIES]: bump swagger-parser => 2.0.22#7597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 1 commit into

from

Dec 8, 2020
 Merged


CHORE[DEPENDENCIES]: bump swagger-parser => 2.0.22
#7597
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 10 additions & 2 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -472,14 +472,22 @@ private void flattenComponents(OpenAPI openAPI) {
 * @param m Schema implementation
 */
 private void fixStringModel(Schema m) {
 if (m.getType() != null && m.getType().equals("string") && m.getExample() != null) {
 if (schemaIsOfType(m, "string") && schemaContainsExample(m)) {
 String example = m.getExample().toString();
 if (example.substring(0, 1).equals("\"") && example.substring(example.length() - 1).equals("\"")) {
 if (example.startsWith("\"") && example.endsWith("\"")) {
 m.setExample(example.substring(1, example.length() - 1));
 }
 }
 }

 private boolean schemaIsOfType(Schema m, String type) {
 return m.getType() != null && m.getType().equals(type);
 }

 private boolean schemaContainsExample(Schema m) {
 return m.getExample() != null && m.getExample() != "";
 }

 /**
 * Generates a unique model name. Non-alphanumeric characters will be replaced
 * with underscores
Expand Down

3 changes: 2 additions & 1 deletion
...les/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@
import io.swagger.v3.oas.models.responses.ApiResponses;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.utils.ModelUtils;
import org.testng.Assert;
import org.testng.annotations.Test;

import java.util.HashMap;
Expand DownExpand Up@@ -927,7 +928,7 @@ public void emptyExampleOnStringTypeModels() {
 assertEquals("#/components/schemas/EmptyExampleOnStringTypeModels", schema.getItems().get$ref());

 assertTrue(ModelUtils.getReferencedSchema(openAPI, schema.getItems()) instanceof StringSchema);
assertNull(ModelUtils.getReferencedSchema(openAPI, schema.getItems()).getExample());
Assert.assertSame(ModelUtils.getReferencedSchema(openAPI, schema.getItems()).getExample(), "");
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1510,7 +1510,7 @@
 <maven.compiler.target>1.8</maven.compiler.target>
 <swagger-core-version>2.1.2</swagger-core-version>
 <swagger-parser-groupid>io.swagger.parser.v3</swagger-parser-groupid>
 <swagger-parser-version>2.0.20</swagger-parser-version>
 <swagger-parser-version>2.0.22</swagger-parser-version>
 <felix-version>3.3.1</felix-version>
 <commons-io-version>2.4</commons-io-version>
 <commons-cli-version>1.2</commons-cli-version>
Expand Down

1 change: 1 addition & 0 deletions
samples/client/petstore/go/go-petstore/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2126,3 +2126,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"
@jimschubertjimschubertOct 5, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sebastien-rosset I see you added this to swagger-parser, but it doesn't seem to be consumed anywhere.
Do you need to create a follow up to consume this as mentioned in #6290?
Limitation: due to issue swagger-parser #1369, achieving OAS compliance is not possible when the input document uses the OAS 2.0 schema. For OAS 2.0 documents, the legacy behavior should be used by setting the disallowAdditionalPropertiesIfNotPresent CLI option to true.
@sebastien-rossetsebastien-rossetOct 5, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, there needs to be a follow up. Actually even better would be to ensure the 2.0 parser is converting additionalProperties properly.

With x-original-swagger-version, at least we know the source is 2.0, but if the converter is not converting properly to 3.0 (and retaining the semantics), it's still going to be a problem.

1 change: 1 addition & 0 deletions
samples/client/petstore/haskell-http-client/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2126,3 +2126,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/client/petstore/java/feign-no-nullable/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/feign/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/google-api-client/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/jersey1/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/jersey2-java8/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/native-async/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/native/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/okhttp-gson-parcelableModel/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/okhttp-gson/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/rest-assured-jackson/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/rest-assured/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/resteasy/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/resttemplate/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2-play26/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2rx2/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2rx3/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/vertx-no-nullable/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/vertx/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/webclient/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-api-package-override/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-async/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-controller-only/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-fake-endpoints/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2880,5 +2880,6 @@
 "type" : "http"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-bean-validation/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-exception-handling/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-interface/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-nullable/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-wrap-calls/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/main/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2261,3 +2261,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-spec/src/main/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2261,3 +2261,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -794,3 +794,4 @@ components:
 name: api_key
 type: apiKey
 x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/python-aiohttp/openapi_server/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -794,3 +794,4 @@ components:
 name: api_key
 type: apiKey
 x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/python-flask/openapi_server/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -783,3 +783,4 @@ components:
 name: api_key
 type: apiKey
 x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
...store/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1591,4 +1591,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/server/petstore/rust-server/output/rust-server-test/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,4 +212,5 @@ components:
 required:
 - required_thing
 type: object
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2261,3 +2261,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
CHORE[DEPENDENCIES]: bump swagger-parser => 2.0.22#7597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 1 commit into

from

Dec 8, 2020
 Merged


CHORE[DEPENDENCIES]: bump swagger-parser => 2.0.22
#7597
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 10 additions & 2 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -472,14 +472,22 @@ private void flattenComponents(OpenAPI openAPI) {
 * @param m Schema implementation
 */
 private void fixStringModel(Schema m) {
 if (m.getType() != null && m.getType().equals("string") && m.getExample() != null) {
 if (schemaIsOfType(m, "string") && schemaContainsExample(m)) {
 String example = m.getExample().toString();
 if (example.substring(0, 1).equals("\"") && example.substring(example.length() - 1).equals("\"")) {
 if (example.startsWith("\"") && example.endsWith("\"")) {
 m.setExample(example.substring(1, example.length() - 1));
 }
 }
 }

 private boolean schemaIsOfType(Schema m, String type) {
 return m.getType() != null && m.getType().equals(type);
 }

 private boolean schemaContainsExample(Schema m) {
 return m.getExample() != null && m.getExample() != "";
 }

 /**
 * Generates a unique model name. Non-alphanumeric characters will be replaced
 * with underscores
Expand Down

3 changes: 2 additions & 1 deletion
...les/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@
import io.swagger.v3.oas.models.responses.ApiResponses;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.utils.ModelUtils;
import org.testng.Assert;
import org.testng.annotations.Test;

import java.util.HashMap;
Expand DownExpand Up@@ -927,7 +928,7 @@ public void emptyExampleOnStringTypeModels() {
 assertEquals("#/components/schemas/EmptyExampleOnStringTypeModels", schema.getItems().get$ref());

 assertTrue(ModelUtils.getReferencedSchema(openAPI, schema.getItems()) instanceof StringSchema);
assertNull(ModelUtils.getReferencedSchema(openAPI, schema.getItems()).getExample());
Assert.assertSame(ModelUtils.getReferencedSchema(openAPI, schema.getItems()).getExample(), "");
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1510,7 +1510,7 @@
 <maven.compiler.target>1.8</maven.compiler.target>
 <swagger-core-version>2.1.2</swagger-core-version>
 <swagger-parser-groupid>io.swagger.parser.v3</swagger-parser-groupid>
 <swagger-parser-version>2.0.20</swagger-parser-version>
 <swagger-parser-version>2.0.22</swagger-parser-version>
 <felix-version>3.3.1</felix-version>
 <commons-io-version>2.4</commons-io-version>
 <commons-cli-version>1.2</commons-cli-version>
Expand Down

1 change: 1 addition & 0 deletions
samples/client/petstore/go/go-petstore/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2126,3 +2126,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"
@jimschubertjimschubertOct 5, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sebastien-rosset I see you added this to swagger-parser, but it doesn't seem to be consumed anywhere.
Do you need to create a follow up to consume this as mentioned in #6290?
Limitation: due to issue swagger-parser #1369, achieving OAS compliance is not possible when the input document uses the OAS 2.0 schema. For OAS 2.0 documents, the legacy behavior should be used by setting the disallowAdditionalPropertiesIfNotPresent CLI option to true.
@sebastien-rossetsebastien-rossetOct 5, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, there needs to be a follow up. Actually even better would be to ensure the 2.0 parser is converting additionalProperties properly.

With x-original-swagger-version, at least we know the source is 2.0, but if the converter is not converting properly to 3.0 (and retaining the semantics), it's still going to be a problem.

1 change: 1 addition & 0 deletions
samples/client/petstore/haskell-http-client/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2126,3 +2126,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/client/petstore/java/feign-no-nullable/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/feign/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/google-api-client/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/jersey1/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/jersey2-java8/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/native-async/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/native/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/okhttp-gson-parcelableModel/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/okhttp-gson/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/rest-assured-jackson/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/rest-assured/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/resteasy/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/resttemplate/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2-play26/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2rx2/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2rx3/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/vertx-no-nullable/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/vertx/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/webclient/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-api-package-override/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-async/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-controller-only/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-fake-endpoints/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2880,5 +2880,6 @@
 "type" : "http"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-bean-validation/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-exception-handling/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-interface/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-nullable/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-wrap-calls/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/main/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2261,3 +2261,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-spec/src/main/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2261,3 +2261,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -794,3 +794,4 @@ components:
 name: api_key
 type: apiKey
 x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/python-aiohttp/openapi_server/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -794,3 +794,4 @@ components:
 name: api_key
 type: apiKey
 x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/python-flask/openapi_server/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -783,3 +783,4 @@ components:
 name: api_key
 type: apiKey
 x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
...store/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1591,4 +1591,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/server/petstore/rust-server/output/rust-server-test/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,4 +212,5 @@ components:
 required:
 - required_thing
 type: object
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2261,3 +2261,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
CHORE[DEPENDENCIES]: bump swagger-parser => 2.0.22#7597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 1 commit into

from

Dec 8, 2020
 Merged


CHORE[DEPENDENCIES]: bump swagger-parser => 2.0.22
#7597
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 10 additions & 2 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -472,14 +472,22 @@ private void flattenComponents(OpenAPI openAPI) {
 * @param m Schema implementation
 */
 private void fixStringModel(Schema m) {
 if (m.getType() != null && m.getType().equals("string") && m.getExample() != null) {
 if (schemaIsOfType(m, "string") && schemaContainsExample(m)) {
 String example = m.getExample().toString();
 if (example.substring(0, 1).equals("\"") && example.substring(example.length() - 1).equals("\"")) {
 if (example.startsWith("\"") && example.endsWith("\"")) {
 m.setExample(example.substring(1, example.length() - 1));
 }
 }
 }

 private boolean schemaIsOfType(Schema m, String type) {
 return m.getType() != null && m.getType().equals(type);
 }

 private boolean schemaContainsExample(Schema m) {
 return m.getExample() != null && m.getExample() != "";
 }

 /**
 * Generates a unique model name. Non-alphanumeric characters will be replaced
 * with underscores
Expand Down

3 changes: 2 additions & 1 deletion
...les/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@
import io.swagger.v3.oas.models.responses.ApiResponses;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.utils.ModelUtils;
import org.testng.Assert;
import org.testng.annotations.Test;

import java.util.HashMap;
Expand DownExpand Up@@ -927,7 +928,7 @@ public void emptyExampleOnStringTypeModels() {
 assertEquals("#/components/schemas/EmptyExampleOnStringTypeModels", schema.getItems().get$ref());

 assertTrue(ModelUtils.getReferencedSchema(openAPI, schema.getItems()) instanceof StringSchema);
assertNull(ModelUtils.getReferencedSchema(openAPI, schema.getItems()).getExample());
Assert.assertSame(ModelUtils.getReferencedSchema(openAPI, schema.getItems()).getExample(), "");
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1510,7 +1510,7 @@
 <maven.compiler.target>1.8</maven.compiler.target>
 <swagger-core-version>2.1.2</swagger-core-version>
 <swagger-parser-groupid>io.swagger.parser.v3</swagger-parser-groupid>
 <swagger-parser-version>2.0.20</swagger-parser-version>
 <swagger-parser-version>2.0.22</swagger-parser-version>
 <felix-version>3.3.1</felix-version>
 <commons-io-version>2.4</commons-io-version>
 <commons-cli-version>1.2</commons-cli-version>
Expand Down

1 change: 1 addition & 0 deletions
samples/client/petstore/go/go-petstore/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2126,3 +2126,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"
@jimschubertjimschubertOct 5, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sebastien-rosset I see you added this to swagger-parser, but it doesn't seem to be consumed anywhere.
Do you need to create a follow up to consume this as mentioned in #6290?
Limitation: due to issue swagger-parser #1369, achieving OAS compliance is not possible when the input document uses the OAS 2.0 schema. For OAS 2.0 documents, the legacy behavior should be used by setting the disallowAdditionalPropertiesIfNotPresent CLI option to true.
@sebastien-rossetsebastien-rossetOct 5, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, there needs to be a follow up. Actually even better would be to ensure the 2.0 parser is converting additionalProperties properly.

With x-original-swagger-version, at least we know the source is 2.0, but if the converter is not converting properly to 3.0 (and retaining the semantics), it's still going to be a problem.

1 change: 1 addition & 0 deletions
samples/client/petstore/haskell-http-client/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2126,3 +2126,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/client/petstore/java/feign-no-nullable/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/feign/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/google-api-client/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/jersey1/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/jersey2-java8/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/native-async/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/native/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/okhttp-gson-parcelableModel/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/okhttp-gson/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/rest-assured-jackson/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/rest-assured/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/resteasy/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/resttemplate/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2-play26/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2rx2/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2rx3/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/vertx-no-nullable/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/vertx/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/webclient/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-api-package-override/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-async/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-controller-only/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-fake-endpoints/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2880,5 +2880,6 @@
 "type" : "http"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-bean-validation/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-exception-handling/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-interface/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-nullable/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-wrap-calls/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/main/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2261,3 +2261,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-spec/src/main/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2261,3 +2261,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -794,3 +794,4 @@ components:
 name: api_key
 type: apiKey
 x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/python-aiohttp/openapi_server/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -794,3 +794,4 @@ components:
 name: api_key
 type: apiKey
 x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/python-flask/openapi_server/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -783,3 +783,4 @@ components:
 name: api_key
 type: apiKey
 x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
...store/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1591,4 +1591,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/server/petstore/rust-server/output/rust-server-test/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,4 +212,5 @@ components:
 required:
 - required_thing
 type: object
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2261,3 +2261,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
CHORE[DEPENDENCIES]: bump swagger-parser => 2.0.22#7597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 1 commit into

from

Dec 8, 2020
 Merged


CHORE[DEPENDENCIES]: bump swagger-parser => 2.0.22
#7597
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 10 additions & 2 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -472,14 +472,22 @@ private void flattenComponents(OpenAPI openAPI) {
 * @param m Schema implementation
 */
 private void fixStringModel(Schema m) {
 if (m.getType() != null && m.getType().equals("string") && m.getExample() != null) {
 if (schemaIsOfType(m, "string") && schemaContainsExample(m)) {
 String example = m.getExample().toString();
 if (example.substring(0, 1).equals("\"") && example.substring(example.length() - 1).equals("\"")) {
 if (example.startsWith("\"") && example.endsWith("\"")) {
 m.setExample(example.substring(1, example.length() - 1));
 }
 }
 }

 private boolean schemaIsOfType(Schema m, String type) {
 return m.getType() != null && m.getType().equals(type);
 }

 private boolean schemaContainsExample(Schema m) {
 return m.getExample() != null && m.getExample() != "";
 }

 /**
 * Generates a unique model name. Non-alphanumeric characters will be replaced
 * with underscores
Expand Down

3 changes: 2 additions & 1 deletion
...les/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@
import io.swagger.v3.oas.models.responses.ApiResponses;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.utils.ModelUtils;
import org.testng.Assert;
import org.testng.annotations.Test;

import java.util.HashMap;
Expand DownExpand Up@@ -927,7 +928,7 @@ public void emptyExampleOnStringTypeModels() {
 assertEquals("#/components/schemas/EmptyExampleOnStringTypeModels", schema.getItems().get$ref());

 assertTrue(ModelUtils.getReferencedSchema(openAPI, schema.getItems()) instanceof StringSchema);
assertNull(ModelUtils.getReferencedSchema(openAPI, schema.getItems()).getExample());
Assert.assertSame(ModelUtils.getReferencedSchema(openAPI, schema.getItems()).getExample(), "");
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1510,7 +1510,7 @@
 <maven.compiler.target>1.8</maven.compiler.target>
 <swagger-core-version>2.1.2</swagger-core-version>
 <swagger-parser-groupid>io.swagger.parser.v3</swagger-parser-groupid>
 <swagger-parser-version>2.0.20</swagger-parser-version>
 <swagger-parser-version>2.0.22</swagger-parser-version>
 <felix-version>3.3.1</felix-version>
 <commons-io-version>2.4</commons-io-version>
 <commons-cli-version>1.2</commons-cli-version>
Expand Down

1 change: 1 addition & 0 deletions
samples/client/petstore/go/go-petstore/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2126,3 +2126,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"
@jimschubertjimschubertOct 5, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sebastien-rosset I see you added this to swagger-parser, but it doesn't seem to be consumed anywhere.
Do you need to create a follow up to consume this as mentioned in #6290?
Limitation: due to issue swagger-parser #1369, achieving OAS compliance is not possible when the input document uses the OAS 2.0 schema. For OAS 2.0 documents, the legacy behavior should be used by setting the disallowAdditionalPropertiesIfNotPresent CLI option to true.
@sebastien-rossetsebastien-rossetOct 5, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, there needs to be a follow up. Actually even better would be to ensure the 2.0 parser is converting additionalProperties properly.

With x-original-swagger-version, at least we know the source is 2.0, but if the converter is not converting properly to 3.0 (and retaining the semantics), it's still going to be a problem.

1 change: 1 addition & 0 deletions
samples/client/petstore/haskell-http-client/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2126,3 +2126,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/client/petstore/java/feign-no-nullable/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/feign/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/google-api-client/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/jersey1/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/jersey2-java8/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/native-async/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/native/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/okhttp-gson-parcelableModel/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/okhttp-gson/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/rest-assured-jackson/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/rest-assured/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/resteasy/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/resttemplate/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2-play26/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2rx2/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2rx3/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/vertx-no-nullable/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/vertx/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/webclient/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-api-package-override/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-async/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-controller-only/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-fake-endpoints/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2880,5 +2880,6 @@
 "type" : "http"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-bean-validation/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-exception-handling/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-interface/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-nullable/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-wrap-calls/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/main/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2261,3 +2261,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-spec/src/main/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2261,3 +2261,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -794,3 +794,4 @@ components:
 name: api_key
 type: apiKey
 x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/python-aiohttp/openapi_server/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -794,3 +794,4 @@ components:
 name: api_key
 type: apiKey
 x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/python-flask/openapi_server/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -783,3 +783,4 @@ components:
 name: api_key
 type: apiKey
 x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
...store/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1591,4 +1591,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/server/petstore/rust-server/output/rust-server-test/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,4 +212,5 @@ components:
 required:
 - required_thing
 type: object
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2261,3 +2261,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
CHORE[DEPENDENCIES]: bump swagger-parser => 2.0.22#7597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 1 commit into

from

Dec 8, 2020
 Merged


CHORE[DEPENDENCIES]: bump swagger-parser => 2.0.22
#7597
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 10 additions & 2 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -472,14 +472,22 @@ private void flattenComponents(OpenAPI openAPI) {
 * @param m Schema implementation
 */
 private void fixStringModel(Schema m) {
 if (m.getType() != null && m.getType().equals("string") && m.getExample() != null) {
 if (schemaIsOfType(m, "string") && schemaContainsExample(m)) {
 String example = m.getExample().toString();
 if (example.substring(0, 1).equals("\"") && example.substring(example.length() - 1).equals("\"")) {
 if (example.startsWith("\"") && example.endsWith("\"")) {
 m.setExample(example.substring(1, example.length() - 1));
 }
 }
 }

 private boolean schemaIsOfType(Schema m, String type) {
 return m.getType() != null && m.getType().equals(type);
 }

 private boolean schemaContainsExample(Schema m) {
 return m.getExample() != null && m.getExample() != "";
 }

 /**
 * Generates a unique model name. Non-alphanumeric characters will be replaced
 * with underscores
Expand Down

3 changes: 2 additions & 1 deletion
...les/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@
import io.swagger.v3.oas.models.responses.ApiResponses;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.utils.ModelUtils;
import org.testng.Assert;
import org.testng.annotations.Test;

import java.util.HashMap;
Expand DownExpand Up@@ -927,7 +928,7 @@ public void emptyExampleOnStringTypeModels() {
 assertEquals("#/components/schemas/EmptyExampleOnStringTypeModels", schema.getItems().get$ref());

 assertTrue(ModelUtils.getReferencedSchema(openAPI, schema.getItems()) instanceof StringSchema);
assertNull(ModelUtils.getReferencedSchema(openAPI, schema.getItems()).getExample());
Assert.assertSame(ModelUtils.getReferencedSchema(openAPI, schema.getItems()).getExample(), "");
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1510,7 +1510,7 @@
 <maven.compiler.target>1.8</maven.compiler.target>
 <swagger-core-version>2.1.2</swagger-core-version>
 <swagger-parser-groupid>io.swagger.parser.v3</swagger-parser-groupid>
 <swagger-parser-version>2.0.20</swagger-parser-version>
 <swagger-parser-version>2.0.22</swagger-parser-version>
 <felix-version>3.3.1</felix-version>
 <commons-io-version>2.4</commons-io-version>
 <commons-cli-version>1.2</commons-cli-version>
Expand Down

1 change: 1 addition & 0 deletions
samples/client/petstore/go/go-petstore/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2126,3 +2126,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"
@jimschubertjimschubertOct 5, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sebastien-rosset I see you added this to swagger-parser, but it doesn't seem to be consumed anywhere.
Do you need to create a follow up to consume this as mentioned in #6290?
Limitation: due to issue swagger-parser #1369, achieving OAS compliance is not possible when the input document uses the OAS 2.0 schema. For OAS 2.0 documents, the legacy behavior should be used by setting the disallowAdditionalPropertiesIfNotPresent CLI option to true.
@sebastien-rossetsebastien-rossetOct 5, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, there needs to be a follow up. Actually even better would be to ensure the 2.0 parser is converting additionalProperties properly.

With x-original-swagger-version, at least we know the source is 2.0, but if the converter is not converting properly to 3.0 (and retaining the semantics), it's still going to be a problem.

1 change: 1 addition & 0 deletions
samples/client/petstore/haskell-http-client/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2126,3 +2126,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/client/petstore/java/feign-no-nullable/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/feign/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/google-api-client/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/jersey1/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/jersey2-java8/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/native-async/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/native/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/okhttp-gson-parcelableModel/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/okhttp-gson/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/rest-assured-jackson/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/rest-assured/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/resteasy/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/resttemplate/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2-play26/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2rx2/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2rx3/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/vertx-no-nullable/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/vertx/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/webclient/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-api-package-override/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-async/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-controller-only/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-fake-endpoints/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2880,5 +2880,6 @@
 "type" : "http"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-bean-validation/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-exception-handling/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-interface/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-nullable/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-wrap-calls/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/main/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2261,3 +2261,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-spec/src/main/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2261,3 +2261,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -794,3 +794,4 @@ components:
 name: api_key
 type: apiKey
 x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/python-aiohttp/openapi_server/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -794,3 +794,4 @@ components:
 name: api_key
 type: apiKey
 x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/python-flask/openapi_server/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -783,3 +783,4 @@ components:
 name: api_key
 type: apiKey
 x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
...store/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1591,4 +1591,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/server/petstore/rust-server/output/rust-server-test/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,4 +212,5 @@ components:
 required:
 - required_thing
 type: object
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2261,3 +2261,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
CHORE[DEPENDENCIES]: bump swagger-parser => 2.0.22#7597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 1 commit into

from

Dec 8, 2020
 Merged


CHORE[DEPENDENCIES]: bump swagger-parser => 2.0.22
#7597
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 10 additions & 2 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -472,14 +472,22 @@ private void flattenComponents(OpenAPI openAPI) {
 * @param m Schema implementation
 */
 private void fixStringModel(Schema m) {
 if (m.getType() != null && m.getType().equals("string") && m.getExample() != null) {
 if (schemaIsOfType(m, "string") && schemaContainsExample(m)) {
 String example = m.getExample().toString();
 if (example.substring(0, 1).equals("\"") && example.substring(example.length() - 1).equals("\"")) {
 if (example.startsWith("\"") && example.endsWith("\"")) {
 m.setExample(example.substring(1, example.length() - 1));
 }
 }
 }

 private boolean schemaIsOfType(Schema m, String type) {
 return m.getType() != null && m.getType().equals(type);
 }

 private boolean schemaContainsExample(Schema m) {
 return m.getExample() != null && m.getExample() != "";
 }

 /**
 * Generates a unique model name. Non-alphanumeric characters will be replaced
 * with underscores
Expand Down

3 changes: 2 additions & 1 deletion
...les/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@
import io.swagger.v3.oas.models.responses.ApiResponses;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.utils.ModelUtils;
import org.testng.Assert;
import org.testng.annotations.Test;

import java.util.HashMap;
Expand DownExpand Up@@ -927,7 +928,7 @@ public void emptyExampleOnStringTypeModels() {
 assertEquals("#/components/schemas/EmptyExampleOnStringTypeModels", schema.getItems().get$ref());

 assertTrue(ModelUtils.getReferencedSchema(openAPI, schema.getItems()) instanceof StringSchema);
assertNull(ModelUtils.getReferencedSchema(openAPI, schema.getItems()).getExample());
Assert.assertSame(ModelUtils.getReferencedSchema(openAPI, schema.getItems()).getExample(), "");
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1510,7 +1510,7 @@
 <maven.compiler.target>1.8</maven.compiler.target>
 <swagger-core-version>2.1.2</swagger-core-version>
 <swagger-parser-groupid>io.swagger.parser.v3</swagger-parser-groupid>
 <swagger-parser-version>2.0.20</swagger-parser-version>
 <swagger-parser-version>2.0.22</swagger-parser-version>
 <felix-version>3.3.1</felix-version>
 <commons-io-version>2.4</commons-io-version>
 <commons-cli-version>1.2</commons-cli-version>
Expand Down

1 change: 1 addition & 0 deletions
samples/client/petstore/go/go-petstore/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2126,3 +2126,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"
@jimschubertjimschubertOct 5, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sebastien-rosset I see you added this to swagger-parser, but it doesn't seem to be consumed anywhere.
Do you need to create a follow up to consume this as mentioned in #6290?
Limitation: due to issue swagger-parser #1369, achieving OAS compliance is not possible when the input document uses the OAS 2.0 schema. For OAS 2.0 documents, the legacy behavior should be used by setting the disallowAdditionalPropertiesIfNotPresent CLI option to true.
@sebastien-rossetsebastien-rossetOct 5, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, there needs to be a follow up. Actually even better would be to ensure the 2.0 parser is converting additionalProperties properly.

With x-original-swagger-version, at least we know the source is 2.0, but if the converter is not converting properly to 3.0 (and retaining the semantics), it's still going to be a problem.

1 change: 1 addition & 0 deletions
samples/client/petstore/haskell-http-client/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2126,3 +2126,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/client/petstore/java/feign-no-nullable/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/feign/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/google-api-client/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/jersey1/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/jersey2-java8/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/native-async/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/native/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/okhttp-gson-parcelableModel/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/okhttp-gson/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/rest-assured-jackson/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/rest-assured/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/resteasy/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/resttemplate/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2-play26/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2rx2/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2rx3/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/vertx-no-nullable/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/vertx/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/webclient/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-api-package-override/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-async/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-controller-only/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-fake-endpoints/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2880,5 +2880,6 @@
 "type" : "http"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-bean-validation/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-exception-handling/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-interface/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-nullable/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-wrap-calls/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/main/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2261,3 +2261,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-spec/src/main/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2261,3 +2261,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -794,3 +794,4 @@ components:
 name: api_key
 type: apiKey
 x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/python-aiohttp/openapi_server/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -794,3 +794,4 @@ components:
 name: api_key
 type: apiKey
 x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/python-flask/openapi_server/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -783,3 +783,4 @@ components:
 name: api_key
 type: apiKey
 x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
...store/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1591,4 +1591,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/server/petstore/rust-server/output/rust-server-test/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,4 +212,5 @@ components:
 required:
 - required_thing
 type: object
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2261,3 +2261,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
CHORE[DEPENDENCIES]: bump swagger-parser => 2.0.22#7597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 1 commit into

from

Dec 8, 2020
 Merged


CHORE[DEPENDENCIES]: bump swagger-parser => 2.0.22
#7597
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 10 additions & 2 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -472,14 +472,22 @@ private void flattenComponents(OpenAPI openAPI) {
 * @param m Schema implementation
 */
 private void fixStringModel(Schema m) {
 if (m.getType() != null && m.getType().equals("string") && m.getExample() != null) {
 if (schemaIsOfType(m, "string") && schemaContainsExample(m)) {
 String example = m.getExample().toString();
 if (example.substring(0, 1).equals("\"") && example.substring(example.length() - 1).equals("\"")) {
 if (example.startsWith("\"") && example.endsWith("\"")) {
 m.setExample(example.substring(1, example.length() - 1));
 }
 }
 }

 private boolean schemaIsOfType(Schema m, String type) {
 return m.getType() != null && m.getType().equals(type);
 }

 private boolean schemaContainsExample(Schema m) {
 return m.getExample() != null && m.getExample() != "";
 }

 /**
 * Generates a unique model name. Non-alphanumeric characters will be replaced
 * with underscores
Expand Down

3 changes: 2 additions & 1 deletion
...les/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@
import io.swagger.v3.oas.models.responses.ApiResponses;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.utils.ModelUtils;
import org.testng.Assert;
import org.testng.annotations.Test;

import java.util.HashMap;
Expand DownExpand Up@@ -927,7 +928,7 @@ public void emptyExampleOnStringTypeModels() {
 assertEquals("#/components/schemas/EmptyExampleOnStringTypeModels", schema.getItems().get$ref());

 assertTrue(ModelUtils.getReferencedSchema(openAPI, schema.getItems()) instanceof StringSchema);
assertNull(ModelUtils.getReferencedSchema(openAPI, schema.getItems()).getExample());
Assert.assertSame(ModelUtils.getReferencedSchema(openAPI, schema.getItems()).getExample(), "");
 }

 @Test
Expand Down

2 changes: 1 addition & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1510,7 +1510,7 @@
 <maven.compiler.target>1.8</maven.compiler.target>
 <swagger-core-version>2.1.2</swagger-core-version>
 <swagger-parser-groupid>io.swagger.parser.v3</swagger-parser-groupid>
 <swagger-parser-version>2.0.20</swagger-parser-version>
 <swagger-parser-version>2.0.22</swagger-parser-version>
 <felix-version>3.3.1</felix-version>
 <commons-io-version>2.4</commons-io-version>
 <commons-cli-version>1.2</commons-cli-version>
Expand Down

1 change: 1 addition & 0 deletions
samples/client/petstore/go/go-petstore/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2126,3 +2126,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"
@jimschubertjimschubertOct 5, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sebastien-rosset I see you added this to swagger-parser, but it doesn't seem to be consumed anywhere.
Do you need to create a follow up to consume this as mentioned in #6290?
Limitation: due to issue swagger-parser #1369, achieving OAS compliance is not possible when the input document uses the OAS 2.0 schema. For OAS 2.0 documents, the legacy behavior should be used by setting the disallowAdditionalPropertiesIfNotPresent CLI option to true.
@sebastien-rossetsebastien-rossetOct 5, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, there needs to be a follow up. Actually even better would be to ensure the 2.0 parser is converting additionalProperties properly.

With x-original-swagger-version, at least we know the source is 2.0, but if the converter is not converting properly to 3.0 (and retaining the semantics), it's still going to be a problem.

1 change: 1 addition & 0 deletions
samples/client/petstore/haskell-http-client/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2126,3 +2126,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/client/petstore/java/feign-no-nullable/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/feign/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/google-api-client/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/jersey1/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/jersey2-java8/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/native-async/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/native/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/okhttp-gson-parcelableModel/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/okhttp-gson/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/rest-assured-jackson/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/rest-assured/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/resteasy/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/resttemplate/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2-play26/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2rx2/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/retrofit2rx3/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/vertx-no-nullable/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/vertx/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/client/petstore/java/webclient/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2187,4 +2187,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-api-package-override/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-async/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-controller-only/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-fake-endpoints/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2880,5 +2880,6 @@
 "type" : "http"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-bean-validation/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-exception-handling/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-interface/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-nullable/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework-no-wrap-calls/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

3 changes: 2 additions & 1 deletion
samples/server/petstore/java-play-framework/public/openapi.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1037,5 +1037,6 @@
 "type" : "apiKey"
 }
 }
 }
 },
 "x-original-swagger-version" : "2.0"
}

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-spec-interface/src/main/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2261,3 +2261,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/jaxrs-spec/src/main/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2261,3 +2261,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -794,3 +794,4 @@ components:
 name: api_key
 type: apiKey
 x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/python-aiohttp/openapi_server/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -794,3 +794,4 @@ components:
 name: api_key
 type: apiKey
 x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
samples/server/petstore/python-flask/openapi_server/openapi/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -783,3 +783,4 @@ components:
 name: api_key
 type: apiKey
 x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
x-original-swagger-version: "2.0"

1 change: 1 addition & 0 deletions
...store/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1591,4 +1591,5 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/server/petstore/rust-server/output/rust-server-test/api/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,4 +212,5 @@ components:
 required:
 - required_thing
 type: object
x-original-swagger-version: "2.0"


1 change: 1 addition & 0 deletions
samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2261,3 +2261,4 @@ components:
 http_basic_test:
 scheme: basic
 type: http
x-original-swagger-version: "2.0"