Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

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

Jump to bottom

Merge Liferay feature branch to master #196

Merged
merged 19 commits into from
Jan 14, 2022
Merged

Merge Liferay feature branch to master #196

merged 19 commits into from
Jan 14, 2022

Conversation

mshabarov
Copy link
Contributor

Description

NOT SQUASH.

Type of change

  • Bugfix
  • Feature

Checklist

  • I have read the contribution guide: https://vaadin.com/docs/latest/guide/contributing/overview/
  • I have added a description following the guideline.
  • The issue is created in the corresponding repository and I have referenced it.
  • I have added tests to ensure my change is effective and works as intended.
  • New and existing tests are passing locally with my change.
  • I have performed self-review and corrected misspellings.

Additional for Feature type of change

  • Enhancement / new feature was discussed in a corresponding GitHub issue and Acceptance Criteria were created.

@CLAassistant
Copy link

CLAassistant commented Jan 5, 2022 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

caalador
caalador previously approved these changes Jan 7, 2022
View reviewed changes
caalador and others added 18 commits January 14, 2022 10:17
@caalador
Changes to enable VaadinPortlet 3.0 usage on liferay 7.2.1-ga2
2f76e54
@caalador
Support for Liferay 7.2 and 7.3
e82a623 
There are some failing tests, but this is in a feature branch for now so it should be fine.
@tltv @caalador
Added getView() to PortletViewContext
c800ead
@tltv @caalador
vaadin-parent bump 2.0.2
9407904 
Also flow.version 2.5.1,
com.liferay.portal.kernel 9.30.0,
flow.cdi.version 11.2.1
and license-checker 1.2.1.

Disabled LicenseChecker. LiceseChecker has trouble with Liferay 7.3.
(more comments in code)
@tltv @caalador
Reading ApplicationRouteRegistry without VaadinServletContext
d96d139 
ApplicationRouteRegistry.createRegistry(VaadinContext) depends on
VaadinServletContext which is not ok with portlet context.
@tltv @caalador
Updated VaadinLiferayRequest to support LiferayPortletUtil
6db48ea 
com.liferay.portlet.LiferayPortletUtil is available with Liferay 7.1+.
@tltv @caalador
Added PortletStreamResourceHandler
58cbd71 
To avoid exception casting VaadinPortletRequest to VaadinServletRequest.
@tltv @caalador
Fixed setContentType in PortletStreamResourceHandler
da0e5c0
@tltv @caalador
Fixed portlet script syntax
75d0e9c 
Script caused web component bootstrap script being embedded in
PortletMethods script block when adding Vaadin portlet as a Liferay
Widget.
@tltv @caalador
Updated comments about bug LPS-107438
9009ba1
@mshabarov @caalador
fix: Load the portlet methods file from a jar resources
1633a23 
Uses portlet context and loads the portlet methods file from jar dependency resources instead of static bundle for Pluto 3.0 implementations except Liferay.

Fixes #191
@mshabarov @caalador
fix: Re-enable page reload on state change
a341861
@mshabarov @caalador
chore: Re-enable license checker
521a1f5 
Jna dependency conflict isn't reproduce with LR 7.3 and the last versions of 7.3 does not contain jna in it's system.packages.extra.bnd and META-INF/system.packages.extra.mf.
@mshabarov @caalador
Revert "fix: Re-enable page reload on state change"
bfddb74 
This reverts commit 77b39fc
@mshabarov @caalador
fix: Make page refresh on state change optional
0c59011
@mshabarov @caalador
fix: Embed dynamic resource url into portal query param
dceb7d9 
Fixes #194
@mshabarov @caalador
chore: Address sonar issues
c8cd3aa
@mshabarov @caalador
chore: Use a common var name not liferay specific
edec515
@vaadin-bot
Copy link

SonarQube analysis reported 30 issues

  • MAJOR 20 major
  • MINOR 8 minor
  • INFO 2 info

Top 10 issues

  1. MAJOR PortletBootstrapHandler.java#L117: Either log or rethrow this exception. rule
  2. MAJOR PortletStreamRequestHandler.java#L151: Define and throw a dedicated exception instead of using a generic one. rule
  3. MAJOR PortletStreamResourceHandler.java#L66: Either log or rethrow this exception. rule
  4. MAJOR PortletStreamResourceRegistry.java#L102: Define and throw a dedicated exception instead of using a generic one. rule
  5. MAJOR VaadinLiferayPortlet.java#L47: Take the required action to fix the issue indicated by this comment. rule
  6. MAJOR VaadinLiferayRequest.java#L62: Define and throw a dedicated exception instead of using a generic one. rule
  7. MAJOR VaadinLiferayRequest.java#L83: Either log or rethrow this exception. rule
  8. MAJOR VaadinLiferayRequest.java#L95: Extract this nested try block into a separate method. rule
  9. MAJOR VaadinLiferayRequest.java#L99: Make the enclosing method "static" or remove this set. rule
  10. MAJOR VaadinLiferayRequest.java#L101: Either log or rethrow this exception. rule

@caalador caalador merged commit 63b4946 into master Jan 14, 2022
@caalador caalador deleted the merged-liferay branch January 14, 2022 09:13
@mshabarov mshabarov added this to the 1.0.0.beta4 milestone Jan 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@caalador caalador caalador approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.0.0.beta4
Development

Successfully merging this pull request may close these issues.
5 participants
@mshabarov @CLAassistant @vaadin-bot @caalador @tltv