[davsclaus]

Stacked on #28306. This group covers seven more of the most used components of the catalog body types (CAMEL-24961): spring-redis, couchbase, fhir, solr, ssh, slack and telegram. fhir is the first API component with body types.

What the catalog says now

Component	Consumer	Producer input	Producer output
spring-redis	unknown: the message as the serializer reads it	any: the arguments come from headers	unchanged for SET, the default, and the result of 39 other commands (a Boolean, a Long, text, a Map, a Set or a List); not known for the rest, such as GET and the other commands that read one stored object
couchbase	the GetResult of the SDK; the row as JSON text with fullDocument=false	text, a Map, a List or a POJO, stored as JSON	true for CCB_PUT, the GetResult for CCB_GET, and the MutationResult as text for CCB_DEL
fhir	the result of the method, a HAPI FHIR object	any: only used with inBody	the result of the method: a HAPI FHIR object, or text or a List for transaction
solr		any; text or a List for DELETE	the response of Solr as a map
ssh	the output as a stream	text, bytes, stream or file: the command	the output as a stream
slack	a com.slack.api.model.Message	text, bytes, a stream, a file or a Message	unchanged
telegram	an IncomingMessage or another update object; no body for other updates	text, bytes with a media type header, a stream, a file, a model message, or no body	the MessageResult, or unchanged with no body

Checked at runtime. Routes run with camel run logged the class of the body after each step:

• spring-redis, solr and fhir against camel infra run redis, solr and fhir;
• couchbase against camel infra run couchbase, with the arm64 image of Couchbase 8.0.3;
• ssh against an embedded Apache MINA SSHD server in a bean;
• slack and telegram against fake APIs served by platform-http routes in a second camel run.

What the runs showed:

• spring-redis:
  • the body is never read;
  • after a command the body is its result only when the result is not null, so SET and PUBLISH keep the body, and so does GET of a missing key;
  • the subscriber gets the Java object the publisher serialized;
  • a message published by redis-cli cannot be deserialized and is dropped with a WARN.
• couchbase:
  • a Map, a List or a POJO is stored as JSON, and text as a JSON string;
  • bytes, a stream and no body fail;
  • the consumer gives the GetResult, or the row as JSON text with fullDocument=false.
• fhir:
  • the producer passes the body to the inBody parameter as it is, so a byte array or a stream fails with "argument type mismatch";
  • the result is the HAPI FHIR object of the method, text for transaction with stringBundle, and a List with withResources.
• solr:
  • every operation gives the response as a SimpleOrderedMap, which is a Map;
  • INSERT stores Maps, SolrInputDocuments, @field beans, JSON arrays, XML and .csv or .json files.
• ssh:
  • the body is the command, read as text;
  • the output is a stream, with the exit value and the error output in headers;
  • an exit value that is not 0 does not fail the exchange.
• slack:
  • text, bytes, a stream and a file are sent as text, and a Map as its toString();
  • the body is unchanged after both the token mode and the webhook mode.
• telegram:
  • text, a stream and a file are sent as a text message;
  • a byte array needs CamelTelegramMediaType;
  • the result is a MessageResult;
  • no body sends nothing.

Option values in any style of an enum constant (second commit). The catalog and the enum type converter take convert-to-json, convertToJson and CONVERT_TO_JSON as one value, but the build check of the @BodyTypes option values and the YAML validator compared them only in any case. So a step with operation=convert-to-json did not match the CONVERT_TO_JSON body of docling, and the validator took the text of the default operation: a field read after it was reported. Both now compare the values as the catalog does. API components need this for API names such as load-page, which the catalog lists as LOAD_PAGE.

Bugs found and filed, one per component:

• CAMEL-26019 (Major), spring-redis:
  • a command the producer does not implement, or an unknown one, does nothing and raises no error;
  • GET of a missing key keeps the body as it was;
  • KEYS finds nothing with the default serializer, and ECHO without a value fails with a NullPointerException;
  • a message another client published is dropped with a WARN.
• CAMEL-26020 (Major), couchbase:
  • without the CamelCouchbaseId header the document id is the Camel endpoint id, and the key option is never read;
  • an unknown operation does nothing;
  • without the collection option the generated SQL++ query fails every poll on Couchbase 8;
  • JSON text is stored as a JSON string;
  • the operation option gets its values as an enum.
• CAMEL-26021 (Major), solr:
  • the catalog says deleteByQuery defaults to true, the code to false;
  • with camel-solr on the classpath a conversion of any String or POJO to a Map gives an empty Map;
  • no body searches for, or deletes, the text "java.lang.Object@...";
  • an INSERT of a body that is not a document reports success and stores nothing.
