File tree Expand file tree Collapse file tree 6 files changed +19
-15
lines changed
flow-tests/vaadin-spring-tests
test-spring-security-flow/src/main/java/com/vaadin/flow/spring/flowsecurity/views Expand file tree Collapse file tree 6 files changed +19
-15
lines changed Original file line number Diff line number Diff line change 4545 id : formatter
4646 run : |
4747 echo "Running formatter..."
48- mvn -B -q spotless:apply -P benchmark 2>&1 | grep -v null || true
48+ mvn -ntp - B -q spotless:apply -P benchmark 2>&1 | grep -v null || true
4949
5050 # Check for modified files
5151 files=$(git status --porcelain | awk '{print $2}')
Original file line number Diff line number Diff line change 5050 - name : Run Sonar analysis
5151 run : |
5252 mvn clean install sonar:sonar \
53- -B -e -V \
53+ -ntp - B -e -V \
5454 -DskipTests \
5555 -Dsonar.projectKey=vaadin_flow \
5656 -Dsonar.organization=vaadin \
Original file line number Diff line number Diff line change 156156 <dependency >
157157 <groupId >org.springdoc</groupId >
158158 <artifactId >springdoc-openapi-starter-webmvc-ui</artifactId >
159- <version >2.8.14 </version >
159+ <version >3.0.0 </version >
160160 </dependency >
161161
162162 </dependencies >
Original file line number Diff line number Diff line change @@ -55,16 +55,17 @@ public AdminView(SecurityUtils securityUtils) {
5555 accessRolePrefixedAdminPageFromThread .setId (ROLE_PREFIX_TEST_BUTTON_ID );
5656 accessRolePrefixedAdminPageFromThread .addClickListener (event -> {
5757 UI ui = event .getSource ().getUI ().get ();
58- Runnable doNavigation = () -> {
58+ Runnable doNavigation = new DelegatingSecurityContextRunnable (
59+ () -> ui .navigate (RolePrefixedAdminView .class ),
60+ SecurityContextHolder .getContext ());
61+ Runnable delayedNavigation = () -> {
5962 try {
6063 TimeUnit .MILLISECONDS .sleep (100 );
61- ui .access (() -> ui . navigate ( RolePrefixedAdminView . class ) );
64+ ui .access (doNavigation :: run );
6265 } catch (InterruptedException e ) {
6366 }
6467 };
65- Runnable wrappedRunnable = new DelegatingSecurityContextRunnable (
66- doNavigation , SecurityContextHolder .getContext ());
67- new Thread (wrappedRunnable ).start ();
68+ new Thread (delayedNavigation ).start ();
6869 });
6970 add (accessRolePrefixedAdminPageFromThread );
7071 }
Original file line number Diff line number Diff line change @@ -54,19 +54,17 @@ public PublicView() {
5454 Button backgroundNavigation = new Button (
5555 "Navigate to admin view in 1 second" , e -> {
5656 UI ui = e .getSource ().getUI ().get ();
57+ Runnable doNavigation = new DelegatingSecurityContextRunnable (
58+ () -> ui .navigate (AdminView .class ),
59+ SecurityContextHolder .getContext ());
5760 Runnable navigateToAdmin = () -> {
5861 try {
5962 Thread .sleep (1000 );
6063 } catch (InterruptedException e1 ) {
6164 }
62- ui .access (() -> {
63- ui .navigate (AdminView .class );
64- });
65+ ui .access (doNavigation ::run );
6566 };
66- Runnable wrappedRunnable = new DelegatingSecurityContextRunnable (
67- navigateToAdmin ,
68- SecurityContextHolder .getContext ());
69- new Thread (wrappedRunnable ).start ();
67+ new Thread (navigateToAdmin ).start ();
7068 });
7169 backgroundNavigation .setId (BACKGROUND_NAVIGATION_ID );
7270 add (backgroundNavigation );
Original file line number Diff line number Diff line change 542542 <propertiesEncoding >UTF-8</propertiesEncoding >
543543 </configuration >
544544 </plugin >
545+ <plugin >
546+ <groupId >org.sonarsource.scanner.maven</groupId >
547+ <artifactId >sonar-maven-plugin</artifactId >
548+ <version >5.3.0.6276</version >
549+ </plugin >
545550 </plugins >
546551 </pluginManagement >
547552
You can’t perform that action at this time.
0 commit comments