adityamparikh commented on PR #86: URL: https://github.com/apache/solr-mcp/pull/86#issuecomment-5341605938
Updating my earlier comment — it's gone stale, and I'd rather not have you work from it. Back then I said this branch rebased onto `main` cleanly with only an import-block collision in `SolrConfig.java`. That is **no longer true** as of `a84033b`. Re-running the rebase now gives two conflicts, one of which is structural: 1. **`McpToolRegistrationTest.java`** — this branch imports `org.apache.solr.mcp.server.metadata.SchemaService`. That package no longer exists; it was split into `collection/` and `schema/`, so the import is now `org.apache.solr.mcp.server.schema.SchemaService`. `RefGuideService` slots in alongside it fine. 2. **`SolrConfig.java`** — no longer just imports. `buildSolrClient` was rewritten in #176 to normalise the Solr path via `URI` (parsing the URL's *path* rather than searching the whole string, so a host literally named `solr` stops matching the `/solr/` in its own authority). Your `RestClient` `@Bean` and that rewrite land in the same region, so it needs a real resolution rather than taking one side — keep the new `URI`-based `buildSolrClient` **and** add the `RestClient` bean next to it. No rush given this is a draft — flagging it mainly so the "it's just imports" read doesn't cost you time when you pick it back up. Happy to push a rebased branch to your fork if that's easier; just say so. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