• CAMEL-26022, ssh: the shell channel without a shellPrompt fails with a NullPointerException.
• CAMEL-26023, slack:
  • the webhook mode writes camelCase keys such as iconEmoji, where Slack expects icon_emoji;
  • it also changes the channel and the username of the Message body.
• CAMEL-26024, telegram:
  • a byte array with the media type TEXT is sent as a document;
  • a stream or a file cannot be sent as media;
  • the echo of a message without text sends the toString() of the IncomingMessage;
  • an answer with ok=false is not an error.
• CAMEL-26025 (Major), camel-support:
  • API components do not convert the body to the type of the inBody parameter, so a byte array or a stream fails with "argument type mismatch";
  • a producer that picks its operation by a header does nothing for an unknown operation;
  • a header named exactly as the prefix of an API component, such as CamelFhir, fails every call.

Docs fixed:

• spring-redis: the result types of 12 commands, and that a command without a result, or with a null result, keeps the body.
• couchbase: what the consumer body is, and a new section on the producer: the operations, the id header, how the body is stored and the body after the call.
• fhir: the inBody option takes the body as it is, and the body after a call is the result of the method.
• solr:
  • a Map and a String query in the table;
  • the deleteByQuery option and header;
  • the response as the body.
• ssh: the body after the call is the output as a stream.
• slack: the bodies the producer sends, the token mode, and the Message of the consumer.
• telegram:
  • what a byte array sends;
  • the body after a call;
  • the update objects the consumer gives;
  • sendLocation.

Measured.

• The validator over the 1204 human-written and 1209 model-written route files gives the same reports as with CAMEL-24961: Catalog body types for mail, paho, spring-rabbitmq, pulsar, nats and smpp #28306, also with the second commit.
• Body types now cover 95.9% of the endpoint uses in the human-written routes (94.8% with CAMEL-24961: Catalog body types for mail, paho, spring-rabbitmq, pulsar, nats and smpp #28306), and 116 of the 413 component JSONs have them.

Tests

• TextBodyFlowTest.testTheBodyOfMoreComponents:
  • reported: a Map sent to ssh, a field read after the ssh consumer, after spring-redis PING, after a couchbase consumer with fullDocument=false, and after couchbase CCB_DEL;
  • not reported: a field read after spring-redis SET (the body is kept) and GET (not known), after couchbase CCB_GET, after solr, and a Map sent to slack.
• TextBodyFlowTest.testAnOptionValueInAnotherStyleOfTheEnum: docling with operation=convert-to-json and operation=convertToJson gives the document, with operation=convert-to-markdown text. Without the fix the first two are reported as well.
• EndpointSchemaGeneratorMojoTest.testEndpointWithBodyTypesForEnumValuesInOtherStyles: the build takes convert-to-json and chunkHybrid for an option with the values CONVERT_TO_JSON and CHUNK_HYBRID.
• These pass:
  • the 291 tests of camel-yaml-dsl-validator, and the 104 of camel-package-maven-plugin;
  • the 265 validator and catalog doc tests of camel-jbang-core;
  • the builds of camel-yaml-dsl-maven-plugin and camel-yaml-dsl-deserializers.
• The answers of camel_catalog_doc stay under 18 000 characters: spring-redis, the largest, is 15 165.

Claude Code on behalf of davsclaus

🤖 Generated with Claude Code

[gnodet-bot]

Both open items from the previous review are fully resolved:

Couchbase producerOut byOption coverage — the three operations are now correctly declared: CCB_PUT → Boolean (default), CCB_GET → GetResult POJO, CCB_DEL → MutationResult as text. The description is accurate and matches the byOption entries.

Spring-redis read-returning commands — the explanation is correct: with dependsOn = "command", a command absent from byOption gives no answer from CatalogBodyTypes.answer, and these commands (GET, HGET, LPOP, RPOP, SPOP, etc.) are correctly documented in the description as "not known". The validator test (lookup route) confirms the right behaviour: no warning is issued when the output is unknown.

The isSameValue normalisation in both CatalogBodyTypes.java and BodyTypesHelper.java is clean — dash-case, camelCase, and UPPER_SNAKE_CASE are all collapsed to the canonical form before comparison, consistent with what the catalog and the enum type converter accept. The two new tests (testAnOptionValueInAnotherStyleOfTheEnum, testEndpointWithBodyTypesForEnumValuesInOtherStyles) cover the round-trip correctly. The new test endpoint SomeEndpointWithEnumStyleBodyTypes exercises the BodyTypesHelper check path.

The remaining first-time additions (fhir, slack, solr, ssh, telegram) are consistent with the series and correctly structured.

This review was generated by an AI agent, Hermès on behalf of @gnodet.