Expand path templates via resttemplate's uriTemplateHandler#3500

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
macjohnny merged 4 commits into from
Aug 6, 2019
Merged

Expand path templates via resttemplate's uriTemplateHandler #3500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34fda67
Expand path templates via resttemplate's uriTemplateHandler
unintended Jul 30, 2019
97f88dc
fix tests and compilation on lower jdk version
unintended Jul 30, 2019
050303a
fix typo
unintended Jul 31, 2019
236cb31
re-generate samples
unintended Jul 31, 2019
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
10 changes: 10 additions & 0 deletions modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -555,6 +555,16 @@ public class ApiClient {
return isForm ? formParams : obj;
}

/**
* Expand path template with variables
* @param pathTemplate path template with placeholders
* @param variables variables to replace
* @return path with placeholders replaced by variables
*/
public String expandPath(String pathTemplate, Map<String, Object> variables) {
return restTemplate.getUriTemplateHandler().expand(pathTemplate, variables).toString();
}

/**
* Invoke API by sending HTTP request with the given options.
*
Expand Down
3 changes: 2 additions & 1 deletion modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import {{invokerPackage}}.ApiClient;
{{/imports}}

{{^fullJavaUtil}}import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -72,7 +73,7 @@ public class {{classname}} {
// create path and map variables
final Map<String, Object> uriVariables = new HashMap<String, Object>();{{#pathParams}}
uriVariables.put("{{baseName}}", {{#collectionFormat}}apiClient.collectionPathParameterToString(ApiClient.CollectionFormat.valueOf("{{{collectionFormat}}}".toUpperCase()), {{{paramName}}}){{/collectionFormat}}{{^collectionFormat}}{{{paramName}}}{{/collectionFormat}});{{/pathParams}}{{/hasPathParams}}
String path = UriComponentsBuilder.fromPath("{{{path}}}"){{#hasPathParams}}.buildAndExpand(uriVariables){{/hasPathParams}}{{^hasPathParams}}.build(){{/hasPathParams}}.toUriString();
String path = apiClient.expandPath("{{{path}}}", {{#hasPathParams}}uriVariables{{/hasPathParams}}{{^hasPathParams}}Collections.<String, Object>emptyMap(){{/hasPathParams}});

final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
Expand Down
10 changes: 10 additions & 0 deletions ...t/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -543,6 +543,16 @@ protected Object selectBody(Object obj, MultiValueMap<String, Object> formParams
return isForm ? formParams : obj;
}

/**
* Expand path template with variables
* @param pathTemplate path template with placeholders
* @param variables variables to replace
* @return path with placeholders replaced by variables
*/
public String expandPath(String pathTemplate, Map<String, Object> variables) {
return restTemplate.getUriTemplateHandler().expand(pathTemplate, variables).toString();
}

