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.

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

Cherry Pick: Fix the dependency of DevModeInitializer on ServletRegistration (#7709) #7744

Merged
merged 9 commits into from
Mar 6, 2020

Conversation

mehdi-vaadin
Copy link
Contributor

@mehdi-vaadin mehdi-vaadin commented Mar 4, 2020

  • Fix the dependency of DevModeInitializer on ServletRegistration

  • Use VaadinServlet registration if present in DevModeInitializer

(cherry picked from commit d693b47)


This change is Reviewable

* Fix the dependency of DevModeInitializer on ServletRegistration

* Use VaadinServlet registration if present in DevModeInitializer

(cherry picked from commit d693b47)
@mehdi-vaadin mehdi-vaadin added this to External Reviews in OLD Vaadin Flow ongoing work (Vaadin 10+) via automation Mar 4, 2020
@mehdi-vaadin mehdi-vaadin moved this from External Reviews to Iteration Reviews in OLD Vaadin Flow ongoing work (Vaadin 10+) Mar 4, 2020
denis-anisimov
denis-anisimov previously approved these changes Mar 5, 2020
Copy link
Contributor

@denis-anisimov denis-anisimov left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 6 of 6 files at r1.
Reviewable status: :shipit: complete! all discussions resolved, 1 of 1 LGTMs obtained

OLD Vaadin Flow ongoing work (Vaadin 10+) automation moved this from Iteration Reviews to Reviewer approved Mar 5, 2020
OLD Vaadin Flow ongoing work (Vaadin 10+) automation moved this from Reviewer approved to Changes Requested Mar 5, 2020
@mehdi-vaadin mehdi-vaadin self-assigned this Mar 5, 2020
@mehdi-vaadin mehdi-vaadin moved this from Changes Requested to Iteration Reviews in OLD Vaadin Flow ongoing work (Vaadin 10+) Mar 5, 2020
Copy link
Contributor

@denis-anisimov denis-anisimov left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 3 files at r2.
Reviewable status: 1 unresolved discussion, 0 of 1 LGTMs obtained, and 1 stale (waiting on @denis-anisimov and @mehdi-vaadin)


flow-server/src/test/java/com/vaadin/flow/server/startup/DevModeInitializerTest.java, line 217 at r2 (raw file):

        System.setProperty(
                Constants.VAADIN_PREFIX + FrontendUtils.PROJECT_BASEDIR,
                initParams.get(FrontendUtils.PROJECT_BASEDIR));

Is there any way to avoid using system property ?
As I mentioned : it's global which mean it's not tread safe.
Other test which sets this property may break this test. Or this test may break other test which reads this property.

OLD Vaadin Flow ongoing work (Vaadin 10+) automation moved this from Iteration Reviews to Changes Requested Mar 6, 2020
Copy link
Contributor Author

@mehdi-vaadin mehdi-vaadin left a comment

Choose a reason for hiding this comment

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

Reviewable status: 1 unresolved discussion, 0 of 1 LGTMs obtained, and 1 stale (waiting on @denis-anisimov)


flow-server/src/test/java/com/vaadin/flow/server/startup/DevModeInitializerTest.java, line 217 at r2 (raw file):

Previously, denis-anisimov (Denis) wrote…
        System.setProperty(
                Constants.VAADIN_PREFIX + FrontendUtils.PROJECT_BASEDIR,
                initParams.get(FrontendUtils.PROJECT_BASEDIR));

Is there any way to avoid using system property ?
As I mentioned : it's global which mean it's not tread safe.
Other test which sets this property may break this test. Or this test may break other test which reads this property.

I used ServletContext parameter as you suggested on the other PR.

Copy link
Contributor

@denis-anisimov denis-anisimov left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 1 of 1 files at r3.
Reviewable status: :shipit: complete! all discussions resolved, 1 of 1 LGTMs obtained

OLD Vaadin Flow ongoing work (Vaadin 10+) automation moved this from Changes Requested to Reviewer approved Mar 6, 2020
@denis-anisimov denis-anisimov merged commit 6aec19a into 2.2 Mar 6, 2020
OLD Vaadin Flow ongoing work (Vaadin 10+) automation moved this from Reviewer approved to Done - pending release Mar 6, 2020
@denis-anisimov denis-anisimov deleted the pick-7709-to-2.2 branch March 6, 2020 12:59
@mehdi-vaadin mehdi-vaadin added this to the 2.2.0.alpha15 milestone Mar 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
OLD Vaadin Flow ongoing work (Vaadin ...
  
Done - pending release
Development

Successfully merging this pull request may close these issues.

None yet

3 participants