adityamparikh commented on PR #110:
URL: https://github.com/apache/solr-mcp/pull/110#issuecomment-5341806477
Rebased onto `main` (`a84033b`). This branch was stale enough that the
conflicts mattered — it still carried pre-#176 code, so a naive resolution
would have reverted three upstream fixes. Taking `main`'s body and adding only
the logging:
- `checkHealth`: kept `Instant.now()` and the 6-arg `SolrHealthStatus`; the
branch still had `new Date()` and the old 8-arg form (#113 replaced `Date` with
`Instant`). Added the `logger.warn` on top.
- `SchemaService`: kept `toJson(objectMapper, Map.of("error",
String.valueOf(e.getMessage())))`; the branch still had the string-concatenated
`"{\"error\": \"" + e.getMessage()` that #176 replaced because a message
containing a quote or newline emitted invalid JSON. Added `logger.error` on top.
- `fetchCacheMetrics`/`fetchHandlerMetrics`: kept `main`'s `@Nullable`
return annotations alongside the branch's `collectionName` parameter rename and
`logger.debug` calls.
- Import blocks: kept `org.jspecify.annotations.Nullable` next to the new
slf4j imports rather than letting one side win.
Net effect is unchanged from the original intent — loggers on the five
service classes, exceptions logged rather than silently swallowed — with none
of #113/#176 undone.
Verified: `./gradlew build` green on JDK 25.
--
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]