/**
* Invoke API by sending HTTP request with the given options.
*
Expand Down
3 changes: 2 additions & 1 deletion ...e/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import org.openapitools.client.model.Client;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -62,7 +63,7 @@ public Client call123testSpecialTags(Client body) throws RestClientException {
throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling call123testSpecialTags");
}

String path = UriComponentsBuilder.fromPath("/another-fake/dummy").build().toUriString();
String path = apiClient.expandPath("/another-fake/dummy", Collections.<String, Object>emptyMap());

final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
Expand Down
27 changes: 14 additions & 13 deletions ...petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
import org.openapitools.client.model.XmlItem;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -69,7 +70,7 @@ public void createXmlItem(XmlItem xmlItem) throws RestClientException {
throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'xmlItem' when calling createXmlItem");
}

String path = UriComponentsBuilder.fromPath("/fake/create_xml_item").build().toUriString();
String path = apiClient.expandPath("/fake/create_xml_item", Collections.<String, Object>emptyMap());

final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -98,7 +99,7 @@ public void createXmlItem(XmlItem xmlItem) throws RestClientException {
public Boolean fakeOuterBooleanSerialize(Boolean body) throws RestClientException {
Object postBody = body;

String path = UriComponentsBuilder.fromPath("/fake/outer/boolean").build().toUriString();
String path = apiClient.expandPath("/fake/outer/boolean", Collections.<String, Object>emptyMap());

final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -127,7 +128,7 @@ public Boolean fakeOuterBooleanSerialize(Boolean body) throws RestClientExceptio
public OuterComposite fakeOuterCompositeSerialize(OuterComposite body) throws RestClientException {
Object postBody = body;

String path = UriComponentsBuilder.fromPath("/fake/outer/composite").build().toUriString();
String path = apiClient.expandPath("/fake/outer/composite", Collections.<String, Object>emptyMap());

final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -156,7 +157,7 @@ public OuterComposite fakeOuterCompositeSerialize(OuterComposite body) throws Re
public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws RestClientException {
Object postBody = body;

String path = UriComponentsBuilder.fromPath("/fake/outer/number").build().toUriString();
String path = apiClient.expandPath("/fake/outer/number", Collections.<String, Object>emptyMap());

final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -185,7 +186,7 @@ public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws RestClientExc
public String fakeOuterStringSerialize(String body) throws RestClientException {
Object postBody = body;

String path = UriComponentsBuilder.fromPath("/fake/outer/string").build().toUriString();
String path = apiClient.expandPath("/fake/outer/string", Collections.<String, Object>emptyMap());

final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -218,7 +219,7 @@ public void testBodyWithFileSchema(FileSchemaTestClass body) throws RestClientEx
throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testBodyWithFileSchema");
}

String path = UriComponentsBuilder.fromPath("/fake/body-with-file-schema").build().toUriString();
String path = apiClient.expandPath("/fake/body-with-file-schema", Collections.<String, Object>emptyMap());

final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -257,7 +258,7 @@ public void testBodyWithQueryParams(String query, User body) throws RestClientEx
throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testBodyWithQueryParams");
}

String path = UriComponentsBuilder.fromPath("/fake/body-with-query-params").build().toUriString();
String path = apiClient.expandPath("/fake/body-with-query-params", Collections.<String, Object>emptyMap());

final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -293,7 +294,7 @@ public Client testClientModel(Client body) throws RestClientException {
throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testClientModel");
}

String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -357,7 +358,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter '_byte' when calling testEndpointParameters");
}

String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -422,7 +423,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) throws RestClientException {
Object postBody = null;

String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -485,7 +486,7 @@ public void testGroupParameters(Integer requiredStringGroup, Boolean requiredBoo
throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'requiredInt64Group' when calling testGroupParameters");
}

String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -526,7 +527,7 @@ public void testInlineAdditionalProperties(Map<String, String> param) throws Res
throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'param' when calling testInlineAdditionalProperties");
}

String path = UriComponentsBuilder.fromPath("/fake/inline-additionalProperties").build().toUriString();
String path = apiClient.expandPath("/fake/inline-additionalProperties", Collections.<String, Object>emptyMap());

final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -565,7 +566,7 @@ public void testJsonFormData(String param, String param2) throws RestClientExcep
throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'param2' when calling testJsonFormData");
}

String path = UriComponentsBuilder.fromPath("/fake/jsonFormData").build().toUriString();
String path = apiClient.expandPath("/fake/jsonFormData", Collections.<String, Object>emptyMap());

final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
Expand Down
3 changes: 2 additions & 1 deletion ...sttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import org.openapitools.client.model.Client;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -62,7 +63,7 @@ public Client testClassname(Client body) throws RestClientException {
throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testClassname");
}

String path = UriComponentsBuilder.fromPath("/fake_classname_test").build().toUriString();
String path = apiClient.expandPath("/fake_classname_test", Collections.<String, Object>emptyMap());

final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
Expand Down
19 changes: 10 additions & 9 deletions .../petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
import org.openapitools.client.model.Pet;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -64,7 +65,7 @@ public void addPet(Pet body) throws RestClientException {
throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling addPet");
}

String path = UriComponentsBuilder.fromPath("/pet").build().toUriString();
String path = apiClient.expandPath("/pet", Collections.<String, Object>emptyMap());

final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -102,7 +103,7 @@ public void deletePet(Long petId, String apiKey) throws RestClientException {
// create path and map variables
final Map<String, Object> uriVariables = new HashMap<String, Object>();
uriVariables.put("petId", petId);
String path = UriComponentsBuilder.fromPath("/pet/{petId}").buildAndExpand(uriVariables).toUriString();
String path = apiClient.expandPath("/pet/{petId}", uriVariables);

final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -138,7 +139,7 @@ public List<Pet> findPetsByStatus(List<String> status) throws RestClientExceptio
throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'status' when calling findPetsByStatus");
}

String path = UriComponentsBuilder.fromPath("/pet/findByStatus").build().toUriString();
String path = apiClient.expandPath("/pet/findByStatus", Collections.<String, Object>emptyMap());

final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -175,7 +176,7 @@ public List<Pet> findPetsByTags(List<String> tags) throws RestClientException {
throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'tags' when calling findPetsByTags");
}

String path = UriComponentsBuilder.fromPath("/pet/findByTags").build().toUriString();
String path = apiClient.expandPath("/pet/findByTags", Collections.<String, Object>emptyMap());

final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -216,7 +217,7 @@ public Pet getPetById(Long petId) throws RestClientException {
// create path and map variables
final Map<String, Object> uriVariables = new HashMap<String, Object>();
uriVariables.put("petId", petId);
String path = UriComponentsBuilder.fromPath("/pet/{petId}").buildAndExpand(uriVariables).toUriString();
String path = apiClient.expandPath("/pet/{petId}", uriVariables);

final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -252,7 +253,7 @@ public void updatePet(Pet body) throws RestClientException {
throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling updatePet");
}

String path = UriComponentsBuilder.fromPath("/pet").build().toUriString();
String path = apiClient.expandPath("/pet", Collections.<String, Object>emptyMap());

final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -290,7 +291,7 @@ public void updatePetWithForm(Long petId, String name, String status) throws Res
// create path and map variables
final Map<String, Object> uriVariables = new HashMap<String, Object>();
uriVariables.put("petId", petId);
String path = UriComponentsBuilder.fromPath("/pet/{petId}").buildAndExpand(uriVariables).toUriString();
String path = apiClient.expandPath("/pet/{petId}", uriVariables);

final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -334,7 +335,7 @@ public ModelApiResponse uploadFile(Long petId, String additionalMetadata, File f
// create path and map variables
final Map<String, Object> uriVariables = new HashMap<String, Object>();
uriVariables.put("petId", petId);
String path = UriComponentsBuilder.fromPath("/pet/{petId}/uploadImage").buildAndExpand(uriVariables).toUriString();
String path = apiClient.expandPath("/pet/{petId}/uploadImage", uriVariables);

final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -385,7 +386,7 @@ public ModelApiResponse uploadFileWithRequiredFile(Long petId, File requiredFile
// create path and map variables
final Map<String, Object> uriVariables = new HashMap<String, Object>();
uriVariables.put("petId", petId);
String path = UriComponentsBuilder.fromPath("/fake/{petId}/uploadImageWithRequiredFile").buildAndExpand(uriVariables).toUriString();
String path = apiClient.expandPath("/fake/{petId}/uploadImageWithRequiredFile", uriVariables);

final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Expand path templates via resttemplate's uriTemplateHandler#3500

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

macjohnny
merged 4 commits into

from

Aug 6, 2019
 Merged


Expand path templates via resttemplate's uriTemplateHandler
#3500
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
34fda67

Expand path templates via resttemplate's uriTemplateHandler


unintended Jul 30, 2019
97f88dc

fix tests and compilation on lower jdk version


unintended Jul 30, 2019
050303a

fix typo


unintended Jul 31, 2019
236cb31

re-generate samples


unintended Jul 31, 2019

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


10 changes: 10 additions & 0 deletions
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -555,6 +555,16 @@ public class ApiClient {
 return isForm ? formParams : obj;
 }

 /**
 * Expand path template with variables
 * @param pathTemplate path template with placeholders
 * @param variables variables to replace
 * @return path with placeholders replaced by variables
 */
 public String expandPath(String pathTemplate, Map<String, Object> variables) {
 return restTemplate.getUriTemplateHandler().expand(pathTemplate, variables).toString();
 }

 /**
 * Invoke API by sending HTTP request with the given options.
 *
Expand Down

3 changes: 2 additions & 1 deletion
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import {{invokerPackage}}.ApiClient;
{{/imports}}

{{^fullJavaUtil}}import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -72,7 +73,7 @@ public class {{classname}} {
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();{{#pathParams}}
 uriVariables.put("{{baseName}}", {{#collectionFormat}}apiClient.collectionPathParameterToString(ApiClient.CollectionFormat.valueOf("{{{collectionFormat}}}".toUpperCase()), {{{paramName}}}){{/collectionFormat}}{{^collectionFormat}}{{{paramName}}}{{/collectionFormat}});{{/pathParams}}{{/hasPathParams}}
 String path = UriComponentsBuilder.fromPath("{{{path}}}"){{#hasPathParams}}.buildAndExpand(uriVariables){{/hasPathParams}}{{^hasPathParams}}.build(){{/hasPathParams}}.toUriString();
 String path = apiClient.expandPath("{{{path}}}", {{#hasPathParams}}uriVariables{{/hasPathParams}}{{^hasPathParams}}Collections.<String, Object>emptyMap(){{/hasPathParams}});

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

10 changes: 10 additions & 0 deletions
...t/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -543,6 +543,16 @@ protected Object selectBody(Object obj, MultiValueMap<String, Object> formParams
 return isForm ? formParams : obj;
 }

 /**
 * Expand path template with variables
 * @param pathTemplate path template with placeholders
 * @param variables variables to replace
 * @return path with placeholders replaced by variables
 */
 public String expandPath(String pathTemplate, Map<String, Object> variables) {
 return restTemplate.getUriTemplateHandler().expand(pathTemplate, variables).toString();
 }

 /**
 * Invoke API by sending HTTP request with the given options.
 *
Expand Down

3 changes: 2 additions & 1 deletion
...e/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import org.openapitools.client.model.Client;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -62,7 +63,7 @@ public Client call123testSpecialTags(Client body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling call123testSpecialTags");
 }

 String path = UriComponentsBuilder.fromPath("/another-fake/dummy").build().toUriString();
 String path = apiClient.expandPath("/another-fake/dummy", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

27 changes: 14 additions & 13 deletions
...petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
import org.openapitools.client.model.XmlItem;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -69,7 +70,7 @@ public void createXmlItem(XmlItem xmlItem) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'xmlItem' when calling createXmlItem");
 }

 String path = UriComponentsBuilder.fromPath("/fake/create_xml_item").build().toUriString();
 String path = apiClient.expandPath("/fake/create_xml_item", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -98,7 +99,7 @@ public void createXmlItem(XmlItem xmlItem) throws RestClientException {
 public Boolean fakeOuterBooleanSerialize(Boolean body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/boolean").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/boolean", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -127,7 +128,7 @@ public Boolean fakeOuterBooleanSerialize(Boolean body) throws RestClientExceptio
 public OuterComposite fakeOuterCompositeSerialize(OuterComposite body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/composite").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/composite", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -156,7 +157,7 @@ public OuterComposite fakeOuterCompositeSerialize(OuterComposite body) throws Re
 public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/number").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/number", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -185,7 +186,7 @@ public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws RestClientExc
 public String fakeOuterStringSerialize(String body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/string").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/string", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -218,7 +219,7 @@ public void testBodyWithFileSchema(FileSchemaTestClass body) throws RestClientEx
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testBodyWithFileSchema");
 }

 String path = UriComponentsBuilder.fromPath("/fake/body-with-file-schema").build().toUriString();
 String path = apiClient.expandPath("/fake/body-with-file-schema", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -257,7 +258,7 @@ public void testBodyWithQueryParams(String query, User body) throws RestClientEx
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testBodyWithQueryParams");
 }

 String path = UriComponentsBuilder.fromPath("/fake/body-with-query-params").build().toUriString();
 String path = apiClient.expandPath("/fake/body-with-query-params", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -293,7 +294,7 @@ public Client testClientModel(Client body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testClientModel");
 }

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -357,7 +358,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter '_byte' when calling testEndpointParameters");
 }

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -422,7 +423,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
 public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) throws RestClientException {
 Object postBody = null;

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -485,7 +486,7 @@ public void testGroupParameters(Integer requiredStringGroup, Boolean requiredBoo
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'requiredInt64Group' when calling testGroupParameters");
 }

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -526,7 +527,7 @@ public void testInlineAdditionalProperties(Map<String, String> param) throws Res
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'param' when calling testInlineAdditionalProperties");
 }

 String path = UriComponentsBuilder.fromPath("/fake/inline-additionalProperties").build().toUriString();
 String path = apiClient.expandPath("/fake/inline-additionalProperties", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -565,7 +566,7 @@ public void testJsonFormData(String param, String param2) throws RestClientExcep
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'param2' when calling testJsonFormData");
 }

 String path = UriComponentsBuilder.fromPath("/fake/jsonFormData").build().toUriString();
 String path = apiClient.expandPath("/fake/jsonFormData", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

3 changes: 2 additions & 1 deletion
...sttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import org.openapitools.client.model.Client;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -62,7 +63,7 @@ public Client testClassname(Client body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testClassname");
 }

 String path = UriComponentsBuilder.fromPath("/fake_classname_test").build().toUriString();
 String path = apiClient.expandPath("/fake_classname_test", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

19 changes: 10 additions & 9 deletions
.../petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
import org.openapitools.client.model.Pet;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -64,7 +65,7 @@ public void addPet(Pet body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling addPet");
 }

 String path = UriComponentsBuilder.fromPath("/pet").build().toUriString();
 String path = apiClient.expandPath("/pet", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -102,7 +103,7 @@ public void deletePet(Long petId, String apiKey) throws RestClientException {
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -138,7 +139,7 @@ public List<Pet> findPetsByStatus(List<String> status) throws RestClientExceptio
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'status' when calling findPetsByStatus");
 }

 String path = UriComponentsBuilder.fromPath("/pet/findByStatus").build().toUriString();
 String path = apiClient.expandPath("/pet/findByStatus", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -175,7 +176,7 @@ public List<Pet> findPetsByTags(List<String> tags) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'tags' when calling findPetsByTags");
 }

 String path = UriComponentsBuilder.fromPath("/pet/findByTags").build().toUriString();
 String path = apiClient.expandPath("/pet/findByTags", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -216,7 +217,7 @@ public Pet getPetById(Long petId) throws RestClientException {
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -252,7 +253,7 @@ public void updatePet(Pet body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling updatePet");
 }

 String path = UriComponentsBuilder.fromPath("/pet").build().toUriString();
 String path = apiClient.expandPath("/pet", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -290,7 +291,7 @@ public void updatePetWithForm(Long petId, String name, String status) throws Res
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -334,7 +335,7 @@ public ModelApiResponse uploadFile(Long petId, String additionalMetadata, File f
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}/uploadImage").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}/uploadImage", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -385,7 +386,7 @@ public ModelApiResponse uploadFileWithRequiredFile(Long petId, File requiredFile
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/fake/{petId}/uploadImageWithRequiredFile").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/fake/{petId}/uploadImageWithRequiredFile", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Expand path templates via resttemplate's uriTemplateHandler#3500

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

macjohnny
merged 4 commits into

from

Aug 6, 2019
 Merged


Expand path templates via resttemplate's uriTemplateHandler
#3500
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
34fda67

Expand path templates via resttemplate's uriTemplateHandler


unintended Jul 30, 2019
97f88dc

fix tests and compilation on lower jdk version


unintended Jul 30, 2019
050303a

fix typo


unintended Jul 31, 2019
236cb31

re-generate samples


unintended Jul 31, 2019

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


10 changes: 10 additions & 0 deletions
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -555,6 +555,16 @@ public class ApiClient {
 return isForm ? formParams : obj;
 }

 /**
 * Expand path template with variables
 * @param pathTemplate path template with placeholders
 * @param variables variables to replace
 * @return path with placeholders replaced by variables
 */
 public String expandPath(String pathTemplate, Map<String, Object> variables) {
 return restTemplate.getUriTemplateHandler().expand(pathTemplate, variables).toString();
 }

 /**
 * Invoke API by sending HTTP request with the given options.
 *
Expand Down

3 changes: 2 additions & 1 deletion
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import {{invokerPackage}}.ApiClient;
{{/imports}}

{{^fullJavaUtil}}import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -72,7 +73,7 @@ public class {{classname}} {
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();{{#pathParams}}
 uriVariables.put("{{baseName}}", {{#collectionFormat}}apiClient.collectionPathParameterToString(ApiClient.CollectionFormat.valueOf("{{{collectionFormat}}}".toUpperCase()), {{{paramName}}}){{/collectionFormat}}{{^collectionFormat}}{{{paramName}}}{{/collectionFormat}});{{/pathParams}}{{/hasPathParams}}
 String path = UriComponentsBuilder.fromPath("{{{path}}}"){{#hasPathParams}}.buildAndExpand(uriVariables){{/hasPathParams}}{{^hasPathParams}}.build(){{/hasPathParams}}.toUriString();
 String path = apiClient.expandPath("{{{path}}}", {{#hasPathParams}}uriVariables{{/hasPathParams}}{{^hasPathParams}}Collections.<String, Object>emptyMap(){{/hasPathParams}});

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

10 changes: 10 additions & 0 deletions
...t/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -543,6 +543,16 @@ protected Object selectBody(Object obj, MultiValueMap<String, Object> formParams
 return isForm ? formParams : obj;
 }

 /**
 * Expand path template with variables
 * @param pathTemplate path template with placeholders
 * @param variables variables to replace
 * @return path with placeholders replaced by variables
 */
 public String expandPath(String pathTemplate, Map<String, Object> variables) {
 return restTemplate.getUriTemplateHandler().expand(pathTemplate, variables).toString();
 }

 /**
 * Invoke API by sending HTTP request with the given options.
 *
Expand Down

3 changes: 2 additions & 1 deletion
...e/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import org.openapitools.client.model.Client;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -62,7 +63,7 @@ public Client call123testSpecialTags(Client body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling call123testSpecialTags");
 }

 String path = UriComponentsBuilder.fromPath("/another-fake/dummy").build().toUriString();
 String path = apiClient.expandPath("/another-fake/dummy", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

27 changes: 14 additions & 13 deletions
...petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
import org.openapitools.client.model.XmlItem;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -69,7 +70,7 @@ public void createXmlItem(XmlItem xmlItem) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'xmlItem' when calling createXmlItem");
 }

 String path = UriComponentsBuilder.fromPath("/fake/create_xml_item").build().toUriString();
 String path = apiClient.expandPath("/fake/create_xml_item", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -98,7 +99,7 @@ public void createXmlItem(XmlItem xmlItem) throws RestClientException {
 public Boolean fakeOuterBooleanSerialize(Boolean body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/boolean").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/boolean", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -127,7 +128,7 @@ public Boolean fakeOuterBooleanSerialize(Boolean body) throws RestClientExceptio
 public OuterComposite fakeOuterCompositeSerialize(OuterComposite body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/composite").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/composite", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -156,7 +157,7 @@ public OuterComposite fakeOuterCompositeSerialize(OuterComposite body) throws Re
 public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/number").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/number", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -185,7 +186,7 @@ public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws RestClientExc
 public String fakeOuterStringSerialize(String body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/string").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/string", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -218,7 +219,7 @@ public void testBodyWithFileSchema(FileSchemaTestClass body) throws RestClientEx
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testBodyWithFileSchema");
 }

 String path = UriComponentsBuilder.fromPath("/fake/body-with-file-schema").build().toUriString();
 String path = apiClient.expandPath("/fake/body-with-file-schema", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -257,7 +258,7 @@ public void testBodyWithQueryParams(String query, User body) throws RestClientEx
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testBodyWithQueryParams");
 }

 String path = UriComponentsBuilder.fromPath("/fake/body-with-query-params").build().toUriString();
 String path = apiClient.expandPath("/fake/body-with-query-params", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -293,7 +294,7 @@ public Client testClientModel(Client body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testClientModel");
 }

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -357,7 +358,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter '_byte' when calling testEndpointParameters");
 }

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -422,7 +423,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
 public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) throws RestClientException {
 Object postBody = null;

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -485,7 +486,7 @@ public void testGroupParameters(Integer requiredStringGroup, Boolean requiredBoo
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'requiredInt64Group' when calling testGroupParameters");
 }

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -526,7 +527,7 @@ public void testInlineAdditionalProperties(Map<String, String> param) throws Res
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'param' when calling testInlineAdditionalProperties");
 }

 String path = UriComponentsBuilder.fromPath("/fake/inline-additionalProperties").build().toUriString();
 String path = apiClient.expandPath("/fake/inline-additionalProperties", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -565,7 +566,7 @@ public void testJsonFormData(String param, String param2) throws RestClientExcep
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'param2' when calling testJsonFormData");
 }

 String path = UriComponentsBuilder.fromPath("/fake/jsonFormData").build().toUriString();
 String path = apiClient.expandPath("/fake/jsonFormData", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

3 changes: 2 additions & 1 deletion
...sttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import org.openapitools.client.model.Client;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -62,7 +63,7 @@ public Client testClassname(Client body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testClassname");
 }

 String path = UriComponentsBuilder.fromPath("/fake_classname_test").build().toUriString();
 String path = apiClient.expandPath("/fake_classname_test", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

19 changes: 10 additions & 9 deletions
.../petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
import org.openapitools.client.model.Pet;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -64,7 +65,7 @@ public void addPet(Pet body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling addPet");
 }

 String path = UriComponentsBuilder.fromPath("/pet").build().toUriString();
 String path = apiClient.expandPath("/pet", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -102,7 +103,7 @@ public void deletePet(Long petId, String apiKey) throws RestClientException {
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -138,7 +139,7 @@ public List<Pet> findPetsByStatus(List<String> status) throws RestClientExceptio
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'status' when calling findPetsByStatus");
 }

 String path = UriComponentsBuilder.fromPath("/pet/findByStatus").build().toUriString();
 String path = apiClient.expandPath("/pet/findByStatus", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -175,7 +176,7 @@ public List<Pet> findPetsByTags(List<String> tags) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'tags' when calling findPetsByTags");
 }

 String path = UriComponentsBuilder.fromPath("/pet/findByTags").build().toUriString();
 String path = apiClient.expandPath("/pet/findByTags", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -216,7 +217,7 @@ public Pet getPetById(Long petId) throws RestClientException {
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -252,7 +253,7 @@ public void updatePet(Pet body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling updatePet");
 }

 String path = UriComponentsBuilder.fromPath("/pet").build().toUriString();
 String path = apiClient.expandPath("/pet", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -290,7 +291,7 @@ public void updatePetWithForm(Long petId, String name, String status) throws Res
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -334,7 +335,7 @@ public ModelApiResponse uploadFile(Long petId, String additionalMetadata, File f
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}/uploadImage").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}/uploadImage", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -385,7 +386,7 @@ public ModelApiResponse uploadFileWithRequiredFile(Long petId, File requiredFile
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/fake/{petId}/uploadImageWithRequiredFile").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/fake/{petId}/uploadImageWithRequiredFile", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Expand path templates via resttemplate's uriTemplateHandler#3500

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

macjohnny
merged 4 commits into

from

Aug 6, 2019
 Merged


Expand path templates via resttemplate's uriTemplateHandler
#3500
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
34fda67

Expand path templates via resttemplate's uriTemplateHandler


unintended Jul 30, 2019
97f88dc

fix tests and compilation on lower jdk version


unintended Jul 30, 2019
050303a

fix typo


unintended Jul 31, 2019
236cb31

re-generate samples


unintended Jul 31, 2019

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


10 changes: 10 additions & 0 deletions
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -555,6 +555,16 @@ public class ApiClient {
 return isForm ? formParams : obj;
 }

 /**
 * Expand path template with variables
 * @param pathTemplate path template with placeholders
 * @param variables variables to replace
 * @return path with placeholders replaced by variables
 */
 public String expandPath(String pathTemplate, Map<String, Object> variables) {
 return restTemplate.getUriTemplateHandler().expand(pathTemplate, variables).toString();
 }

 /**
 * Invoke API by sending HTTP request with the given options.
 *
Expand Down

3 changes: 2 additions & 1 deletion
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import {{invokerPackage}}.ApiClient;
{{/imports}}

{{^fullJavaUtil}}import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -72,7 +73,7 @@ public class {{classname}} {
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();{{#pathParams}}
 uriVariables.put("{{baseName}}", {{#collectionFormat}}apiClient.collectionPathParameterToString(ApiClient.CollectionFormat.valueOf("{{{collectionFormat}}}".toUpperCase()), {{{paramName}}}){{/collectionFormat}}{{^collectionFormat}}{{{paramName}}}{{/collectionFormat}});{{/pathParams}}{{/hasPathParams}}
 String path = UriComponentsBuilder.fromPath("{{{path}}}"){{#hasPathParams}}.buildAndExpand(uriVariables){{/hasPathParams}}{{^hasPathParams}}.build(){{/hasPathParams}}.toUriString();
 String path = apiClient.expandPath("{{{path}}}", {{#hasPathParams}}uriVariables{{/hasPathParams}}{{^hasPathParams}}Collections.<String, Object>emptyMap(){{/hasPathParams}});

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

10 changes: 10 additions & 0 deletions
...t/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -543,6 +543,16 @@ protected Object selectBody(Object obj, MultiValueMap<String, Object> formParams
 return isForm ? formParams : obj;
 }

 /**
 * Expand path template with variables
 * @param pathTemplate path template with placeholders
 * @param variables variables to replace
 * @return path with placeholders replaced by variables
 */
 public String expandPath(String pathTemplate, Map<String, Object> variables) {
 return restTemplate.getUriTemplateHandler().expand(pathTemplate, variables).toString();
 }

 /**
 * Invoke API by sending HTTP request with the given options.
 *
Expand Down

3 changes: 2 additions & 1 deletion
...e/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import org.openapitools.client.model.Client;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -62,7 +63,7 @@ public Client call123testSpecialTags(Client body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling call123testSpecialTags");
 }

 String path = UriComponentsBuilder.fromPath("/another-fake/dummy").build().toUriString();
 String path = apiClient.expandPath("/another-fake/dummy", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

27 changes: 14 additions & 13 deletions
...petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
import org.openapitools.client.model.XmlItem;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -69,7 +70,7 @@ public void createXmlItem(XmlItem xmlItem) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'xmlItem' when calling createXmlItem");
 }

 String path = UriComponentsBuilder.fromPath("/fake/create_xml_item").build().toUriString();
 String path = apiClient.expandPath("/fake/create_xml_item", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -98,7 +99,7 @@ public void createXmlItem(XmlItem xmlItem) throws RestClientException {
 public Boolean fakeOuterBooleanSerialize(Boolean body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/boolean").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/boolean", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -127,7 +128,7 @@ public Boolean fakeOuterBooleanSerialize(Boolean body) throws RestClientExceptio
 public OuterComposite fakeOuterCompositeSerialize(OuterComposite body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/composite").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/composite", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -156,7 +157,7 @@ public OuterComposite fakeOuterCompositeSerialize(OuterComposite body) throws Re
 public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/number").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/number", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -185,7 +186,7 @@ public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws RestClientExc
 public String fakeOuterStringSerialize(String body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/string").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/string", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -218,7 +219,7 @@ public void testBodyWithFileSchema(FileSchemaTestClass body) throws RestClientEx
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testBodyWithFileSchema");
 }

 String path = UriComponentsBuilder.fromPath("/fake/body-with-file-schema").build().toUriString();
 String path = apiClient.expandPath("/fake/body-with-file-schema", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -257,7 +258,7 @@ public void testBodyWithQueryParams(String query, User body) throws RestClientEx
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testBodyWithQueryParams");
 }

 String path = UriComponentsBuilder.fromPath("/fake/body-with-query-params").build().toUriString();
 String path = apiClient.expandPath("/fake/body-with-query-params", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -293,7 +294,7 @@ public Client testClientModel(Client body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testClientModel");
 }

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -357,7 +358,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter '_byte' when calling testEndpointParameters");
 }

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -422,7 +423,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
 public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) throws RestClientException {
 Object postBody = null;

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -485,7 +486,7 @@ public void testGroupParameters(Integer requiredStringGroup, Boolean requiredBoo
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'requiredInt64Group' when calling testGroupParameters");
 }

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -526,7 +527,7 @@ public void testInlineAdditionalProperties(Map<String, String> param) throws Res
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'param' when calling testInlineAdditionalProperties");
 }

 String path = UriComponentsBuilder.fromPath("/fake/inline-additionalProperties").build().toUriString();
 String path = apiClient.expandPath("/fake/inline-additionalProperties", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -565,7 +566,7 @@ public void testJsonFormData(String param, String param2) throws RestClientExcep
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'param2' when calling testJsonFormData");
 }

 String path = UriComponentsBuilder.fromPath("/fake/jsonFormData").build().toUriString();
 String path = apiClient.expandPath("/fake/jsonFormData", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

3 changes: 2 additions & 1 deletion
...sttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import org.openapitools.client.model.Client;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -62,7 +63,7 @@ public Client testClassname(Client body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testClassname");
 }

 String path = UriComponentsBuilder.fromPath("/fake_classname_test").build().toUriString();
 String path = apiClient.expandPath("/fake_classname_test", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

19 changes: 10 additions & 9 deletions
.../petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
import org.openapitools.client.model.Pet;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -64,7 +65,7 @@ public void addPet(Pet body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling addPet");
 }

 String path = UriComponentsBuilder.fromPath("/pet").build().toUriString();
 String path = apiClient.expandPath("/pet", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -102,7 +103,7 @@ public void deletePet(Long petId, String apiKey) throws RestClientException {
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -138,7 +139,7 @@ public List<Pet> findPetsByStatus(List<String> status) throws RestClientExceptio
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'status' when calling findPetsByStatus");
 }

 String path = UriComponentsBuilder.fromPath("/pet/findByStatus").build().toUriString();
 String path = apiClient.expandPath("/pet/findByStatus", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -175,7 +176,7 @@ public List<Pet> findPetsByTags(List<String> tags) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'tags' when calling findPetsByTags");
 }

 String path = UriComponentsBuilder.fromPath("/pet/findByTags").build().toUriString();
 String path = apiClient.expandPath("/pet/findByTags", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -216,7 +217,7 @@ public Pet getPetById(Long petId) throws RestClientException {
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -252,7 +253,7 @@ public void updatePet(Pet body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling updatePet");
 }

 String path = UriComponentsBuilder.fromPath("/pet").build().toUriString();
 String path = apiClient.expandPath("/pet", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -290,7 +291,7 @@ public void updatePetWithForm(Long petId, String name, String status) throws Res
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -334,7 +335,7 @@ public ModelApiResponse uploadFile(Long petId, String additionalMetadata, File f
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}/uploadImage").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}/uploadImage", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -385,7 +386,7 @@ public ModelApiResponse uploadFileWithRequiredFile(Long petId, File requiredFile
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/fake/{petId}/uploadImageWithRequiredFile").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/fake/{petId}/uploadImageWithRequiredFile", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Expand path templates via resttemplate's uriTemplateHandler#3500

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

macjohnny
merged 4 commits into

from

Aug 6, 2019
 Merged


Expand path templates via resttemplate's uriTemplateHandler
#3500
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
34fda67

Expand path templates via resttemplate's uriTemplateHandler


unintended Jul 30, 2019
97f88dc

fix tests and compilation on lower jdk version


unintended Jul 30, 2019
050303a

fix typo


unintended Jul 31, 2019
236cb31

re-generate samples


unintended Jul 31, 2019

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


10 changes: 10 additions & 0 deletions
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -555,6 +555,16 @@ public class ApiClient {
 return isForm ? formParams : obj;
 }

 /**
 * Expand path template with variables
 * @param pathTemplate path template with placeholders
 * @param variables variables to replace
 * @return path with placeholders replaced by variables
 */
 public String expandPath(String pathTemplate, Map<String, Object> variables) {
 return restTemplate.getUriTemplateHandler().expand(pathTemplate, variables).toString();
 }

 /**
 * Invoke API by sending HTTP request with the given options.
 *
Expand Down

3 changes: 2 additions & 1 deletion
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import {{invokerPackage}}.ApiClient;
{{/imports}}

{{^fullJavaUtil}}import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -72,7 +73,7 @@ public class {{classname}} {
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();{{#pathParams}}
 uriVariables.put("{{baseName}}", {{#collectionFormat}}apiClient.collectionPathParameterToString(ApiClient.CollectionFormat.valueOf("{{{collectionFormat}}}".toUpperCase()), {{{paramName}}}){{/collectionFormat}}{{^collectionFormat}}{{{paramName}}}{{/collectionFormat}});{{/pathParams}}{{/hasPathParams}}
 String path = UriComponentsBuilder.fromPath("{{{path}}}"){{#hasPathParams}}.buildAndExpand(uriVariables){{/hasPathParams}}{{^hasPathParams}}.build(){{/hasPathParams}}.toUriString();
 String path = apiClient.expandPath("{{{path}}}", {{#hasPathParams}}uriVariables{{/hasPathParams}}{{^hasPathParams}}Collections.<String, Object>emptyMap(){{/hasPathParams}});

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

10 changes: 10 additions & 0 deletions
...t/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -543,6 +543,16 @@ protected Object selectBody(Object obj, MultiValueMap<String, Object> formParams
 return isForm ? formParams : obj;
 }

 /**
 * Expand path template with variables
 * @param pathTemplate path template with placeholders
 * @param variables variables to replace
 * @return path with placeholders replaced by variables
 */
 public String expandPath(String pathTemplate, Map<String, Object> variables) {
 return restTemplate.getUriTemplateHandler().expand(pathTemplate, variables).toString();
 }

 /**
 * Invoke API by sending HTTP request with the given options.
 *
Expand Down

3 changes: 2 additions & 1 deletion
...e/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import org.openapitools.client.model.Client;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -62,7 +63,7 @@ public Client call123testSpecialTags(Client body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling call123testSpecialTags");
 }

 String path = UriComponentsBuilder.fromPath("/another-fake/dummy").build().toUriString();
 String path = apiClient.expandPath("/another-fake/dummy", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

27 changes: 14 additions & 13 deletions
...petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
import org.openapitools.client.model.XmlItem;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -69,7 +70,7 @@ public void createXmlItem(XmlItem xmlItem) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'xmlItem' when calling createXmlItem");
 }

 String path = UriComponentsBuilder.fromPath("/fake/create_xml_item").build().toUriString();
 String path = apiClient.expandPath("/fake/create_xml_item", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -98,7 +99,7 @@ public void createXmlItem(XmlItem xmlItem) throws RestClientException {
 public Boolean fakeOuterBooleanSerialize(Boolean body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/boolean").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/boolean", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -127,7 +128,7 @@ public Boolean fakeOuterBooleanSerialize(Boolean body) throws RestClientExceptio
 public OuterComposite fakeOuterCompositeSerialize(OuterComposite body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/composite").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/composite", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -156,7 +157,7 @@ public OuterComposite fakeOuterCompositeSerialize(OuterComposite body) throws Re
 public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/number").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/number", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -185,7 +186,7 @@ public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws RestClientExc
 public String fakeOuterStringSerialize(String body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/string").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/string", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -218,7 +219,7 @@ public void testBodyWithFileSchema(FileSchemaTestClass body) throws RestClientEx
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testBodyWithFileSchema");
 }

 String path = UriComponentsBuilder.fromPath("/fake/body-with-file-schema").build().toUriString();
 String path = apiClient.expandPath("/fake/body-with-file-schema", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -257,7 +258,7 @@ public void testBodyWithQueryParams(String query, User body) throws RestClientEx
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testBodyWithQueryParams");
 }

 String path = UriComponentsBuilder.fromPath("/fake/body-with-query-params").build().toUriString();
 String path = apiClient.expandPath("/fake/body-with-query-params", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -293,7 +294,7 @@ public Client testClientModel(Client body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testClientModel");
 }

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -357,7 +358,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter '_byte' when calling testEndpointParameters");
 }

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -422,7 +423,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
 public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) throws RestClientException {
 Object postBody = null;

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -485,7 +486,7 @@ public void testGroupParameters(Integer requiredStringGroup, Boolean requiredBoo
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'requiredInt64Group' when calling testGroupParameters");
 }

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -526,7 +527,7 @@ public void testInlineAdditionalProperties(Map<String, String> param) throws Res
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'param' when calling testInlineAdditionalProperties");
 }

 String path = UriComponentsBuilder.fromPath("/fake/inline-additionalProperties").build().toUriString();
 String path = apiClient.expandPath("/fake/inline-additionalProperties", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -565,7 +566,7 @@ public void testJsonFormData(String param, String param2) throws RestClientExcep
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'param2' when calling testJsonFormData");
 }

 String path = UriComponentsBuilder.fromPath("/fake/jsonFormData").build().toUriString();
 String path = apiClient.expandPath("/fake/jsonFormData", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

3 changes: 2 additions & 1 deletion
...sttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import org.openapitools.client.model.Client;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -62,7 +63,7 @@ public Client testClassname(Client body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testClassname");
 }

 String path = UriComponentsBuilder.fromPath("/fake_classname_test").build().toUriString();
 String path = apiClient.expandPath("/fake_classname_test", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

19 changes: 10 additions & 9 deletions
.../petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
import org.openapitools.client.model.Pet;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -64,7 +65,7 @@ public void addPet(Pet body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling addPet");
 }

 String path = UriComponentsBuilder.fromPath("/pet").build().toUriString();
 String path = apiClient.expandPath("/pet", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -102,7 +103,7 @@ public void deletePet(Long petId, String apiKey) throws RestClientException {
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -138,7 +139,7 @@ public List<Pet> findPetsByStatus(List<String> status) throws RestClientExceptio
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'status' when calling findPetsByStatus");
 }

 String path = UriComponentsBuilder.fromPath("/pet/findByStatus").build().toUriString();
 String path = apiClient.expandPath("/pet/findByStatus", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -175,7 +176,7 @@ public List<Pet> findPetsByTags(List<String> tags) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'tags' when calling findPetsByTags");
 }

 String path = UriComponentsBuilder.fromPath("/pet/findByTags").build().toUriString();
 String path = apiClient.expandPath("/pet/findByTags", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -216,7 +217,7 @@ public Pet getPetById(Long petId) throws RestClientException {
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -252,7 +253,7 @@ public void updatePet(Pet body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling updatePet");
 }

 String path = UriComponentsBuilder.fromPath("/pet").build().toUriString();
 String path = apiClient.expandPath("/pet", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -290,7 +291,7 @@ public void updatePetWithForm(Long petId, String name, String status) throws Res
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -334,7 +335,7 @@ public ModelApiResponse uploadFile(Long petId, String additionalMetadata, File f
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}/uploadImage").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}/uploadImage", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -385,7 +386,7 @@ public ModelApiResponse uploadFileWithRequiredFile(Long petId, File requiredFile
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/fake/{petId}/uploadImageWithRequiredFile").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/fake/{petId}/uploadImageWithRequiredFile", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Expand path templates via resttemplate's uriTemplateHandler#3500

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

macjohnny
merged 4 commits into

from

Aug 6, 2019
 Merged


Expand path templates via resttemplate's uriTemplateHandler
#3500
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
34fda67

Expand path templates via resttemplate's uriTemplateHandler


unintended Jul 30, 2019
97f88dc

fix tests and compilation on lower jdk version


unintended Jul 30, 2019
050303a

fix typo


unintended Jul 31, 2019
236cb31

re-generate samples


unintended Jul 31, 2019

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


10 changes: 10 additions & 0 deletions
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -555,6 +555,16 @@ public class ApiClient {
 return isForm ? formParams : obj;
 }

 /**
 * Expand path template with variables
 * @param pathTemplate path template with placeholders
 * @param variables variables to replace
 * @return path with placeholders replaced by variables
 */
 public String expandPath(String pathTemplate, Map<String, Object> variables) {
 return restTemplate.getUriTemplateHandler().expand(pathTemplate, variables).toString();
 }

 /**
 * Invoke API by sending HTTP request with the given options.
 *
Expand Down

3 changes: 2 additions & 1 deletion
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import {{invokerPackage}}.ApiClient;
{{/imports}}

{{^fullJavaUtil}}import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -72,7 +73,7 @@ public class {{classname}} {
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();{{#pathParams}}
 uriVariables.put("{{baseName}}", {{#collectionFormat}}apiClient.collectionPathParameterToString(ApiClient.CollectionFormat.valueOf("{{{collectionFormat}}}".toUpperCase()), {{{paramName}}}){{/collectionFormat}}{{^collectionFormat}}{{{paramName}}}{{/collectionFormat}});{{/pathParams}}{{/hasPathParams}}
 String path = UriComponentsBuilder.fromPath("{{{path}}}"){{#hasPathParams}}.buildAndExpand(uriVariables){{/hasPathParams}}{{^hasPathParams}}.build(){{/hasPathParams}}.toUriString();
 String path = apiClient.expandPath("{{{path}}}", {{#hasPathParams}}uriVariables{{/hasPathParams}}{{^hasPathParams}}Collections.<String, Object>emptyMap(){{/hasPathParams}});

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

10 changes: 10 additions & 0 deletions
...t/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -543,6 +543,16 @@ protected Object selectBody(Object obj, MultiValueMap<String, Object> formParams
 return isForm ? formParams : obj;
 }

 /**
 * Expand path template with variables
 * @param pathTemplate path template with placeholders
 * @param variables variables to replace
 * @return path with placeholders replaced by variables
 */
 public String expandPath(String pathTemplate, Map<String, Object> variables) {
 return restTemplate.getUriTemplateHandler().expand(pathTemplate, variables).toString();
 }

 /**
 * Invoke API by sending HTTP request with the given options.
 *
Expand Down

3 changes: 2 additions & 1 deletion
...e/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import org.openapitools.client.model.Client;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -62,7 +63,7 @@ public Client call123testSpecialTags(Client body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling call123testSpecialTags");
 }

 String path = UriComponentsBuilder.fromPath("/another-fake/dummy").build().toUriString();
 String path = apiClient.expandPath("/another-fake/dummy", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

27 changes: 14 additions & 13 deletions
...petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
import org.openapitools.client.model.XmlItem;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -69,7 +70,7 @@ public void createXmlItem(XmlItem xmlItem) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'xmlItem' when calling createXmlItem");
 }

 String path = UriComponentsBuilder.fromPath("/fake/create_xml_item").build().toUriString();
 String path = apiClient.expandPath("/fake/create_xml_item", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -98,7 +99,7 @@ public void createXmlItem(XmlItem xmlItem) throws RestClientException {
 public Boolean fakeOuterBooleanSerialize(Boolean body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/boolean").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/boolean", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -127,7 +128,7 @@ public Boolean fakeOuterBooleanSerialize(Boolean body) throws RestClientExceptio
 public OuterComposite fakeOuterCompositeSerialize(OuterComposite body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/composite").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/composite", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -156,7 +157,7 @@ public OuterComposite fakeOuterCompositeSerialize(OuterComposite body) throws Re
 public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/number").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/number", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -185,7 +186,7 @@ public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws RestClientExc
 public String fakeOuterStringSerialize(String body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/string").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/string", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -218,7 +219,7 @@ public void testBodyWithFileSchema(FileSchemaTestClass body) throws RestClientEx
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testBodyWithFileSchema");
 }

 String path = UriComponentsBuilder.fromPath("/fake/body-with-file-schema").build().toUriString();
 String path = apiClient.expandPath("/fake/body-with-file-schema", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -257,7 +258,7 @@ public void testBodyWithQueryParams(String query, User body) throws RestClientEx
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testBodyWithQueryParams");
 }

 String path = UriComponentsBuilder.fromPath("/fake/body-with-query-params").build().toUriString();
 String path = apiClient.expandPath("/fake/body-with-query-params", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -293,7 +294,7 @@ public Client testClientModel(Client body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testClientModel");
 }

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -357,7 +358,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter '_byte' when calling testEndpointParameters");
 }

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -422,7 +423,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
 public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) throws RestClientException {
 Object postBody = null;

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -485,7 +486,7 @@ public void testGroupParameters(Integer requiredStringGroup, Boolean requiredBoo
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'requiredInt64Group' when calling testGroupParameters");
 }

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -526,7 +527,7 @@ public void testInlineAdditionalProperties(Map<String, String> param) throws Res
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'param' when calling testInlineAdditionalProperties");
 }

 String path = UriComponentsBuilder.fromPath("/fake/inline-additionalProperties").build().toUriString();
 String path = apiClient.expandPath("/fake/inline-additionalProperties", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -565,7 +566,7 @@ public void testJsonFormData(String param, String param2) throws RestClientExcep
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'param2' when calling testJsonFormData");
 }

 String path = UriComponentsBuilder.fromPath("/fake/jsonFormData").build().toUriString();
 String path = apiClient.expandPath("/fake/jsonFormData", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

3 changes: 2 additions & 1 deletion
...sttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import org.openapitools.client.model.Client;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -62,7 +63,7 @@ public Client testClassname(Client body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testClassname");
 }

 String path = UriComponentsBuilder.fromPath("/fake_classname_test").build().toUriString();
 String path = apiClient.expandPath("/fake_classname_test", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

19 changes: 10 additions & 9 deletions
.../petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
import org.openapitools.client.model.Pet;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -64,7 +65,7 @@ public void addPet(Pet body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling addPet");
 }

 String path = UriComponentsBuilder.fromPath("/pet").build().toUriString();
 String path = apiClient.expandPath("/pet", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -102,7 +103,7 @@ public void deletePet(Long petId, String apiKey) throws RestClientException {
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -138,7 +139,7 @@ public List<Pet> findPetsByStatus(List<String> status) throws RestClientExceptio
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'status' when calling findPetsByStatus");
 }

 String path = UriComponentsBuilder.fromPath("/pet/findByStatus").build().toUriString();
 String path = apiClient.expandPath("/pet/findByStatus", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -175,7 +176,7 @@ public List<Pet> findPetsByTags(List<String> tags) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'tags' when calling findPetsByTags");
 }

 String path = UriComponentsBuilder.fromPath("/pet/findByTags").build().toUriString();
 String path = apiClient.expandPath("/pet/findByTags", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -216,7 +217,7 @@ public Pet getPetById(Long petId) throws RestClientException {
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -252,7 +253,7 @@ public void updatePet(Pet body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling updatePet");
 }

 String path = UriComponentsBuilder.fromPath("/pet").build().toUriString();
 String path = apiClient.expandPath("/pet", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -290,7 +291,7 @@ public void updatePetWithForm(Long petId, String name, String status) throws Res
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -334,7 +335,7 @@ public ModelApiResponse uploadFile(Long petId, String additionalMetadata, File f
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}/uploadImage").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}/uploadImage", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -385,7 +386,7 @@ public ModelApiResponse uploadFileWithRequiredFile(Long petId, File requiredFile
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/fake/{petId}/uploadImageWithRequiredFile").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/fake/{petId}/uploadImageWithRequiredFile", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Expand path templates via resttemplate's uriTemplateHandler#3500

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

macjohnny
merged 4 commits into

from

Aug 6, 2019
 Merged


Expand path templates via resttemplate's uriTemplateHandler
#3500
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
34fda67

Expand path templates via resttemplate's uriTemplateHandler


unintended Jul 30, 2019
97f88dc

fix tests and compilation on lower jdk version


unintended Jul 30, 2019
050303a

fix typo


unintended Jul 31, 2019
236cb31

re-generate samples


unintended Jul 31, 2019

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


10 changes: 10 additions & 0 deletions
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -555,6 +555,16 @@ public class ApiClient {
 return isForm ? formParams : obj;
 }

 /**
 * Expand path template with variables
 * @param pathTemplate path template with placeholders
 * @param variables variables to replace
 * @return path with placeholders replaced by variables
 */
 public String expandPath(String pathTemplate, Map<String, Object> variables) {
 return restTemplate.getUriTemplateHandler().expand(pathTemplate, variables).toString();
 }

 /**
 * Invoke API by sending HTTP request with the given options.
 *
Expand Down

3 changes: 2 additions & 1 deletion
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import {{invokerPackage}}.ApiClient;
{{/imports}}

{{^fullJavaUtil}}import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -72,7 +73,7 @@ public class {{classname}} {
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();{{#pathParams}}
 uriVariables.put("{{baseName}}", {{#collectionFormat}}apiClient.collectionPathParameterToString(ApiClient.CollectionFormat.valueOf("{{{collectionFormat}}}".toUpperCase()), {{{paramName}}}){{/collectionFormat}}{{^collectionFormat}}{{{paramName}}}{{/collectionFormat}});{{/pathParams}}{{/hasPathParams}}
 String path = UriComponentsBuilder.fromPath("{{{path}}}"){{#hasPathParams}}.buildAndExpand(uriVariables){{/hasPathParams}}{{^hasPathParams}}.build(){{/hasPathParams}}.toUriString();
 String path = apiClient.expandPath("{{{path}}}", {{#hasPathParams}}uriVariables{{/hasPathParams}}{{^hasPathParams}}Collections.<String, Object>emptyMap(){{/hasPathParams}});

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

10 changes: 10 additions & 0 deletions
...t/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -543,6 +543,16 @@ protected Object selectBody(Object obj, MultiValueMap<String, Object> formParams
 return isForm ? formParams : obj;
 }

 /**
 * Expand path template with variables
 * @param pathTemplate path template with placeholders
 * @param variables variables to replace
 * @return path with placeholders replaced by variables
 */
 public String expandPath(String pathTemplate, Map<String, Object> variables) {
 return restTemplate.getUriTemplateHandler().expand(pathTemplate, variables).toString();
 }

 /**
 * Invoke API by sending HTTP request with the given options.
 *
Expand Down

3 changes: 2 additions & 1 deletion
...e/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import org.openapitools.client.model.Client;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -62,7 +63,7 @@ public Client call123testSpecialTags(Client body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling call123testSpecialTags");
 }

 String path = UriComponentsBuilder.fromPath("/another-fake/dummy").build().toUriString();
 String path = apiClient.expandPath("/another-fake/dummy", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

27 changes: 14 additions & 13 deletions
...petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
import org.openapitools.client.model.XmlItem;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -69,7 +70,7 @@ public void createXmlItem(XmlItem xmlItem) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'xmlItem' when calling createXmlItem");
 }

 String path = UriComponentsBuilder.fromPath("/fake/create_xml_item").build().toUriString();
 String path = apiClient.expandPath("/fake/create_xml_item", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -98,7 +99,7 @@ public void createXmlItem(XmlItem xmlItem) throws RestClientException {
 public Boolean fakeOuterBooleanSerialize(Boolean body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/boolean").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/boolean", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -127,7 +128,7 @@ public Boolean fakeOuterBooleanSerialize(Boolean body) throws RestClientExceptio
 public OuterComposite fakeOuterCompositeSerialize(OuterComposite body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/composite").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/composite", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -156,7 +157,7 @@ public OuterComposite fakeOuterCompositeSerialize(OuterComposite body) throws Re
 public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/number").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/number", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -185,7 +186,7 @@ public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws RestClientExc
 public String fakeOuterStringSerialize(String body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/string").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/string", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -218,7 +219,7 @@ public void testBodyWithFileSchema(FileSchemaTestClass body) throws RestClientEx
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testBodyWithFileSchema");
 }

 String path = UriComponentsBuilder.fromPath("/fake/body-with-file-schema").build().toUriString();
 String path = apiClient.expandPath("/fake/body-with-file-schema", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -257,7 +258,7 @@ public void testBodyWithQueryParams(String query, User body) throws RestClientEx
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testBodyWithQueryParams");
 }

 String path = UriComponentsBuilder.fromPath("/fake/body-with-query-params").build().toUriString();
 String path = apiClient.expandPath("/fake/body-with-query-params", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -293,7 +294,7 @@ public Client testClientModel(Client body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testClientModel");
 }

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -357,7 +358,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter '_byte' when calling testEndpointParameters");
 }

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -422,7 +423,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
 public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) throws RestClientException {
 Object postBody = null;

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -485,7 +486,7 @@ public void testGroupParameters(Integer requiredStringGroup, Boolean requiredBoo
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'requiredInt64Group' when calling testGroupParameters");
 }

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -526,7 +527,7 @@ public void testInlineAdditionalProperties(Map<String, String> param) throws Res
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'param' when calling testInlineAdditionalProperties");
 }

 String path = UriComponentsBuilder.fromPath("/fake/inline-additionalProperties").build().toUriString();
 String path = apiClient.expandPath("/fake/inline-additionalProperties", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -565,7 +566,7 @@ public void testJsonFormData(String param, String param2) throws RestClientExcep
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'param2' when calling testJsonFormData");
 }

 String path = UriComponentsBuilder.fromPath("/fake/jsonFormData").build().toUriString();
 String path = apiClient.expandPath("/fake/jsonFormData", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

3 changes: 2 additions & 1 deletion
...sttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import org.openapitools.client.model.Client;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -62,7 +63,7 @@ public Client testClassname(Client body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testClassname");
 }

 String path = UriComponentsBuilder.fromPath("/fake_classname_test").build().toUriString();
 String path = apiClient.expandPath("/fake_classname_test", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

19 changes: 10 additions & 9 deletions
.../petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
import org.openapitools.client.model.Pet;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -64,7 +65,7 @@ public void addPet(Pet body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling addPet");
 }

 String path = UriComponentsBuilder.fromPath("/pet").build().toUriString();
 String path = apiClient.expandPath("/pet", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -102,7 +103,7 @@ public void deletePet(Long petId, String apiKey) throws RestClientException {
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -138,7 +139,7 @@ public List<Pet> findPetsByStatus(List<String> status) throws RestClientExceptio
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'status' when calling findPetsByStatus");
 }

 String path = UriComponentsBuilder.fromPath("/pet/findByStatus").build().toUriString();
 String path = apiClient.expandPath("/pet/findByStatus", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -175,7 +176,7 @@ public List<Pet> findPetsByTags(List<String> tags) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'tags' when calling findPetsByTags");
 }

 String path = UriComponentsBuilder.fromPath("/pet/findByTags").build().toUriString();
 String path = apiClient.expandPath("/pet/findByTags", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -216,7 +217,7 @@ public Pet getPetById(Long petId) throws RestClientException {
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -252,7 +253,7 @@ public void updatePet(Pet body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling updatePet");
 }

 String path = UriComponentsBuilder.fromPath("/pet").build().toUriString();
 String path = apiClient.expandPath("/pet", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -290,7 +291,7 @@ public void updatePetWithForm(Long petId, String name, String status) throws Res
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -334,7 +335,7 @@ public ModelApiResponse uploadFile(Long petId, String additionalMetadata, File f
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}/uploadImage").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}/uploadImage", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -385,7 +386,7 @@ public ModelApiResponse uploadFileWithRequiredFile(Long petId, File requiredFile
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/fake/{petId}/uploadImageWithRequiredFile").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/fake/{petId}/uploadImageWithRequiredFile", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Expand path templates via resttemplate's uriTemplateHandler#3500

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

macjohnny
merged 4 commits into

from

Aug 6, 2019
 Merged


Expand path templates via resttemplate's uriTemplateHandler
#3500
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
34fda67

Expand path templates via resttemplate's uriTemplateHandler


unintended Jul 30, 2019
97f88dc

fix tests and compilation on lower jdk version


unintended Jul 30, 2019
050303a

fix typo


unintended Jul 31, 2019
236cb31

re-generate samples


unintended Jul 31, 2019

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


10 changes: 10 additions & 0 deletions
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -555,6 +555,16 @@ public class ApiClient {
 return isForm ? formParams : obj;
 }

 /**
 * Expand path template with variables
 * @param pathTemplate path template with placeholders
 * @param variables variables to replace
 * @return path with placeholders replaced by variables
 */
 public String expandPath(String pathTemplate, Map<String, Object> variables) {
 return restTemplate.getUriTemplateHandler().expand(pathTemplate, variables).toString();
 }

 /**
 * Invoke API by sending HTTP request with the given options.
 *
Expand Down

3 changes: 2 additions & 1 deletion
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import {{invokerPackage}}.ApiClient;
{{/imports}}

{{^fullJavaUtil}}import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -72,7 +73,7 @@ public class {{classname}} {
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();{{#pathParams}}
 uriVariables.put("{{baseName}}", {{#collectionFormat}}apiClient.collectionPathParameterToString(ApiClient.CollectionFormat.valueOf("{{{collectionFormat}}}".toUpperCase()), {{{paramName}}}){{/collectionFormat}}{{^collectionFormat}}{{{paramName}}}{{/collectionFormat}});{{/pathParams}}{{/hasPathParams}}
 String path = UriComponentsBuilder.fromPath("{{{path}}}"){{#hasPathParams}}.buildAndExpand(uriVariables){{/hasPathParams}}{{^hasPathParams}}.build(){{/hasPathParams}}.toUriString();
 String path = apiClient.expandPath("{{{path}}}", {{#hasPathParams}}uriVariables{{/hasPathParams}}{{^hasPathParams}}Collections.<String, Object>emptyMap(){{/hasPathParams}});

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

10 changes: 10 additions & 0 deletions
...t/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -543,6 +543,16 @@ protected Object selectBody(Object obj, MultiValueMap<String, Object> formParams
 return isForm ? formParams : obj;
 }

 /**
 * Expand path template with variables
 * @param pathTemplate path template with placeholders
 * @param variables variables to replace
 * @return path with placeholders replaced by variables
 */
 public String expandPath(String pathTemplate, Map<String, Object> variables) {
 return restTemplate.getUriTemplateHandler().expand(pathTemplate, variables).toString();
 }

 /**
 * Invoke API by sending HTTP request with the given options.
 *
Expand Down

3 changes: 2 additions & 1 deletion
...e/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import org.openapitools.client.model.Client;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -62,7 +63,7 @@ public Client call123testSpecialTags(Client body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling call123testSpecialTags");
 }

 String path = UriComponentsBuilder.fromPath("/another-fake/dummy").build().toUriString();
 String path = apiClient.expandPath("/another-fake/dummy", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

27 changes: 14 additions & 13 deletions
...petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
import org.openapitools.client.model.XmlItem;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -69,7 +70,7 @@ public void createXmlItem(XmlItem xmlItem) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'xmlItem' when calling createXmlItem");
 }

 String path = UriComponentsBuilder.fromPath("/fake/create_xml_item").build().toUriString();
 String path = apiClient.expandPath("/fake/create_xml_item", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -98,7 +99,7 @@ public void createXmlItem(XmlItem xmlItem) throws RestClientException {
 public Boolean fakeOuterBooleanSerialize(Boolean body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/boolean").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/boolean", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -127,7 +128,7 @@ public Boolean fakeOuterBooleanSerialize(Boolean body) throws RestClientExceptio
 public OuterComposite fakeOuterCompositeSerialize(OuterComposite body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/composite").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/composite", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -156,7 +157,7 @@ public OuterComposite fakeOuterCompositeSerialize(OuterComposite body) throws Re
 public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/number").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/number", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -185,7 +186,7 @@ public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws RestClientExc
 public String fakeOuterStringSerialize(String body) throws RestClientException {
 Object postBody = body;

 String path = UriComponentsBuilder.fromPath("/fake/outer/string").build().toUriString();
 String path = apiClient.expandPath("/fake/outer/string", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -218,7 +219,7 @@ public void testBodyWithFileSchema(FileSchemaTestClass body) throws RestClientEx
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testBodyWithFileSchema");
 }

 String path = UriComponentsBuilder.fromPath("/fake/body-with-file-schema").build().toUriString();
 String path = apiClient.expandPath("/fake/body-with-file-schema", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -257,7 +258,7 @@ public void testBodyWithQueryParams(String query, User body) throws RestClientEx
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testBodyWithQueryParams");
 }

 String path = UriComponentsBuilder.fromPath("/fake/body-with-query-params").build().toUriString();
 String path = apiClient.expandPath("/fake/body-with-query-params", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -293,7 +294,7 @@ public Client testClientModel(Client body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testClientModel");
 }

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -357,7 +358,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter '_byte' when calling testEndpointParameters");
 }

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -422,7 +423,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
 public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) throws RestClientException {
 Object postBody = null;

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -485,7 +486,7 @@ public void testGroupParameters(Integer requiredStringGroup, Boolean requiredBoo
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'requiredInt64Group' when calling testGroupParameters");
 }

 String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
 String path = apiClient.expandPath("/fake", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -526,7 +527,7 @@ public void testInlineAdditionalProperties(Map<String, String> param) throws Res
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'param' when calling testInlineAdditionalProperties");
 }

 String path = UriComponentsBuilder.fromPath("/fake/inline-additionalProperties").build().toUriString();
 String path = apiClient.expandPath("/fake/inline-additionalProperties", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -565,7 +566,7 @@ public void testJsonFormData(String param, String param2) throws RestClientExcep
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'param2' when calling testJsonFormData");
 }

 String path = UriComponentsBuilder.fromPath("/fake/jsonFormData").build().toUriString();
 String path = apiClient.expandPath("/fake/jsonFormData", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

3 changes: 2 additions & 1 deletion
...sttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import org.openapitools.client.model.Client;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -62,7 +63,7 @@ public Client testClassname(Client body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling testClassname");
 }

 String path = UriComponentsBuilder.fromPath("/fake_classname_test").build().toUriString();
 String path = apiClient.expandPath("/fake_classname_test", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down

19 changes: 10 additions & 9 deletions
.../petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
import org.openapitools.client.model.Pet;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand DownExpand Up@@ -64,7 +65,7 @@ public void addPet(Pet body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling addPet");
 }

 String path = UriComponentsBuilder.fromPath("/pet").build().toUriString();
 String path = apiClient.expandPath("/pet", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -102,7 +103,7 @@ public void deletePet(Long petId, String apiKey) throws RestClientException {
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -138,7 +139,7 @@ public List<Pet> findPetsByStatus(List<String> status) throws RestClientExceptio
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'status' when calling findPetsByStatus");
 }

 String path = UriComponentsBuilder.fromPath("/pet/findByStatus").build().toUriString();
 String path = apiClient.expandPath("/pet/findByStatus", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -175,7 +176,7 @@ public List<Pet> findPetsByTags(List<String> tags) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'tags' when calling findPetsByTags");
 }

 String path = UriComponentsBuilder.fromPath("/pet/findByTags").build().toUriString();
 String path = apiClient.expandPath("/pet/findByTags", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -216,7 +217,7 @@ public Pet getPetById(Long petId) throws RestClientException {
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -252,7 +253,7 @@ public void updatePet(Pet body) throws RestClientException {
 throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'body' when calling updatePet");
 }

 String path = UriComponentsBuilder.fromPath("/pet").build().toUriString();
 String path = apiClient.expandPath("/pet", Collections.<String, Object>emptyMap());

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -290,7 +291,7 @@ public void updatePetWithForm(Long petId, String name, String status) throws Res
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -334,7 +335,7 @@ public ModelApiResponse uploadFile(Long petId, String additionalMetadata, File f
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/pet/{petId}/uploadImage").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/pet/{petId}/uploadImage", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand DownExpand Up@@ -385,7 +386,7 @@ public ModelApiResponse uploadFileWithRequiredFile(Long petId, File requiredFile
 // create path and map variables
 final Map<String, Object> uriVariables = new HashMap<String, Object>();
 uriVariables.put("petId", petId);
 String path = UriComponentsBuilder.fromPath("/fake/{petId}/uploadImageWithRequiredFile").buildAndExpand(uriVariables).toUriString();
 String path = apiClient.expandPath("/fake/{petId}/uploadImageWithRequiredFile", uriVariables);

 final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
 final HttpHeaders headerParams = new HttpHeaders();
Expand Down
Loading