Skip to content
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.

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

Add host() method to docket #1011

Merged
merged 2 commits into from Oct 27, 2015
Merged

Add host() method to docket #1011

merged 2 commits into from Oct 27, 2015

Conversation

@cbornet
Copy link
Contributor

@cbornet cbornet commented Oct 16, 2015

This PR enables overriding the default host from the Docket.

  • if "host" is not set, then the behavior will be the same as the current one (use the properties file or the swagger def endpoint hostname)
  • if "host" is set, then it will be used.

Fixes #764

@cbornet
Copy link
Contributor Author

@cbornet cbornet commented Oct 16, 2015

@dilipkrish Tell me if you are OK with this. If OK, please wait that I add unit tests before merging.

@dilipkrish
Copy link
Member

@dilipkrish dilipkrish commented Oct 16, 2015

looks good to me 👍 only I'd say on the docket add an @Incubating annotation with 2.3 as the version

@dilipkrish
Copy link
Member

@dilipkrish dilipkrish commented Oct 16, 2015

Also it doesn't seem like using @SwaggerDefinition is going to work for this issue

@dilipkrish
Copy link
Member

@dilipkrish dilipkrish commented Oct 27, 2015

Is this ready for merge? Trying to close it out so I can include in 2.3

@cbornet
Copy link
Contributor Author

@cbornet cbornet commented Oct 27, 2015

Arf! There is a conflict. I will solve it today.

cbornet added 2 commits Oct 16, 2015
@cbornet cbornet force-pushed the cbornet:docket_sethost branch from 0adbf03 to db5f491 Oct 27, 2015
@cbornet
Copy link
Contributor Author

@cbornet cbornet commented Oct 27, 2015

Rebase done and unit tests OK --> ready to merge 😄

dilipkrish added a commit that referenced this pull request Oct 27, 2015
Add host() method to docket

fixes #764
@dilipkrish dilipkrish merged commit e5ef98c into springfox:master Oct 27, 2015
1 check passed
1 check passed
ci/circleci Your tests passed on CircleCI!
Details
@dilipkrish
Copy link
Member

@dilipkrish dilipkrish commented Oct 27, 2015

@cbornet done! thanks for being patient 🤘

@dilipkrish dilipkrish added the PR label Oct 27, 2015
@dilipkrish dilipkrish added this to the 2.3.0 milestone Oct 27, 2015
@cbornet cbornet deleted the cbornet:docket_sethost branch Oct 27, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants