Skip to content
This repository was archived by the owner on Nov 24, 2022. It is now read-only.

Commit 420ac99

Browse files
committed
OpenAPIV3Parser#getExtensions() not finding extensions on OSGi swagger-api#1003 (formatting)
1 parent f67ed2d commit 420ac99

2 files changed

Lines changed: 14 additions & 11 deletions

File tree

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/OpenAPIV3Parser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,10 +202,10 @@ public SwaggerParseResult readContents(String swaggerAsString, List<Authorizatio
202202
* from this class classloader (as in OSGi), locates extensions from this
203203
* class classloader as well.
204204
*
205-
* @return
205+
* @return a list of extensions
206206
*/
207207
protected List<SwaggerParserExtension> getExtensions() {
208-
ClassLoader tccl = Thread.currentThread().getContextClassLoader();
208+
ClassLoader tccl = Thread.currentThread().getContextClassLoader();
209209
List<SwaggerParserExtension> extensions = getExtensions(tccl);
210210
ClassLoader cl = SwaggerParserExtension.class.getClassLoader();
211211
if (cl != tccl) {

modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/OpenAPIV3ParserTest.java

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1803,15 +1803,18 @@ public void shouldParseExternalSchemaModelHavingReferenceToItsLocalModel() {
18031803

18041804
@Test(description = "Test that extensions can be found on the class classloader in addition to tccl.")
18051805
public void testIssue1003_ExtensionsClassloader() {
1806-
ClassLoader tccl = Thread.currentThread().getContextClassLoader();
1807-
try {
1808-
// Temporarily switch tccl to an unproductive cl
1809-
final ClassLoader tcclTemp = new java.net.URLClassLoader(new java.net.URL[] {}, ClassLoader.getSystemClassLoader());
1810-
Thread.currentThread().setContextClassLoader(tcclTemp);
1811-
assertNotNull(new OpenAPIV3Parser().read("src/test/resources/test.yaml"));
1812-
} finally {
1813-
Thread.currentThread().setContextClassLoader(tccl);
1814-
}
1806+
ClassLoader tccl = Thread.currentThread().getContextClassLoader();
1807+
OpenAPI api = null;
1808+
try {
1809+
// Temporarily switch tccl to an unproductive cl
1810+
final ClassLoader tcclTemp = new java.net.URLClassLoader(new java.net.URL[] {},
1811+
ClassLoader.getSystemClassLoader());
1812+
Thread.currentThread().setContextClassLoader(tcclTemp);
1813+
api = new OpenAPIV3Parser().read("src/test/resources/test.yaml");
1814+
} finally {
1815+
Thread.currentThread().setContextClassLoader(tccl);
1816+
}
1817+
assertNotNull(api);
18151818
}
18161819

18171820
private static int getDynamicPort() {

0 commit comments

Comments
 (0)