Skip to content

Fixed issue [Spring]Add support for the contextPath in Spring-boot gen #3193 #3307

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
Jul 7, 2016
Merged

Fixed issue [Spring]Add support for the contextPath in Spring-boot gen #3193 #3307

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
2 changes: 1 addition & 1 deletion modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public void processOpts() {
(sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "HomeController.java"));
supportingFiles.add(new SupportingFile("swagger2SpringBoot.mustache",
(sourceFolder + File.separator + basePackage).replace(".", java.io.File.separator), "Swagger2SpringBoot.java"));
supportingFiles.add(new SupportingFile("application.properties",
supportingFiles.add(new SupportingFile("application.mustache",
Copy link
Contributor

@wing328 wing328 Jul 7, 2016

Choose a reason for hiding this comment

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

@vovan- can you please also do the same for spring-mvc?

https://github.com/swagger-api/swagger-codegen/pull/3307/files#diff-8642abd39c9b8b007a73f66dad7250caR139

Copy link
Contributor Author

@vovan- vovan- Jul 7, 2016

Choose a reason for hiding this comment

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

For Spring mvc property 'server.contextPath' means nothing, it is spring-boot related as noted here http://docs.spring.io/spring-boot/docs/current/reference/html/common-application-properties.html
So is there a reason to use same application.properties file for Spring boot and Spring mvc?

Copy link
Contributor

@wing328 wing328 Jul 7, 2016

Choose a reason for hiding this comment

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

I see. Didn't realise it's for spring boot only. I'll merge the PR shortly.

("src.main.resources").replace(".", java.io.File.separator), "application.properties"));
}
if (library.equals("spring-mvc")) {
Expand Down
3 changes: 3 additions & 0 deletions modules/swagger-codegen/src/main/resources/JavaSpring/application.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
springfox.documentation.swagger.v2.path=/api-docs
server.contextPath={{^contextPath}}/{{/contextPath}}{{#contextPath}}{{contextPath}}{{/contextPath}}
#server.port=8090