Merge pull request swagger-api#2727 from swagger-api/known-locations

update config file known locations
stbischof · Mar 23, 2018 · 5336adb · 5336adb
2 parents 5285854 + 1f572f6
commit 5336adb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/...wagger-integration/src/main/java/io/swagger/v3/oas/integration/GenericOpenApiContext.java b/...wagger-integration/src/main/java/io/swagger/v3/oas/integration/GenericOpenApiContext.java
@@ -209,6 +209,10 @@ protected List<ImmutablePair<String, String>> getKnownLocations() {
                 new ImmutablePair<>("classpath", "openapi-configuration.json"),
                 new ImmutablePair<>("file", "openapi-configuration.yaml"),
                 new ImmutablePair<>("file", "openapi-configuration.json"),
+                new ImmutablePair<>("classpath", "openapi.yaml"),
+                new ImmutablePair<>("classpath", "openapi.json"),
+                new ImmutablePair<>("file", "openapi.yaml"),
+                new ImmutablePair<>("file", "openapi.json"),
                 new ImmutablePair<>("service", "")
         );
     }

diff --git a/...s/swagger-jaxrs2/src/main/java/io/swagger/v3/jaxrs2/integration/XmlWebOpenApiContext.java b/...s/swagger-jaxrs2/src/main/java/io/swagger/v3/jaxrs2/integration/XmlWebOpenApiContext.java
@@ -48,7 +48,11 @@ protected List<ImmutablePair<String, String>> getKnownLocations() {
                 new ImmutablePair<>("servletpath", "openapi-configuration.yaml"),
                 new ImmutablePair<>("servletpath", "openapi-configuration.json"),
                 new ImmutablePair<>("servletpath", "WEB-INF/openapi-configuration.yaml"),
-                new ImmutablePair<>("servletpath", "WEB-INF/openapi-configuration.json")
+                new ImmutablePair<>("servletpath", "WEB-INF/openapi-configuration.json"),
+                new ImmutablePair<>("servletpath", "openapi.yaml"),
+                new ImmutablePair<>("servletpath", "openapi.json"),
+                new ImmutablePair<>("servletpath", "WEB-INF/openapi.yaml"),
+                new ImmutablePair<>("servletpath", "WEB-INF/openapi.json")
         ));
         locations.addAll(super.getKnownLocations());
         locations.add(new ImmutablePair<>("servlet", ""));  // get config from init params