Skip to content

Revert "[grid] Add config blocked-routes and specific blocked-delete-session in Router" #15921

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

Merged
merged 1 commit into from
Jun 20, 2025

Conversation

VietND96
Copy link
Member

@VietND96 VietND96 commented Jun 20, 2025

User description

Reverts #15920. Since it was a complex solution and doesn't have a reality use case for that.


PR Type

Other


Description

• Reverts blocked routes feature from grid router
• Removes BlockedRoute and BlockedRoutesFilter classes
• Removes blocked-routes configuration options
• Removes related test files and build configuration


Changes walkthrough 📝

Relevant files
Bug fix
3 files
Hub.java
Remove blocked routes filter application                                 
+0/-10   
Standalone.java
Remove blocked routes filter application                                 
+0/-10   
RouterServer.java
Remove blocked routes filter application                                 
+0/-8     
Miscellaneous
2 files
BlockedRoute.java
Delete entire BlockedRoute class file                                       
+0/-221 
BlockedRoutesFilter.java
Delete entire BlockedRoutesFilter class file                         
+0/-86   
Configuration changes
2 files
RouterFlags.java
Remove blocked routes command line parameters                       
+0/-23   
RouterOptions.java
Remove blocked routes configuration methods                           
+0/-50   
Tests
3 files
BlockedRouteTest.java
Delete entire test class file                                                       
+0/-166 
BlockedRoutesFilterTest.java
Delete entire test class file                                                       
+0/-213 
RouterOptionsTest.java
Delete entire test class file                                                       
+0/-417 
Dependencies
1 files
BUILD.bazel
Delete test build configuration file                                         
+0/-18   

Need help?
  • Type /help how to ... in the comments thread for any questions about Qodo Merge usage.
  • Check out the documentation for more information.
  • @selenium-ci selenium-ci added B-grid Everything grid and server related C-java Java Bindings B-build Includes scripting, bazel and CI integrations labels Jun 20, 2025
    Copy link
    Contributor

    PR Reviewer Guide 🔍

    Here are some key observations to aid the review process:

    ⏱️ Estimated effort to review: 2 🔵🔵⚪⚪⚪
    🧪 No relevant tests
    🔒 No security concerns identified
    ⚡ Recommended focus areas for review

    Import Cleanup

    The removal of unused imports appears correct, but verify that no other parts of the codebase still reference the removed BlockedRoute or BlockedRoutesFilter classes to avoid compilation errors.

    import static java.net.HttpURLConnection.HTTP_OK;
    import static java.net.HttpURLConnection.HTTP_UNAVAILABLE;
    import static org.openqa.selenium.grid.config.StandardGridRoles.DISTRIBUTOR_ROLE;
    import static org.openqa.selenium.grid.config.StandardGridRoles.EVENT_BUS_ROLE;
    import static org.openqa.selenium.grid.config.StandardGridRoles.HTTPD_ROLE;
    import static org.openqa.selenium.grid.config.StandardGridRoles.ROUTER_ROLE;
    import static org.openqa.selenium.grid.config.StandardGridRoles.SESSION_QUEUE_ROLE;
    import static org.openqa.selenium.remote.http.Route.combine;
    
    import com.google.auto.service.AutoService;
    import com.google.common.collect.ImmutableSet;
    import java.net.MalformedURLException;
    import java.net.URL;
    import java.util.Collections;
    import java.util.Set;
    import java.util.logging.Level;
    import java.util.logging.Logger;
    import java.util.stream.Stream;
    Method Removal

    The getBlockedRoutes method has been completely removed. Ensure that no other components in the grid system are calling this method, as this could cause runtime failures if the revert is incomplete.

                  return prefix;
                })
            .orElse("");
      }
    
      public boolean disableUi() {
        return config.get(ROUTER_SECTION, "disable-ui").map(Boolean::parseBoolean).orElse(false);
      }
    }

    Copy link
    Contributor

    PR Code Suggestions ✨

    No code suggestions found for the PR.

    @VietND96 VietND96 merged commit c136253 into trunk Jun 20, 2025
    9 checks passed
    @VietND96 VietND96 deleted the revert-15920-blocked-routes branch June 20, 2025 08:22
    Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
    Labels
    B-build Includes scripting, bazel and CI integrations B-grid Everything grid and server related C-java Java Bindings Review effort 2/5
    Projects
    None yet
    Development

    Successfully merging this pull request may close these issues.

    2 participants