adityamparikh commented on PR #159:
URL: https://github.com/apache/solr-mcp/pull/159#issuecomment-5704990767
Rebased this branch onto current `main` (`upstream/main` @ `93ffdb7`) to
check the conflict. There's exactly one, in
`src/main/java/org/apache/solr/mcp/server/config/SolrNativeHints.java` —
`main`'s #164 renamed `MCP_RESPONSE_RECORDS` to `MCP_TOOL_RECORDS` (and
reworded the comment) after this branch forked off, so the two sides disagree
only on that name.
Resolution: keep `main`'s `MCP_TOOL_RECORDS` name/comment, and add
`"org.apache.solr.mcp.server.collection.AliasResult"` as the first entry
(matching what this branch already registers under the old name).
```diff
- private static final List<String> MCP_TOOL_RECORDS = List.of(
+ private static final List<String> MCP_TOOL_RECORDS = List.of(
+ "org.apache.solr.mcp.server.collection.AliasResult",
"org.apache.solr.mcp.server.collection.CollectionCreationResult",
"org.apache.solr.mcp.server.collection.SolrHealthStatus",
"org.apache.solr.mcp.server.collection.SolrMetrics",
"org.apache.solr.mcp.server.collection.IndexStats",
"org.apache.solr.mcp.server.collection.QueryStats",
"org.apache.solr.mcp.server.collection.CacheStats",
"org.apache.solr.mcp.server.collection.CacheInfo",
"org.apache.solr.mcp.server.collection.HandlerStats",
"org.apache.solr.mcp.server.collection.HandlerInfo",
"org.apache.solr.mcp.server.search.SearchResponse",
"org.apache.solr.mcp.server.search.SortClause",
"org.apache.solr.mcp.server.schema.SchemaUpdateResult");
```
(Take `main`'s copy of the file wholesale, then just prepend the
`AliasResult` line — nothing else in the file conflicts; `README.md` merges
cleanly on its own.)
After resolving this and running `./gradlew spotlessApply`, `./gradlew
build` passes for me locally — `AliasServiceTest`,
`AliasServiceIntegrationTest`, and `SolrNativeHintsTest` all green. (I did hit
an unrelated one-off Testcontainers/Docker timeout on the first full run that
took out a batch of `http`-profile tests; re-running just those classes passed,
so it wasn't caused by this change.)
Steps I used, if useful:
```bash
git fetch upstream main
git rebase upstream/main # or: git merge upstream/main
# resolve SolrNativeHints.java as above
git add src/main/java/org/apache/solr/mcp/server/config/SolrNativeHints.java
git rebase --continue # or: git commit
./gradlew spotlessApply
./gradlew build
```
— resolved and verified with Claude Code assistance.
--
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]
