Skip to content

Expand path templates via resttemplate's uriTemplateHandler - #3500

Merged
macjohnny merged 4 commits into
OpenAPITools:masterfrom
unintended:expand_path_templates_via_resttemplate
Aug 6, 2019
Merged

Expand path templates via resttemplate's uriTemplateHandler#3500
macjohnny merged 4 commits into
OpenAPITools:masterfrom
unintended:expand_path_templates_via_resttemplate

Conversation

@unintended

@unintendedunintended commented Jul 30, 2019•
edited
Loading

Copy link
Copy Markdown
Contributor

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\. If contributing template-only or documentation-only changes which will change sample output, be sure to build the project first.
  • Filed the PR against the correct branch: master, 4.1.x, 5.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

Description of the PR

This pr changes uri extension from static call of UriComponentsBuilder to more common way (via RestTemplate's UriTemplateHandler) and makes possible to natively handle templated path in metric collectors, etc
fixes#3499

@unintended
unintendedforce-pushed the expand_path_templates_via_resttemplate branch from 3bdb521 to 97f88dcCompareJuly 30, 2019 13:38
macjohnny
macjohnny reviewed Jul 30, 2019
View reviewed changes
Comment threadmodules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache Outdated
* @param variables variables to replace
* @return path with placeholders replaced by variables
*/
public String expandPath(String pathTempalte, Map<String, Object> variables) {

@macjohnnymacjohnnyJul 30, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Typo „pathTempalte“

@macjohnny

macjohnny commented Jul 31, 2019

Copy link
Copy Markdown
Member

please re-generate the samples

@macjohnny

macjohnny commented Aug 6, 2019

Copy link
Copy Markdown
Member

cc @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04)

macjohnny
macjohnny approved these changes Aug 6, 2019
View reviewed changes

@macjohnnymacjohnny left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@macjohnnymacjohnny added this to the 4.1.0 milestone Aug 6, 2019
@macjohnny
macjohnny merged commit b8295af into OpenAPITools:masterAug 6, 2019
@wing328

wing328 commented Aug 10, 2019

Copy link
Copy Markdown
Member

@unintended thanks for the PR, which has been included in the 4.1.0 release: https://twitter.com/oas_generator/status/1160000504455319553

jimschubert added a commit that referenced this pull request Aug 11, 2019
@jimschubert
Merge branch 'master' into server-variable-substitution
96e803c
* master: (122 commits)
Fix#3604 by adding undefined as return type to headers and credentials methods in runtime.ts (#3605)
Prepare 4.1.1-SNAPSHOT (#3603)
Prepare 4.1.0 release (#3597)
[java][client][jax-rs] Add a constant for Jackson @JsonProperty (#3560)
restore openapi3 petstore.yaml (#3590)
Add a new NodeJS Express server generator (#3567)
[C#][client][csharp-netcore] Fix csharp netcore defaultheaders (#3562)
Fix issue deserializing to nullptr (#3572)
[OCaml] Add file post-processing (#3583)
[dart2] Fix up test code generation, double deserialization, 'new' keyword deprecation (#3576)
Run Qt5 client sample test (#3415)
typescript-fetch: allow configuration of headers and credentials (#3586)
using partials in ruby api_client (#3564)
[OCaml] Added optional params support in API operations (#3568)
[Rust Server] Generate valid Rustdocs for lazy_static items (#3556)
Fix NPM build for Typescript-fetch (#3403)
Expand path templates via resttemplate's uriTemplateHandler (#3500)
Readme updated with a new tutorial and company using OpenAPI Generator (#3566)
Fix logic of `getNullableType` of csharp server and client. (#3537)
[Ruby] clean up Ruby dev dependencies (#3551)
...
@unintendedunintended mentioned this pull request Jul 16, 2021
Merged
5 tasks
@chegechege mentioned this pull request Oct 27, 2021
Closed
@chegechege mentioned this pull request Nov 8, 2021
Open
6 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@macjohnnymacjohnnymacjohnny approved these changes

Assignees

No one assigned

Labels

Client: Java

Projects

None yet

Milestone

4.1.0

Development

Successfully merging this pull request may close these issues.

RestTemplate client misses placeholdered URI's in metrics and logs a pre-build one (with replaced variables)

4 participants

@unintended@macjohnny@wing328@richardwhiuk
, '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" + '
Expand path templates via resttemplate's uriTemplateHandler by unintended · Pull Request #3500 · OpenAPITools/openapi-generator · GitHub
Skip to content
Expand path templates via resttemplate's uriTemplateHandler - #3500
Merged
macjohnny merged 4 commits into
OpenAPITools:masterfrom 
unintended:expand_path_templates_via_resttemplate
Aug 6, 2019
Merged
Expand path templates via resttemplate's uriTemplateHandler#3500
macjohnny merged 4 commits into
OpenAPITools:masterfrom 
unintended:expand_path_templates_via_resttemplate
Conversation
@unintended
@unintendedunintended
commented
Jul 30, 2019•

edited

Loading

Copy link


Copy Markdown

Contributor
PR checklist
  •  Read the contribution guidelines.
  •  Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\. If contributing template-only or documentation-only changes which will change sample output, be sure to build the project first.
  •  Filed the PR against the correct branch: master, 4.1.x, 5.0.x. Default: master.
  •  Copied the technical committee to review the pull request if your PR is targeting a particular programming language.
Description of the PR
This pr changes uri extension from static call of UriComponentsBuilder to more common way (via RestTemplate's UriTemplateHandler) and makes possible to natively handle templated path in metric collectors, etc
fixes#3499
@unintended
unintendedforce-pushed
the
expand_path_templates_via_resttemplate
branch
from
3bdb521 to
97f88dcCompareJuly 30, 2019 13:38
macjohnny
macjohnny
reviewed
Jul 30, 2019
View reviewed changes
Comment threadmodules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache
Outdated

 * @param variables variables to replace
 * @return path with placeholders replaced by variables
 */
 public String expandPath(String pathTempalte, Map<String, Object> variables) {
@macjohnnymacjohnnyJul 30, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Typo „pathTempalte“
@macjohnny
macjohnny
commented
Jul 31, 2019

Copy link


Copy Markdown

Member
please re-generate the samples
@macjohnny
macjohnny
commented
Aug 6, 2019

Copy link


Copy Markdown

Member
cc @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04)
macjohnny
macjohnny
approved these changes
Aug 6, 2019
View reviewed changes
@macjohnnymacjohnny
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM
@macjohnnymacjohnny
added this to the 4.1.0 milestone
Aug 6, 2019
@macjohnny
macjohnny
merged commit b8295af
into
OpenAPITools:masterAug 6, 2019
@wing328
wing328
commented
Aug 10, 2019

Copy link


Copy Markdown

Member
@unintended thanks for the PR, which has been included in the 4.1.0 release: https://twitter.com/oas_generator/status/1160000504455319553
jimschubert added a commit
that referenced
this pull request
Aug 11, 2019
@jimschubert
Merge branch 'master' into server-variable-substitution
96e803c
* master: (122 commits)
Fix#3604 by adding undefined as return type to headers and credentials methods in runtime.ts (#3605)
Prepare 4.1.1-SNAPSHOT (#3603)
Prepare 4.1.0 release (#3597)
[java][client][jax-rs] Add a constant for Jackson @JsonProperty (#3560)
restore openapi3 petstore.yaml (#3590)
Add a new NodeJS Express server generator (#3567)
[C#][client][csharp-netcore] Fix csharp netcore defaultheaders (#3562)
Fix issue deserializing to nullptr (#3572)
[OCaml] Add file post-processing (#3583)
[dart2] Fix up test code generation, double deserialization, 'new' keyword deprecation (#3576)
Run Qt5 client sample test (#3415)
typescript-fetch: allow configuration of headers and credentials (#3586)
using partials in ruby api_client (#3564)
[OCaml] Added optional params support in API operations (#3568)
[Rust Server] Generate valid Rustdocs for lazy_static items (#3556)
Fix NPM build for Typescript-fetch (#3403)
Expand path templates via resttemplate's uriTemplateHandler (#3500)
Readme updated with a new tutorial and company using OpenAPI Generator (#3566)
Fix logic of `getNullableType` of csharp server and client. (#3537)
[Ruby] clean up Ruby dev dependencies (#3551)
...
@unintendedunintended
mentioned this pull request
Jul 16, 2021
 Merged

5 tasks
@chegechege
mentioned this pull request
Oct 27, 2021

Closed

@chegechege
mentioned this pull request
Nov 8, 2021

Open

6 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@macjohnnymacjohnnymacjohnny approved these changes

Assignees


No one assigned


Labels

Client: Java

Projects


None yet


Milestone

4.1.0

Development

Successfully merging this pull request may close these issues.

RestTemplate client misses placeholdered URI's in metrics and logs a pre-build one (with replaced variables)


4 participants

@unintended@macjohnny@wing328@richardwhiuk

, '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('^' + ".*" + '
Expand path templates via resttemplate's uriTemplateHandler by unintended · Pull Request #3500 · OpenAPITools/openapi-generator · GitHub
Skip to content
Expand path templates via resttemplate's uriTemplateHandler - #3500
Merged
macjohnny merged 4 commits into
OpenAPITools:masterfrom 
unintended:expand_path_templates_via_resttemplate
Aug 6, 2019
Merged
Expand path templates via resttemplate's uriTemplateHandler#3500
macjohnny merged 4 commits into
OpenAPITools:masterfrom 
unintended:expand_path_templates_via_resttemplate
Conversation
@unintended
@unintendedunintended
commented
Jul 30, 2019•

edited

Loading

Copy link


Copy Markdown

Contributor
PR checklist
  •  Read the contribution guidelines.
  •  Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\. If contributing template-only or documentation-only changes which will change sample output, be sure to build the project first.
  •  Filed the PR against the correct branch: master, 4.1.x, 5.0.x. Default: master.
  •  Copied the technical committee to review the pull request if your PR is targeting a particular programming language.
Description of the PR
This pr changes uri extension from static call of UriComponentsBuilder to more common way (via RestTemplate's UriTemplateHandler) and makes possible to natively handle templated path in metric collectors, etc
fixes#3499
@unintended
unintendedforce-pushed
the
expand_path_templates_via_resttemplate
branch
from
3bdb521 to
97f88dcCompareJuly 30, 2019 13:38
macjohnny
macjohnny
reviewed
Jul 30, 2019
View reviewed changes
Comment threadmodules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache
Outdated

 * @param variables variables to replace
 * @return path with placeholders replaced by variables
 */
 public String expandPath(String pathTempalte, Map<String, Object> variables) {
@macjohnnymacjohnnyJul 30, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Typo „pathTempalte“
@macjohnny
macjohnny
commented
Jul 31, 2019

Copy link


Copy Markdown

Member
please re-generate the samples
@macjohnny
macjohnny
commented
Aug 6, 2019

Copy link


Copy Markdown

Member
cc @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04)
macjohnny
macjohnny
approved these changes
Aug 6, 2019
View reviewed changes
@macjohnnymacjohnny
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM
@macjohnnymacjohnny
added this to the 4.1.0 milestone
Aug 6, 2019
@macjohnny
macjohnny
merged commit b8295af
into
OpenAPITools:masterAug 6, 2019
@wing328
wing328
commented
Aug 10, 2019

Copy link


Copy Markdown

Member
@unintended thanks for the PR, which has been included in the 4.1.0 release: https://twitter.com/oas_generator/status/1160000504455319553
jimschubert added a commit
that referenced
this pull request
Aug 11, 2019
@jimschubert
Merge branch 'master' into server-variable-substitution
96e803c
* master: (122 commits)
Fix#3604 by adding undefined as return type to headers and credentials methods in runtime.ts (#3605)
Prepare 4.1.1-SNAPSHOT (#3603)
Prepare 4.1.0 release (#3597)
[java][client][jax-rs] Add a constant for Jackson @JsonProperty (#3560)
restore openapi3 petstore.yaml (#3590)
Add a new NodeJS Express server generator (#3567)
[C#][client][csharp-netcore] Fix csharp netcore defaultheaders (#3562)
Fix issue deserializing to nullptr (#3572)
[OCaml] Add file post-processing (#3583)
[dart2] Fix up test code generation, double deserialization, 'new' keyword deprecation (#3576)
Run Qt5 client sample test (#3415)
typescript-fetch: allow configuration of headers and credentials (#3586)
using partials in ruby api_client (#3564)
[OCaml] Added optional params support in API operations (#3568)
[Rust Server] Generate valid Rustdocs for lazy_static items (#3556)
Fix NPM build for Typescript-fetch (#3403)
Expand path templates via resttemplate's uriTemplateHandler (#3500)
Readme updated with a new tutorial and company using OpenAPI Generator (#3566)
Fix logic of `getNullableType` of csharp server and client. (#3537)
[Ruby] clean up Ruby dev dependencies (#3551)
...
@unintendedunintended
mentioned this pull request
Jul 16, 2021
 Merged

5 tasks
@chegechege
mentioned this pull request
Oct 27, 2021

Closed

@chegechege
mentioned this pull request
Nov 8, 2021

Open

6 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@macjohnnymacjohnnymacjohnny approved these changes

Assignees


No one assigned


Labels

Client: Java

Projects


None yet


Milestone

4.1.0

Development

Successfully merging this pull request may close these issues.

RestTemplate client misses placeholdered URI's in metrics and logs a pre-build one (with replaced variables)


4 participants

@unintended@macjohnny@wing328@richardwhiuk

, '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('^' + ".*" + '
Expand path templates via resttemplate's uriTemplateHandler by unintended · Pull Request #3500 · OpenAPITools/openapi-generator · GitHub
Skip to content
Expand path templates via resttemplate's uriTemplateHandler - #3500
Merged
macjohnny merged 4 commits into
OpenAPITools:masterfrom 
unintended:expand_path_templates_via_resttemplate
Aug 6, 2019
Merged
Expand path templates via resttemplate's uriTemplateHandler#3500
macjohnny merged 4 commits into
OpenAPITools:masterfrom 
unintended:expand_path_templates_via_resttemplate
Conversation
@unintended
@unintendedunintended
commented
Jul 30, 2019•

edited

Loading

Copy link


Copy Markdown

Contributor
PR checklist
  •  Read the contribution guidelines.
  •  Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\. If contributing template-only or documentation-only changes which will change sample output, be sure to build the project first.
  •  Filed the PR against the correct branch: master, 4.1.x, 5.0.x. Default: master.
  •  Copied the technical committee to review the pull request if your PR is targeting a particular programming language.
Description of the PR
This pr changes uri extension from static call of UriComponentsBuilder to more common way (via RestTemplate's UriTemplateHandler) and makes possible to natively handle templated path in metric collectors, etc
fixes#3499
@unintended
unintendedforce-pushed
the
expand_path_templates_via_resttemplate
branch
from
3bdb521 to
97f88dcCompareJuly 30, 2019 13:38
macjohnny
macjohnny
reviewed
Jul 30, 2019
View reviewed changes
Comment threadmodules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache
Outdated

 * @param variables variables to replace
 * @return path with placeholders replaced by variables
 */
 public String expandPath(String pathTempalte, Map<String, Object> variables) {
@macjohnnymacjohnnyJul 30, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Typo „pathTempalte“
@macjohnny
macjohnny
commented
Jul 31, 2019

Copy link


Copy Markdown

Member
please re-generate the samples
@macjohnny
macjohnny
commented
Aug 6, 2019

Copy link


Copy Markdown

Member
cc @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04)
macjohnny
macjohnny
approved these changes
Aug 6, 2019
View reviewed changes
@macjohnnymacjohnny
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM
@macjohnnymacjohnny
added this to the 4.1.0 milestone
Aug 6, 2019
@macjohnny
macjohnny
merged commit b8295af
into
OpenAPITools:masterAug 6, 2019
@wing328
wing328
commented
Aug 10, 2019

Copy link


Copy Markdown

Member
@unintended thanks for the PR, which has been included in the 4.1.0 release: https://twitter.com/oas_generator/status/1160000504455319553
jimschubert added a commit
that referenced
this pull request
Aug 11, 2019
@jimschubert
Merge branch 'master' into server-variable-substitution
96e803c
* master: (122 commits)
Fix#3604 by adding undefined as return type to headers and credentials methods in runtime.ts (#3605)
Prepare 4.1.1-SNAPSHOT (#3603)
Prepare 4.1.0 release (#3597)
[java][client][jax-rs] Add a constant for Jackson @JsonProperty (#3560)
restore openapi3 petstore.yaml (#3590)
Add a new NodeJS Express server generator (#3567)
[C#][client][csharp-netcore] Fix csharp netcore defaultheaders (#3562)
Fix issue deserializing to nullptr (#3572)
[OCaml] Add file post-processing (#3583)
[dart2] Fix up test code generation, double deserialization, 'new' keyword deprecation (#3576)
Run Qt5 client sample test (#3415)
typescript-fetch: allow configuration of headers and credentials (#3586)
using partials in ruby api_client (#3564)
[OCaml] Added optional params support in API operations (#3568)
[Rust Server] Generate valid Rustdocs for lazy_static items (#3556)
Fix NPM build for Typescript-fetch (#3403)
Expand path templates via resttemplate's uriTemplateHandler (#3500)
Readme updated with a new tutorial and company using OpenAPI Generator (#3566)
Fix logic of `getNullableType` of csharp server and client. (#3537)
[Ruby] clean up Ruby dev dependencies (#3551)
...
@unintendedunintended
mentioned this pull request
Jul 16, 2021
 Merged

5 tasks
@chegechege
mentioned this pull request
Oct 27, 2021

Closed

@chegechege
mentioned this pull request
Nov 8, 2021

Open

6 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@macjohnnymacjohnnymacjohnny approved these changes

Assignees


No one assigned


Labels

Client: Java

Projects


None yet


Milestone

4.1.0

Development

Successfully merging this pull request may close these issues.

RestTemplate client misses placeholdered URI's in metrics and logs a pre-build one (with replaced variables)


4 participants

@unintended@macjohnny@wing328@richardwhiuk

, '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" + '
Expand path templates via resttemplate's uriTemplateHandler by unintended · Pull Request #3500 · OpenAPITools/openapi-generator · GitHub
Skip to content
Expand path templates via resttemplate's uriTemplateHandler - #3500
Merged
macjohnny merged 4 commits into
OpenAPITools:masterfrom 
unintended:expand_path_templates_via_resttemplate
Aug 6, 2019
Merged
Expand path templates via resttemplate's uriTemplateHandler#3500
macjohnny merged 4 commits into
OpenAPITools:masterfrom 
unintended:expand_path_templates_via_resttemplate
Conversation
@unintended
@unintendedunintended
commented
Jul 30, 2019•

edited

Loading

Copy link


Copy Markdown

Contributor
PR checklist
  •  Read the contribution guidelines.
  •  Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\. If contributing template-only or documentation-only changes which will change sample output, be sure to build the project first.
  •  Filed the PR against the correct branch: master, 4.1.x, 5.0.x. Default: master.
  •  Copied the technical committee to review the pull request if your PR is targeting a particular programming language.
Description of the PR
This pr changes uri extension from static call of UriComponentsBuilder to more common way (via RestTemplate's UriTemplateHandler) and makes possible to natively handle templated path in metric collectors, etc
fixes#3499
@unintended
unintendedforce-pushed
the
expand_path_templates_via_resttemplate
branch
from
3bdb521 to
97f88dcCompareJuly 30, 2019 13:38
macjohnny
macjohnny
reviewed
Jul 30, 2019
View reviewed changes
Comment threadmodules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache
Outdated

 * @param variables variables to replace
 * @return path with placeholders replaced by variables
 */
 public String expandPath(String pathTempalte, Map<String, Object> variables) {
@macjohnnymacjohnnyJul 30, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Typo „pathTempalte“
@macjohnny
macjohnny
commented
Jul 31, 2019

Copy link


Copy Markdown

Member
please re-generate the samples
@macjohnny
macjohnny
commented
Aug 6, 2019

Copy link


Copy Markdown

Member
cc @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04)
macjohnny
macjohnny
approved these changes
Aug 6, 2019
View reviewed changes
@macjohnnymacjohnny
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM
@macjohnnymacjohnny
added this to the 4.1.0 milestone
Aug 6, 2019
@macjohnny
macjohnny
merged commit b8295af
into
OpenAPITools:masterAug 6, 2019
@wing328
wing328
commented
Aug 10, 2019

Copy link


Copy Markdown

Member
@unintended thanks for the PR, which has been included in the 4.1.0 release: https://twitter.com/oas_generator/status/1160000504455319553
jimschubert added a commit
that referenced
this pull request
Aug 11, 2019
@jimschubert
Merge branch 'master' into server-variable-substitution
96e803c
* master: (122 commits)
Fix#3604 by adding undefined as return type to headers and credentials methods in runtime.ts (#3605)
Prepare 4.1.1-SNAPSHOT (#3603)
Prepare 4.1.0 release (#3597)
[java][client][jax-rs] Add a constant for Jackson @JsonProperty (#3560)
restore openapi3 petstore.yaml (#3590)
Add a new NodeJS Express server generator (#3567)
[C#][client][csharp-netcore] Fix csharp netcore defaultheaders (#3562)
Fix issue deserializing to nullptr (#3572)
[OCaml] Add file post-processing (#3583)
[dart2] Fix up test code generation, double deserialization, 'new' keyword deprecation (#3576)
Run Qt5 client sample test (#3415)
typescript-fetch: allow configuration of headers and credentials (#3586)
using partials in ruby api_client (#3564)
[OCaml] Added optional params support in API operations (#3568)
[Rust Server] Generate valid Rustdocs for lazy_static items (#3556)
Fix NPM build for Typescript-fetch (#3403)
Expand path templates via resttemplate's uriTemplateHandler (#3500)
Readme updated with a new tutorial and company using OpenAPI Generator (#3566)
Fix logic of `getNullableType` of csharp server and client. (#3537)
[Ruby] clean up Ruby dev dependencies (#3551)
...
@unintendedunintended
mentioned this pull request
Jul 16, 2021
 Merged

5 tasks
@chegechege
mentioned this pull request
Oct 27, 2021

Closed

@chegechege
mentioned this pull request
Nov 8, 2021

Open

6 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@macjohnnymacjohnnymacjohnny approved these changes

Assignees


No one assigned


Labels

Client: Java

Projects


None yet


Milestone

4.1.0

Development

Successfully merging this pull request may close these issues.

RestTemplate client misses placeholdered URI's in metrics and logs a pre-build one (with replaced variables)


4 participants

@unintended@macjohnny@wing328@richardwhiuk

, '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('^' + ".*" + '
Expand path templates via resttemplate's uriTemplateHandler by unintended · Pull Request #3500 · OpenAPITools/openapi-generator · GitHub
Skip to content
Expand path templates via resttemplate's uriTemplateHandler - #3500
Merged
macjohnny merged 4 commits into
OpenAPITools:masterfrom 
unintended:expand_path_templates_via_resttemplate
Aug 6, 2019
Merged
Expand path templates via resttemplate's uriTemplateHandler#3500
macjohnny merged 4 commits into
OpenAPITools:masterfrom 
unintended:expand_path_templates_via_resttemplate
Conversation
@unintended
@unintendedunintended
commented
Jul 30, 2019•

edited

Loading

Copy link


Copy Markdown

Contributor
PR checklist
  •  Read the contribution guidelines.
  •  Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\. If contributing template-only or documentation-only changes which will change sample output, be sure to build the project first.
  •  Filed the PR against the correct branch: master, 4.1.x, 5.0.x. Default: master.
  •  Copied the technical committee to review the pull request if your PR is targeting a particular programming language.
Description of the PR
This pr changes uri extension from static call of UriComponentsBuilder to more common way (via RestTemplate's UriTemplateHandler) and makes possible to natively handle templated path in metric collectors, etc
fixes#3499
@unintended
unintendedforce-pushed
the
expand_path_templates_via_resttemplate
branch
from
3bdb521 to
97f88dcCompareJuly 30, 2019 13:38
macjohnny
macjohnny
reviewed
Jul 30, 2019
View reviewed changes
Comment threadmodules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache
Outdated

 * @param variables variables to replace
 * @return path with placeholders replaced by variables
 */
 public String expandPath(String pathTempalte, Map<String, Object> variables) {
@macjohnnymacjohnnyJul 30, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Typo „pathTempalte“
@macjohnny
macjohnny
commented
Jul 31, 2019

Copy link


Copy Markdown

Member
please re-generate the samples
@macjohnny
macjohnny
commented
Aug 6, 2019

Copy link


Copy Markdown

Member
cc @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04)
macjohnny
macjohnny
approved these changes
Aug 6, 2019
View reviewed changes
@macjohnnymacjohnny
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM
@macjohnnymacjohnny
added this to the 4.1.0 milestone
Aug 6, 2019
@macjohnny
macjohnny
merged commit b8295af
into
OpenAPITools:masterAug 6, 2019
@wing328
wing328
commented
Aug 10, 2019

Copy link


Copy Markdown

Member
@unintended thanks for the PR, which has been included in the 4.1.0 release: https://twitter.com/oas_generator/status/1160000504455319553
jimschubert added a commit
that referenced
this pull request
Aug 11, 2019
@jimschubert
Merge branch 'master' into server-variable-substitution
96e803c
* master: (122 commits)
Fix#3604 by adding undefined as return type to headers and credentials methods in runtime.ts (#3605)
Prepare 4.1.1-SNAPSHOT (#3603)
Prepare 4.1.0 release (#3597)
[java][client][jax-rs] Add a constant for Jackson @JsonProperty (#3560)
restore openapi3 petstore.yaml (#3590)
Add a new NodeJS Express server generator (#3567)
[C#][client][csharp-netcore] Fix csharp netcore defaultheaders (#3562)
Fix issue deserializing to nullptr (#3572)
[OCaml] Add file post-processing (#3583)
[dart2] Fix up test code generation, double deserialization, 'new' keyword deprecation (#3576)
Run Qt5 client sample test (#3415)
typescript-fetch: allow configuration of headers and credentials (#3586)
using partials in ruby api_client (#3564)
[OCaml] Added optional params support in API operations (#3568)
[Rust Server] Generate valid Rustdocs for lazy_static items (#3556)
Fix NPM build for Typescript-fetch (#3403)
Expand path templates via resttemplate's uriTemplateHandler (#3500)
Readme updated with a new tutorial and company using OpenAPI Generator (#3566)
Fix logic of `getNullableType` of csharp server and client. (#3537)
[Ruby] clean up Ruby dev dependencies (#3551)
...
@unintendedunintended
mentioned this pull request
Jul 16, 2021
 Merged

5 tasks
@chegechege
mentioned this pull request
Oct 27, 2021

Closed

@chegechege
mentioned this pull request
Nov 8, 2021

Open

6 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@macjohnnymacjohnnymacjohnny approved these changes

Assignees


No one assigned


Labels

Client: Java

Projects


None yet


Milestone

4.1.0

Development

Successfully merging this pull request may close these issues.

RestTemplate client misses placeholdered URI's in metrics and logs a pre-build one (with replaced variables)


4 participants

@unintended@macjohnny@wing328@richardwhiuk

, '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('^' + ".*" + '
Expand path templates via resttemplate's uriTemplateHandler by unintended · Pull Request #3500 · OpenAPITools/openapi-generator · GitHub
Skip to content
Expand path templates via resttemplate's uriTemplateHandler - #3500
Merged
macjohnny merged 4 commits into
OpenAPITools:masterfrom 
unintended:expand_path_templates_via_resttemplate
Aug 6, 2019
Merged
Expand path templates via resttemplate's uriTemplateHandler#3500
macjohnny merged 4 commits into
OpenAPITools:masterfrom 
unintended:expand_path_templates_via_resttemplate
Conversation
@unintended
@unintendedunintended
commented
Jul 30, 2019•

edited

Loading

Copy link


Copy Markdown

Contributor
PR checklist
  •  Read the contribution guidelines.
  •  Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\. If contributing template-only or documentation-only changes which will change sample output, be sure to build the project first.
  •  Filed the PR against the correct branch: master, 4.1.x, 5.0.x. Default: master.
  •  Copied the technical committee to review the pull request if your PR is targeting a particular programming language.
Description of the PR
This pr changes uri extension from static call of UriComponentsBuilder to more common way (via RestTemplate's UriTemplateHandler) and makes possible to natively handle templated path in metric collectors, etc
fixes#3499
@unintended
unintendedforce-pushed
the
expand_path_templates_via_resttemplate
branch
from
3bdb521 to
97f88dcCompareJuly 30, 2019 13:38
macjohnny
macjohnny
reviewed
Jul 30, 2019
View reviewed changes
Comment threadmodules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache
Outdated

 * @param variables variables to replace
 * @return path with placeholders replaced by variables
 */
 public String expandPath(String pathTempalte, Map<String, Object> variables) {
@macjohnnymacjohnnyJul 30, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Typo „pathTempalte“
@macjohnny
macjohnny
commented
Jul 31, 2019

Copy link


Copy Markdown

Member
please re-generate the samples
@macjohnny
macjohnny
commented
Aug 6, 2019

Copy link


Copy Markdown

Member
cc @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04)
macjohnny
macjohnny
approved these changes
Aug 6, 2019
View reviewed changes
@macjohnnymacjohnny
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM
@macjohnnymacjohnny
added this to the 4.1.0 milestone
Aug 6, 2019
@macjohnny
macjohnny
merged commit b8295af
into
OpenAPITools:masterAug 6, 2019
@wing328
wing328
commented
Aug 10, 2019

Copy link


Copy Markdown

Member
@unintended thanks for the PR, which has been included in the 4.1.0 release: https://twitter.com/oas_generator/status/1160000504455319553
jimschubert added a commit
that referenced
this pull request
Aug 11, 2019
@jimschubert
Merge branch 'master' into server-variable-substitution
96e803c
* master: (122 commits)
Fix#3604 by adding undefined as return type to headers and credentials methods in runtime.ts (#3605)
Prepare 4.1.1-SNAPSHOT (#3603)
Prepare 4.1.0 release (#3597)
[java][client][jax-rs] Add a constant for Jackson @JsonProperty (#3560)
restore openapi3 petstore.yaml (#3590)
Add a new NodeJS Express server generator (#3567)
[C#][client][csharp-netcore] Fix csharp netcore defaultheaders (#3562)
Fix issue deserializing to nullptr (#3572)
[OCaml] Add file post-processing (#3583)
[dart2] Fix up test code generation, double deserialization, 'new' keyword deprecation (#3576)
Run Qt5 client sample test (#3415)
typescript-fetch: allow configuration of headers and credentials (#3586)
using partials in ruby api_client (#3564)
[OCaml] Added optional params support in API operations (#3568)
[Rust Server] Generate valid Rustdocs for lazy_static items (#3556)
Fix NPM build for Typescript-fetch (#3403)
Expand path templates via resttemplate's uriTemplateHandler (#3500)
Readme updated with a new tutorial and company using OpenAPI Generator (#3566)
Fix logic of `getNullableType` of csharp server and client. (#3537)
[Ruby] clean up Ruby dev dependencies (#3551)
...
@unintendedunintended
mentioned this pull request
Jul 16, 2021
 Merged

5 tasks
@chegechege
mentioned this pull request
Oct 27, 2021

Closed

@chegechege
mentioned this pull request
Nov 8, 2021

Open

6 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@macjohnnymacjohnnymacjohnny approved these changes

Assignees


No one assigned


Labels

Client: Java

Projects


None yet


Milestone

4.1.0

Development

Successfully merging this pull request may close these issues.

RestTemplate client misses placeholdered URI's in metrics and logs a pre-build one (with replaced variables)


4 participants

@unintended@macjohnny@wing328@richardwhiuk

, '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); }
})();
})();
Expand path templates via resttemplate's uriTemplateHandler by unintended · Pull Request #3500 · OpenAPITools/openapi-generator · GitHub
Skip to content
Expand path templates via resttemplate's uriTemplateHandler - #3500
Merged
macjohnny merged 4 commits into
OpenAPITools:masterfrom 
unintended:expand_path_templates_via_resttemplate
Aug 6, 2019
Merged
Expand path templates via resttemplate's uriTemplateHandler#3500
macjohnny merged 4 commits into
OpenAPITools:masterfrom 
unintended:expand_path_templates_via_resttemplate
Conversation
@unintended
@unintendedunintended
commented
Jul 30, 2019•

edited

Loading

Copy link


Copy Markdown

Contributor
PR checklist
  •  Read the contribution guidelines.
  •  Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\. If contributing template-only or documentation-only changes which will change sample output, be sure to build the project first.
  •  Filed the PR against the correct branch: master, 4.1.x, 5.0.x. Default: master.
  •  Copied the technical committee to review the pull request if your PR is targeting a particular programming language.
Description of the PR
This pr changes uri extension from static call of UriComponentsBuilder to more common way (via RestTemplate's UriTemplateHandler) and makes possible to natively handle templated path in metric collectors, etc
fixes#3499
@unintended
unintendedforce-pushed
the
expand_path_templates_via_resttemplate
branch
from
3bdb521 to
97f88dcCompareJuly 30, 2019 13:38
macjohnny
macjohnny
reviewed
Jul 30, 2019
View reviewed changes
Comment threadmodules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache
Outdated

 * @param variables variables to replace
 * @return path with placeholders replaced by variables
 */
 public String expandPath(String pathTempalte, Map<String, Object> variables) {
@macjohnnymacjohnnyJul 30, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Typo „pathTempalte“
@macjohnny
macjohnny
commented
Jul 31, 2019

Copy link


Copy Markdown

Member
please re-generate the samples
@macjohnny
macjohnny
commented
Aug 6, 2019

Copy link


Copy Markdown

Member
cc @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04)
macjohnny
macjohnny
approved these changes
Aug 6, 2019
View reviewed changes
@macjohnnymacjohnny
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM
@macjohnnymacjohnny
added this to the 4.1.0 milestone
Aug 6, 2019
@macjohnny
macjohnny
merged commit b8295af
into
OpenAPITools:masterAug 6, 2019
@wing328
wing328
commented
Aug 10, 2019

Copy link


Copy Markdown

Member
@unintended thanks for the PR, which has been included in the 4.1.0 release: https://twitter.com/oas_generator/status/1160000504455319553
jimschubert added a commit
that referenced
this pull request
Aug 11, 2019
@jimschubert
Merge branch 'master' into server-variable-substitution
96e803c
* master: (122 commits)
Fix#3604 by adding undefined as return type to headers and credentials methods in runtime.ts (#3605)
Prepare 4.1.1-SNAPSHOT (#3603)
Prepare 4.1.0 release (#3597)
[java][client][jax-rs] Add a constant for Jackson @JsonProperty (#3560)
restore openapi3 petstore.yaml (#3590)
Add a new NodeJS Express server generator (#3567)
[C#][client][csharp-netcore] Fix csharp netcore defaultheaders (#3562)
Fix issue deserializing to nullptr (#3572)
[OCaml] Add file post-processing (#3583)
[dart2] Fix up test code generation, double deserialization, 'new' keyword deprecation (#3576)
Run Qt5 client sample test (#3415)
typescript-fetch: allow configuration of headers and credentials (#3586)
using partials in ruby api_client (#3564)
[OCaml] Added optional params support in API operations (#3568)
[Rust Server] Generate valid Rustdocs for lazy_static items (#3556)
Fix NPM build for Typescript-fetch (#3403)
Expand path templates via resttemplate's uriTemplateHandler (#3500)
Readme updated with a new tutorial and company using OpenAPI Generator (#3566)
Fix logic of `getNullableType` of csharp server and client. (#3537)
[Ruby] clean up Ruby dev dependencies (#3551)
...
@unintendedunintended
mentioned this pull request
Jul 16, 2021
 Merged

5 tasks
@chegechege
mentioned this pull request
Oct 27, 2021

Closed

@chegechege
mentioned this pull request
Nov 8, 2021

Open

6 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@macjohnnymacjohnnymacjohnny approved these changes

Assignees


No one assigned


Labels

Client: Java

Projects


None yet


Milestone

4.1.0

Development

Successfully merging this pull request may close these issues.

RestTemplate client misses placeholdered URI's in metrics and logs a pre-build one (with replaced variables)


4 participants

@unintended@macjohnny@wing328@richardwhiuk