') + ')', '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('^' + ".*" + ', '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" + ', '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('^' + ".*" + ', '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); } })(); })(); [Java][jersey2] Make (de)serialization work for oneOf models by bkabrda · Pull Request #6323 · OpenAPITools/openapi-generator · GitHub
Skip to content

[Java][jersey2] Make (de)serialization work for oneOf models - #6323

Merged
wing328 merged 1 commit into
OpenAPITools:masterfrom
bkabrda:jersey2-fix-oneof
May 25, 2020
Merged

[Java][jersey2] Make (de)serialization work for oneOf models#6323
wing328 merged 1 commit into
OpenAPITools:masterfrom
bkabrda:jersey2-fix-oneof

Conversation

@bkabrda

@bkabrdabkabrda commented May 15, 2020

Copy link
Copy Markdown
Contributor

This PR makes oneOf (de)serialization actually work properly, also adds some convenience constructors for the oneOf models and equals/toString/hashcode for proper comparison and debugging.

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project before.
  • Run the shell script(s) under ./bin/ (or Windows batch scripts under.\bin\windows) to update Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit, and these must match the expectations made by your contribution. You only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the code or mustache templates for a language ({LANG}) (e.g. php, ruby, python, etc).
  • File the PR against the correct branch: master, 4.3.x, 5.0.x. Default: master.
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.

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

@wing328

wing328 commented May 17, 2020

Copy link
Copy Markdown
Member

Looks good at first glance. I'll run some tests later this week as the petstore samples do not have oneOf tests.

wing328
wing328 approved these changes May 25, 2020
View reviewed changes

@wing328wing328 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.

Tested locally and the result is good

@wing328
wing328 merged commit 205514c into OpenAPITools:masterMay 25, 2020
@wing328wing328 added this to the 5.0.0 milestone May 25, 2020
@wing328wing328 mentioned this pull request May 25, 2020
Merged
5 tasks
jimschubert added a commit that referenced this pull request May 25, 2020
@jimschubert
Merge branch 'master' into remove-deprecations-5.0
18ce686
* master: (71 commits)
[PS] check if JSON properties is defined (#6419)
Add C++ UE4 client generator (#6399)
Add a link to the article in dev.to (#6421)
typescript-axios anytype is not defined (#6335)
[Java][jersey2] Make (de)serialization work for oneOf models, add convenience and comparison methods (#6323)
Migrate OCaml petstore to use OAS v3 spec (#6348)
[Python-experimental] Fix type error if oneof/anyof child schema is null type (#6387)
[Python-server] Fix blueplanet 'file not found' error (#6411)
[nodejs] Fix deprecation notice when running sample nodejs script (#6412)
[java-jersey2] Conditionally include http signature mustache template (#6413)
[bug] Fix path provider bug on CI (#6409)
decomission nodejs server generator (#6406)
[Java] Generate valid code if no Authentication implementations present (#5788)
update java jersey2 samples
[Java] Fix mustache tag in pom template for HTTP signature (#6404)
[Python-experimental] Rename from_server variable to json_variable_naming (#6390)
Add a link to medium blog post (#6403)
Clean up debug in test (#6398)
readding bin/swift5-petstore-readonlyProperties.json
remove ./bin/swift5-petstore-readonlyProperties.json
...
jimschubert added a commit to jimschubert/openapi-generator that referenced this pull request May 27, 2020
@jimschubert
Merge branch 'master' into cleanup-template-management
062b4d2
* master:
[kotlin][client] add support for coroutines with OkHttp (OpenAPITools#6362)
update package-json.lock (OpenAPITools#6430)
fix hardcoded match type (OpenAPITools#6431)
java jersey2 enhance anyOf (OpenAPITools#6420)
[Java][jersey2] minor improvement to jersey2 tests (OpenAPITools#6418)
ps minor style change (OpenAPITools#6424)
[JS] mark ES5 as deprecated (OpenAPITools#6408)
[ci] Execute maven and verify with no-snapshot-updates (OpenAPITools#6415)
add new file in ts axios samples
Migrate all scala generators to use OAS3 (OpenAPITools#6407)
migrate ruby samples to oas3 (OpenAPITools#6414)
[PS] check if JSON properties is defined (OpenAPITools#6419)
Add C++ UE4 client generator (OpenAPITools#6399)
Add a link to the article in dev.to (OpenAPITools#6421)
typescript-axios anytype is not defined (OpenAPITools#6335)
[Java][jersey2] Make (de)serialization work for oneOf models, add convenience and comparison methods (OpenAPITools#6323)
Migrate OCaml petstore to use OAS v3 spec (OpenAPITools#6348)
[Python-experimental] Fix type error if oneof/anyof child schema is null type (OpenAPITools#6387)
[Python-server] Fix blueplanet 'file not found' error (OpenAPITools#6411)
[nodejs] Fix deprecation notice when running sample nodejs script (OpenAPITools#6412)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wing328wing328wing328 approved these changes

Assignees

No one assigned

Labels

Client: JavaEnhancement: General

Projects

None yet

Milestone

5.0.0

Development

Successfully merging this pull request may close these issues.

2 participants

@bkabrda@wing328