Skip to content

Fix port when the URL doesn't have port specified #8049

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 2 commits into from
Dec 1, 2020
Merged

Fix port when the URL doesn't have port specified #8049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f368d05
fix port missingin oas 3 spec
wing328 Nov 30, 2020
36e1b40
update samples
wing328 Nov 30, 2020
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/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,7 @@ private Map<String, Object> buildSupportFileBundle(List<Object> allOperations, L
bundle.put("basePathWithoutHost", basePathWithoutHost);
bundle.put("scheme", URLPathUtils.getScheme(url, config));
bundle.put("host", url.getHost());
if (url.getPort() != 80 && url.getPort() != 443 ) {
if (url.getPort() != 80 && url.getPort() != 443 && url.getPort() != -1) {
Copy link
Contributor

@jfeltesse-mdsol jfeltesse-mdsol Nov 30, 2020

Choose a reason for hiding this comment

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

I guess that does the trick but why was the port -1 to begin with? Some default value? Unfortunate conversion or something?
If there's no way to make it so it doesn't get the -1 value I suppose a comment explaining why -1 is a possible value and needs to be handled would help in the future.
Port 80 and 443 people can figure it out, -1, not so much I guess.

Copy link
Member Author

@wing328 wing328 Nov 30, 2020

Choose a reason for hiding this comment

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

The getPort() function is a part of URL class. The function getPort() returns the port of a specified URL. The function returns the port number or -1 if the port is not set

Ref: https://www.geeksforgeeks.org/url-getport-method-in-java-with-examples/

bundle.put("port", url.getPort());
}
bundle.put("contextPath", contextPath);
Expand Down
2 changes: 1 addition & 1 deletion ...penapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/configuration.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ class Configuration

def initialize
@scheme = 'http'
@host = 'petstore.swagger.io:-1'
@host = 'petstore.swagger.io'
@base_path = '/v2'
@server_index = 0
@server_operation_index = {}
Expand Down