Fix #257: Return http.Handler instead of SetupRouter in server/restapi/web
Description
Fixes #257
This PR addresses the issue raised by @rakyll to return an http.Handler instead of requiring users to pass in a *mux.Router. This change follows Go best practices by decoupling the REST API implementation from a specific router library (gorilla/mux).
Changes
1. Added NewHandler() function (server/restapi/web/server.go)
- Created
NewHandler(config *adk.Config) http.Handlerthat returns a standardhttp.Handler - This is now the preferred way to integrate ADK REST API with any HTTP server
- Users can register the handler with any router: standard
net/http.ServeMux, chi, echo, gin, etc.
2. Maintained backward compatibility
- Kept existing
SetupRouter()function fully functional - Marked it as
Deprecatedwith clear migration guidance - No breaking changes for existing code
3. Updated internal usage (cmd/launcher/web/api/api.go)
- Refactored
SetupSubrouters()to useNewHandler()internally - Applied CORS middleware before registration
- Uses
http.StripPrefixfor proper path handling
4. Added example (examples/restapi/main.go)
- Demonstrates usage with standard
net/http.ServeMux - Shows how to compose the handler with other endpoints
- Proves the framework-agnostic approach works
Benefits
- Decoupled: Not tied to gorilla/mux or any specific router
- Flexible: Works with any HTTP server implementation
- Standard: Returns
http.Handler, following Go conventions - Backward Compatible: Existing code continues to work
- Easy Migration: Clear deprecation notice with alternative
Testing
- All packages build successfully:
go build ./... - No breaking changes to existing functionality
- Example runs and demonstrates new usage pattern
- No existing code in the repository uses the old pattern directly
Migration Guide
Before (old approach):
router := mux.NewRouter()
restapiweb.SetupRouter(router, config)
After (new approach):
handler := web.NewHandler(config)
mux.Handle("/api/", http.StripPrefix("/api", handler))
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).
View this failed invocation of the CLA check for more information.
For the most up to date status, view the checks section at the bottom of the pull request.
Summary of Changes
Hello @Arjunmehta312, I'm Gemini Code Assist[^1]! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!
This pull request introduces a significant refactoring to the ADK REST API server setup, moving from a gorilla/mux-specific router configuration to a more generic http.Handler interface. This change enhances the flexibility and modularity of the API, allowing it to be integrated seamlessly with any Go HTTP server or routing library. The update also includes a new example showcasing this improved integration.
Highlights
- API Handler Refactor: The
server/restapi/webpackage now provides aNewHandlerfunction that returns a standardhttp.Handler, promoting router-agnostic integration. - gorilla/mux Decoupling: The previous
SetupRouterfunction is deprecated, reducing the tight coupling to thegorilla/muxrouter. - New Example: A new example (
examples/restapi/main.go) demonstrates how to use the newhttp.Handlerwith the standardnet/httppackage.
Using Gemini Code Assist
The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.
Invoking Gemini
You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.
| Feature | Command | Description |
|---|---|---|
| Code Review | /gemini review |
Performs a code review for the current pull request in its current state. |
| Pull Request Summary | /gemini summary |
Provides a summary of the current pull request in its current state. |
| Comment | @gemini-code-assist | Responds in comments when explicitly tagged, both in pull request comments and review comments. |
| Help | /gemini help |
Displays a list of available commands. |
Customization
To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.
Limitations & Feedback
Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with :thumbsup: and :thumbsdown: on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.
You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.
[^1]: Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.
Made the required changes @dpasiukevich Please review and merge if proper. Thanks and regards.
@Arjunmehta312 could you also update the example to pass the linter and we're good to merge.
Sure, will update the example to pass the linter as you mentioned
@dpasiukevich done please check it out 😊
Also please note that, as per maintainer feedback, the public SetupRouter() function has been removed entirely This is a breaking change but aligns with the goal of decoupling from gorilla/mux
All okay?
Thanks @dpasiukevich , sorry for the multiple reviews.
Happy to contribute!