You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by "davsclaus (via GitHub)" <gi...@apache.org> on 2026/09/17 19:16:06 UTC

[PR] CAMEL-24802: camel-core - simple: add escape function for html/xml/json/js/sql/url special characters [camel]

davsclaus opened a new pull request, #26565:
URL: https://github.com/apache/camel/pull/26565

   Fixes https://issues.apache.org/jira/browse/CAMEL-24802
   
   Adds an `escape(kind, exp)` function to the simple language so special characters can be escaped without chaining `replace` calls or writing a bean:
   
   ```
   ${escape(html)}                       -> escapes the message body
   ${escape(xml, ${header.title})}
   ${escape(json, ${body})}
   ${escape(js, ${header.msg})}
   ${escape(sql, ${header.name})}
   ${escape(url, 'Camel in Action')}     -> Camel%20in%20Action
   ```
   
   - `kind` is one of `html`, `xml`, `json`, `js` (alias `javascript`), `sql`, `url` — case-insensitive, resolved at parse time so an unknown kind fails with a `SimpleParserException` listing the valid kinds
   - `exp` is optional and defaults to the message body, like the other string functions; only the first comma is used as separator so nested functions with commas work (`${escape(html, ${concat(${body},${body},-)})}`)
   - `url` uses RFC 3986 component encoding (space → `%20`, not `+`)
   - Implemented in a new JDK-only `org.apache.camel.util.EscapeHelper` (no new dependency); the escape function itself lives in `StringFunctionFactory` / `StringExpressionBuilder` in camel-core-languages
   - `@Metadata` on `SimpleConstants` so the function shows up in the catalog, the JS validator and the TUI/MCP function reference (regenerated files included)
   - Docs: string function table + a new subsection in `simple-functions.adoc`
   
   Tests: `EscapeHelperTest` (camel-util) and new cases in `StringFunctionFactoryTest` (camel-core); ran the full `org.apache.camel.language.simple` test package in camel-core (593 tests green).
   
   Background: a user asked on Zulip how to escape special characters before feeding data to a Velocity template; the template-side alternative (Velocity `EscapeTool`) was documented separately in b2190cda403a.
   
   _Claude Code on behalf of davsclaus_
   


-- 
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: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] CAMEL-24802: camel-core - simple: add escape function for html/xml/json/js/sql/url special characters [camel]

Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #26565:
URL: https://github.com/apache/camel/pull/26565#issuecomment-5720435091

   <!-- ci-tested-modules -->
   :test_tube: **CI tested the following changed modules:**
   
   - `catalog/camel-catalog`
   - `core/camel-core-languages`
   - `core/camel-core`
   - `core/camel-util`
   
   > :information_source: Dependent modules were not tested because the total number of affected modules exceeded the threshold (50). Use the `test-dependents` label to force testing all dependents.
   
   ---
   
   <details><summary>:microscope: Scalpel shadow comparison — Scalpel: 573 tested, 26 compile-only — current: 573 all tested</summary>
   
   [Maveniverse Scalpel](https://github.com/maveniverse/scalpel) detected **599 affected modules** (current approach: 573).
   
   <details><summary>:warning: Modules only in Scalpel (27)</summary>
   
   - `apache-camel`
   - `camel-allcomponents`
   - `camel-catalog`
   - `camel-catalog-console`
   - `camel-catalog-maven`
   - `camel-catalog-suggest`
   - `camel-componentdsl`
   - `camel-endpointdsl`
   - `camel-endpointdsl-support`
   - `camel-itest`
   - `camel-jbang-core`
   - `camel-jbang-it`
   - `camel-jbang-main`
   - `camel-jbang-plugin-edit`
   - `camel-jbang-plugin-generate`
   - `camel-jbang-plugin-kubernetes`
   - `camel-jbang-plugin-test`
   - `camel-kamelet-main`
   - `camel-launcher`
   - `camel-report-maven-plugin`
   - `camel-route-parser`
   - `camel-yaml-dsl`
   - `camel-yaml-dsl-deserializers`
   - `camel-yaml-dsl-maven-plugin`
   - `coverage`
   - `docs`
   - `dummy-component`
   
   </details>
   
   <details><summary>Modules only in current approach (1)</summary>
   
   - `camel-test-infra-core`
   
   </details>
   
   **Skip-tests mode would test 573 modules** (4 direct + 569 downstream), **skip tests for 26** (generated code, meta-modules)
   
   <details><summary>Modules Scalpel would test (573)</summary>
   
   - `archetypes`
   - `camel-a2a`
   - `camel-activemq`
   - `camel-activemq6`
   - `camel-ai-observability`
   - `camel-ai-observability-api`
   - `camel-ai-parent`
   - `camel-ai-resource`
   - `camel-ai-tool`
   - `camel-alibaba-common`
   - `camel-alibaba-eventbridge`
   - `camel-alibaba-fc`
   - `camel-alibaba-kms`
   - `camel-alibaba-mns`
   - `camel-alibaba-oss`
   - `camel-alibaba-ots`
   - `camel-alibaba-parent`
   - `camel-alibaba-sls`
   - `camel-alibaba-sms`
   - `camel-amqp`
   - `camel-api`
   - `camel-api-component-maven-plugin`
   - `camel-arangodb`
   - `camel-archetype-api-component`
   - `camel-archetype-component`
   - `camel-archetype-dataformat`
   - `camel-archetype-java`
   - `camel-archetype-main`
   - `camel-as2`
   - `camel-as2-api`
   - `camel-as2-parent`
   - `camel-asn1`
   - `camel-asterisk`
   - `camel-atmosphere-websocket`
   - `camel-atom`
   - `camel-attachments`
   - `camel-avro`
   - `camel-avro-rpc`
   - `camel-avro-rpc-jetty`
   - `camel-avro-rpc-parent`
   - `camel-avro-rpc-spi`
   - `camel-aws-bedrock`
   - `camel-aws-cloudtrail`
   - `camel-aws-common`
   - `camel-aws-config`
   - `camel-aws-parameter-store`
   - `camel-aws-parent`
   - `camel-aws-secrets-manager`
   - `camel-aws-security-hub`
   - `camel-aws2-athena`
   - `camel-aws2-comprehend`
   - `camel-aws2-cw`
   - `camel-aws2-ddb`
   - `camel-aws2-ec2`
   - `camel-aws2-ecs`
   - `camel-aws2-eks`
   - `camel-aws2-eventbridge`
   - `camel-aws2-iam`
   - `camel-aws2-kinesis`
   - `camel-aws2-kms`
   - `camel-aws2-lambda`
   - `camel-aws2-mq`
   - `camel-aws2-msk`
   - `camel-aws2-polly`
   - `camel-aws2-redshift`
   - `camel-aws2-rekognition`
   - `camel-aws2-s3`
   - `camel-aws2-s3-vectors`
   - `camel-aws2-ses`
   - `camel-aws2-sns`
   - `camel-aws2-sqs`
   - `camel-aws2-step-functions`
   - `camel-aws2-sts`
   - `camel-aws2-textract`
   - `camel-aws2-timestream`
   - `camel-aws2-transcribe`
   - `camel-aws2-translate`
   - `camel-azure-common`
   - `camel-azure-cosmosdb`
   - `camel-azure-eventgrid`
   - `camel-azure-eventhubs`
   - `camel-azure-files`
   - `camel-azure-functions`
   - `camel-azure-key-vault`
   - `camel-azure-parent`
   - `camel-azure-schema-registry`
   - `camel-azure-servicebus`
   - `camel-azure-storage-blob`
   - `camel-azure-storage-datalake`
   - `camel-azure-storage-queue`
   - `camel-barcode`
   - `camel-base`
   - `camel-base-engine`
   - `camel-base64`
   - `camel-bean`
   - `camel-bean-validator`
   - `camel-beanio`
   - `camel-bindy`
   - `camel-bonita`
   - `camel-box`
   - `camel-box-api`
   - `camel-box-parent`
   - `camel-braintree`
   - `camel-browse`
   - `camel-caffeine`
   - `camel-camunda`
   - `camel-cassandraql`
   - `camel-catalog`
   - `camel-catalog-common`
   - `camel-cbor`
   - `camel-chatscript`
   - `camel-chunk`
   - `camel-cli-connector`
   - `camel-cli-debug`
   - `camel-clickhouse`
   - `camel-clickup`
   - `camel-cloudevents`
   - `camel-cluster`
   - `camel-cm-sms`
   - `camel-coap`
   - `camel-cometd`
   - `camel-console`
   - `camel-consul`
   - `camel-controlbus`
   - `camel-core`
   - `camel-core-all`
   - `camel-core-catalog`
   - `camel-core-engine`
   - `camel-core-languages`
   - `camel-core-model`
   - `camel-core-processor`
   - `camel-core-reifier`
   - `camel-core-xml`
   - `camel-couchbase`
   - `camel-couchdb`
   - `camel-cron`
   - `camel-crypto`
   - `camel-crypto-pgp`
   - `camel-csv`
   - `camel-cxf-common`
   - `camel-cxf-parent`
   - `camel-cxf-rest`
   - `camel-cxf-soap`
   - `camel-cxf-spring-common`
   - `camel-cxf-spring-rest`
   - `camel-cxf-spring-soap`
   - `camel-cxf-spring-transport`
   - `camel-cxf-transport`
   - `camel-cyberark-vault`
   - `camel-dapr`
   - `camel-dataformat`
   - `camel-dataset`
   - `camel-datasonnet`
   - `camel-dataweave`
   - `camel-debezium-common`
   - `camel-debezium-common-parent`
   - `camel-debezium-db2`
   - `camel-debezium-maven-plugin`
   - `camel-debezium-mongodb`
   - `camel-debezium-mysql`
   - `camel-debezium-oracle`
   - `camel-debezium-parent`
   - `camel-debezium-postgres`
   - `camel-debezium-sqlserver`
   - `camel-debug`
   - `camel-dependencies`
   - `camel-dfdl`
   - `camel-dhis2`
   - `camel-dhis2-api`
   - `camel-dhis2-parent`
   - `camel-diagram`
   - `camel-direct`
   - `camel-disruptor`
   - `camel-djl`
   - `camel-dns`
   - `camel-docker`
   - `camel-docling`
   - `camel-drill`
   - `camel-dropbox`
   - `camel-dsl-modeline`
   - `camel-dsl-support`
   - `camel-duckdb`
   - `camel-dynamic-router`
   - `camel-ehcache`
   - `camel-eip-documentation-enricher-maven-plugin`
   - `camel-elasticsearch`
   - `camel-elasticsearch-rest-client`
   - `camel-event`
   - `camel-exec`
   - `camel-fastjson`
   - `camel-fhir`
   - `camel-fhir-api`
   - `camel-fhir-parent`
   - `camel-file`
   - `camel-file-watch`
   - `camel-flatpack`
   - `camel-flink`
   - `camel-flowable`
   - `camel-fop`
   - `camel-fory`
   - `camel-freemarker`
   - `camel-ftp`
   - `camel-ftp-common`
   - `camel-geocoder`
   - `camel-git`
   - `camel-github2`
   - `camel-google-bigquery`
   - `camel-google-calendar`
   - `camel-google-common`
   - `camel-google-drive`
   - `camel-google-firestore`
   - `camel-google-functions`
   - `camel-google-mail`
   - `camel-google-parent`
   - `camel-google-pubsub`
   - `camel-google-secret-manager`
   - `camel-google-sheets`
   - `camel-google-speech-to-text`
   - `camel-google-storage`
   - `camel-google-text-to-speech`
   - `camel-google-vertexai`
   - `camel-google-vision`
   - `camel-graphql`
   - `camel-grok`
   - `camel-groovy`
   - `camel-grpc`
   - `camel-gson`
   - `camel-hashicorp-vault`
   - `camel-hazelcast`
   - `camel-health`
   - `camel-hivemq`
   - `camel-hl7`
   - `camel-http`
   - `camel-http-base`
   - `camel-http-common`
   - `camel-huawei-parent`
   - `camel-huaweicloud-common`
   - `camel-huaweicloud-dms`
   - `camel-huaweicloud-frs`
   - `camel-huaweicloud-functiongraph`
   - `camel-huaweicloud-iam`
   - `camel-huaweicloud-imagerecognition`
   - `camel-huaweicloud-obs`
   - `camel-huaweicloud-smn`
   - `camel-huggingface`
   - `camel-ibm-cos`
   - `camel-ibm-parent`
   - `camel-ibm-secrets-manager`
   - `camel-ibm-watson-discovery`
   - `camel-ibm-watson-language`
   - `camel-ibm-watson-speech-to-text`
   - `camel-ibm-watson-text-to-speech`
   - `camel-ibm-watsonx-ai`
   - `camel-ibm-watsonx-data`
   - `camel-ical`
   - `camel-iggy`
   - `camel-ignite`
   - `camel-infinispan`
   - `camel-infinispan-common`
   - `camel-infinispan-embedded`
   - `camel-infinispan-parent`
   - `camel-influxdb`
   - `camel-influxdb2`
   - `camel-iso8583`
   - `camel-jackson`
   - `camel-jackson-avro`
   - `camel-jackson-protobuf`
   - `camel-jackson3`
   - `camel-jackson3-avro`
   - `camel-jackson3-protobuf`
   - `camel-jackson3xml`
   - `camel-jacksonxml`
   - `camel-jactl`
   - `camel-jandex`
   - `camel-jasypt`
   - `camel-java-io`
   - `camel-java-joor-dsl`
   - `camel-javascript`
   - `camel-jaxb`
   - `camel-jbang-console`
   - `camel-jbang-mcp`
   - `camel-jbang-plugin-mcp`
   - `camel-jbang-plugin-route-parser`
   - `camel-jbang-plugin-tui`
   - `camel-jbang-plugin-validate`
   - `camel-jcache`
   - `camel-jcr`
   - `camel-jdbc`
   - `camel-jetty`
   - `camel-jetty-common`
   - `camel-jfr`
   - `camel-jgroups`
   - `camel-jgroups-raft`
   - `camel-jira`
   - `camel-jms`
   - `camel-jmx`
   - `camel-jolt`
   - `camel-jooq`
   - `camel-joor`
   - `camel-jpa`
   - `camel-jq`
   - `camel-jsch`
   - `camel-jslt`
   - `camel-json-validator`
   - `camel-jsonapi`
   - `camel-jsonata`
   - `camel-jsonb`
   - `camel-jsonpath`
   - `camel-jsoup`
   - `camel-jt400`
   - `camel-jta`
   - `camel-jte`
   - `camel-kafka`
   - `camel-kamelet`
   - `camel-kamelet-main-support`
   - `camel-keycloak`
   - `camel-knative`
   - `camel-knative-api`
   - `camel-knative-http`
   - `camel-knative-parent`
   - `camel-kserve`
   - `camel-kubernetes`
   - `camel-kudu`
   - `camel-langchain4j-agent`
   - `camel-langchain4j-agent-api`
   - `camel-langchain4j-chat`
   - `camel-langchain4j-core`
   - `camel-langchain4j-embeddings`
   - `camel-langchain4j-embeddingstore`
   - `camel-langchain4j-embeddingstore-api`
   - `camel-langchain4j-ingest`
   - `camel-langchain4j-tokenizer`
   - `camel-langchain4j-web-search`
   - `camel-language`
   - `camel-launcher-container`
   - `camel-ldap`
   - `camel-ldif`
   - `camel-log`
   - `camel-lra`
   - `camel-lucene`
   - `camel-lumberjack`
   - `camel-lzf`
   - `camel-mail`
   - `camel-mail-microsoft-oauth`
   - `camel-main`
   - `camel-management`
   - `camel-management-api`
   - `camel-mapstruct`
   - `camel-master`
   - `camel-maven-plugin`
   - `camel-mcp-server`
   - `camel-mcp-server-api`
   - `camel-mdc`
   - `camel-metrics`
   - `camel-micrometer`
   - `camel-micrometer-observability`
   - `camel-micrometer-prometheus`
   - `camel-microprofile-config`
   - `camel-microprofile-fault-tolerance`
   - `camel-microprofile-health`
   - `camel-microprofile-parent`
   - `camel-milo`
   - `camel-milvus`
   - `camel-mina`
   - `camel-mina-sftp`
   - `camel-minio`
   - `camel-mllp`
   - `camel-mock`
   - `camel-mongodb`
   - `camel-mongodb-gridfs`
   - `camel-mustache`
   - `camel-mvel`
   - `camel-mybatis`
   - `camel-nats`
   - `camel-neo4j`
   - `camel-netty`
   - `camel-netty-http`
   - `camel-oaipmh`
   - `camel-oauth`
   - `camel-observability-services`
   - `camel-observation`
   - `camel-ocsf`
   - `camel-ognl`
   - `camel-olingo2`
   - `camel-olingo2-api`
   - `camel-olingo2-parent`
   - `camel-olingo4`
   - `camel-olingo4-api`
   - `camel-olingo4-parent`
   - `camel-once`
   - `camel-opa`
   - `camel-openai`
   - `camel-openapi-java`
   - `camel-openapi-rest-dsl-generator`
   - `camel-openapi-validator`
   - `camel-opensearch`
   - `camel-openstack`
   - `camel-opentelemetry`
   - `camel-opentelemetry-metrics`
   - `camel-opentelemetry2`
   - `camel-optaplanner`
   - `camel-paho`
   - `camel-paho-mqtt5`
   - `camel-parquet-avro`
   - `camel-pdf`
   - `camel-pg-replication-slot`
   - `camel-pgevent`
   - `camel-pgvector`
   - `camel-pinecone`
   - `camel-platform-http`
   - `camel-platform-http-jolokia`
   - `camel-platform-http-main`
   - `camel-platform-http-vertx`
   - `camel-plc4x`
   - `camel-pqc`
   - `camel-printer`
   - `camel-protobuf`
   - `camel-pubnub`
   - `camel-pulsar`
   - `camel-python`
   - `camel-python3`
   - `camel-qdrant`
   - `camel-quartz`
   - `camel-quickfix`
   - `camel-quickjs`
   - `camel-reactive-streams`
   - `camel-reactor`
   - `camel-redis`
   - `camel-ref`
   - `camel-resilience4j`
   - `camel-resilience4j-micrometer`
   - `camel-resourceresolver-github`
   - `camel-rest`
   - `camel-rest-openapi`
   - `camel-rest-postman`
   - `camel-restdsl-openapi-plugin`
   - `camel-robotframework`
   - `camel-rocketmq`
   - `camel-rss`
   - `camel-rxjava`
   - `camel-saga`
   - `camel-salesforce`
   - `camel-salesforce-codegen`
   - `camel-salesforce-maven-plugin`
   - `camel-salesforce-parent`
   - `camel-sap-netweaver`
   - `camel-saxon`
   - `camel-scheduler`
   - `camel-schematron`
   - `camel-seda`
   - `camel-servicenow`
   - `camel-servicenow-maven-plugin`
   - `camel-servicenow-parent`
   - `camel-servlet`
   - `camel-shell`
   - `camel-shiro`
   - `camel-sjms`
   - `camel-sjms2`
   - `camel-slack`
   - `camel-smb`
   - `camel-smooks`
   - `camel-smpp`
   - `camel-snakeyaml`
   - `camel-snmp`
   - `camel-soap`
   - `camel-solr`
   - `camel-spiffe`
   - `camel-splunk-hec`
   - `camel-spring`
   - `camel-spring-ai-chat`
   - `camel-spring-ai-embeddings`
   - `camel-spring-ai-image`
   - `camel-spring-ai-parent`
   - `camel-spring-ai-vector-store`
   - `camel-spring-batch`
   - `camel-spring-cloud-config`
   - `camel-spring-jdbc`
   - `camel-spring-ldap`
   - `camel-spring-main`
   - `camel-spring-parent`
   - `camel-spring-rabbitmq`
   - `camel-spring-redis`
   - `camel-spring-security`
   - `camel-spring-ws`
   - `camel-spring-xml`
   - `camel-sql`
   - `camel-ssh`
   - `camel-state-store`
   - `camel-state-store-parent`
   - `camel-stax`
   - `camel-stitch`
   - `camel-stream`
   - `camel-streamcaching-test`
   - `camel-stringtemplate`
   - `camel-stripe`
   - `camel-stub`
   - `camel-support`
   - `camel-swift`
   - `camel-syslog`
   - `camel-tahu`
   - `camel-tarfile`
   - `camel-telegram`
   - `camel-telemetry`
   - `camel-telemetry-dev`
   - `camel-tensorflow-serving`
   - `camel-test-infra-all`
   - `camel-test-infra-artemis`
   - `camel-test-infra-cli`
   - `camel-test-infra-jetty`
   - `camel-test-infra-qdrant`
   - `camel-test-infra-smb`
   - `camel-test-junit5`
   - `camel-test-junit6`
   - `camel-test-main-junit5`
   - `camel-test-main-junit6`
   - `camel-test-parent`
   - `camel-test-spring-junit5`
   - `camel-test-spring-junit6`
   - `camel-thrift`
   - `camel-thymeleaf`
   - `camel-tika`
   - `camel-timer`
   - `camel-tooling-maven`
   - `camel-toon`
   - `camel-tracing`
   - `camel-twilio`
   - `camel-twitter`
   - `camel-ubl`
   - `camel-undertow`
   - `camel-undertow-spring-security`
   - `camel-univocity-parsers`
   - `camel-util`
   - `camel-validator`
   - `camel-velocity`
   - `camel-vertx`
   - `camel-vertx-common`
   - `camel-vertx-http`
   - `camel-vertx-parent`
   - `camel-vertx-websocket`
   - `camel-wal`
   - `camel-wasm`
   - `camel-weather`
   - `camel-weaviate`
   - `camel-web3j`
   - `camel-webhook`
   - `camel-whatsapp`
   - `camel-wordpress`
   - `camel-workday`
   - `camel-xchange`
   - `camel-xj`
   - `camel-xml-io`
   - `camel-xml-io-dsl`
   - `camel-xml-jaxb`
   - `camel-xml-jaxb-dsl`
   - `camel-xml-jaxb-dsl-test-definition`
   - `camel-xml-jaxb-dsl-test-spring`
   - `camel-xml-jaxp`
   - `camel-xmlsecurity`
   - `camel-xmpp`
   - `camel-xpath`
   - `camel-xslt`
   - `camel-xslt-saxon`
   - `camel-yaml-dsl-common`
   - `camel-yaml-dsl-validator`
   - `camel-yaml-dsl-validator-maven-plugin`
   - `camel-yaml-io`
   - `camel-zendesk`
   - `camel-zip-deflater`
   - `camel-zipfile`
   - `camel-zookeeper`
   - `camel-zookeeper-master`
   - `components`
   - `sync-properties-maven-plugin`
   
   </details>
   
   <details><summary>Modules with tests skipped (26)</summary>
   
   - `apache-camel`
   - `camel-allcomponents`
   - `camel-catalog-console`
   - `camel-catalog-maven`
   - `camel-catalog-suggest`
   - `camel-componentdsl`
   - `camel-endpointdsl`
   - `camel-endpointdsl-support`
   - `camel-itest`
   - `camel-jbang-core`
   - `camel-jbang-it`
   - `camel-jbang-main`
   - `camel-jbang-plugin-edit`
   - `camel-jbang-plugin-generate`
   - `camel-jbang-plugin-kubernetes`
   - `camel-jbang-plugin-test`
   - `camel-kamelet-main`
   - `camel-launcher`
   - `camel-report-maven-plugin`
   - `camel-route-parser`
   - `camel-yaml-dsl`
   - `camel-yaml-dsl-deserializers`
   - `camel-yaml-dsl-maven-plugin`
   - `coverage`
   - `docs`
   - `dummy-component`
   
   </details>
   
   > :information_source: Shadow mode — Scalpel observes but does not affect test execution. [Learn more](https://github.com/maveniverse/scalpel)
   
   </details>
   
   :warning: **Some tests are disabled on GitHub Actions** (`@DisabledIfSystemProperty(named = "ci.env.name")`) and require manual verification:
   
   - `core/camel-core`: 2 test(s) disabled on GitHub Actions
   
   <details><summary>Build reactor — dependencies compiled but only changed modules were tested (4 modules, 35.5s total)</summary>
   
   **Total reactor time:** 35.5s
   
   | Module | Duration | Status |
   | --- | --- | --- |
   | Camel :: Catalog :: Camel Catalog | 17.9s | SUCCESS |
   | Camel :: Util | 13.3s | SUCCESS |
   | Camel :: Core Languages | 4.3s | SUCCESS |
   | Camel :: Core | n/a |  |
   
   **Top 20 slowest modules:**
   - `Camel :: Catalog :: Camel Catalog` (17.9s)
   - `Camel :: Util` (13.3s)
   - `Camel :: Core Languages` (4.3s)
   
   </details>
   
   ---
   :gear: [View full build and test results](https://github.com/apache/camel/actions/runs/35265748746)


-- 
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: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] CAMEL-24802: camel-core - simple: add escape function for html/xml/json/js/sql/url special characters [camel]

Posted by "gnodet-bot (via GitHub)" <gi...@apache.org>.
gnodet-bot commented on code in PR #26565:
URL: https://github.com/apache/camel/pull/26565#discussion_r4040690366


##########
core/camel-util/src/test/java/org/apache/camel/util/EscapeHelperTest.java:
##########
@@ -0,0 +1,108 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.util;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
+public class EscapeHelperTest {
+
+    @Test
+    public void testHtml() {
+        assertEquals("Monday &amp; Tuesday", EscapeHelper.html("Monday & Tuesday"));
+        assertEquals("&lt;b&gt;bold&lt;/b&gt;", EscapeHelper.html("<b>bold</b>"));
+        assertEquals("say &quot;hi&quot; &amp; &#39;bye&#39;", EscapeHelper.html("say \"hi\" & 'bye'"));
+        assertEquals("caf\u00e9", EscapeHelper.html("caf\u00e9"));
+    }
+
+    @Test
+    public void testXml() {
+        assertEquals("Monday &amp; Tuesday", EscapeHelper.xml("Monday & Tuesday"));
+        assertEquals("&lt;a href=&quot;x&quot;&gt;it&apos;s&lt;/a&gt;", EscapeHelper.xml("<a href=\"x\">it's</a>"));
+    }
+
+    @Test
+    public void testJson() {
+        assertEquals("say \\\"hi\\\"", EscapeHelper.json("say \"hi\""));
+        assertEquals("c:\\\\temp", EscapeHelper.json("c:\\temp"));
+        assertEquals("line1\\nline2\\ttab\\r\\b\\f", EscapeHelper.json("line1\nline2\ttab\r\b\f"));
+        assertEquals("a\\u0001b", EscapeHelper.json("a\u0001b"));
+        assertEquals("it's <b>", EscapeHelper.json("it's <b>"));
+    }
+
+    @Test
+    public void testJs() {
+        assertEquals("it\\'s \\\"quoted\\\"", EscapeHelper.js("it's \"quoted\""));
+        assertEquals("<\\/script>", EscapeHelper.js("</script>"));
+        assertEquals("a\\nb", EscapeHelper.js("a\nb"));
+        assertEquals("a/b", EscapeHelper.js("a/b"));
+    }
+
+    @Test
+    public void testSql() {
+        assertEquals("O''Reilly", EscapeHelper.sql("O'Reilly"));
+        assertEquals("'''' ", EscapeHelper.sql("'' "));
+        assertEquals("plain", EscapeHelper.sql("plain"));
+    }
+
+    @Test
+    public void testUrl() {
+        assertEquals("Camel%20in%20Action", EscapeHelper.url("Camel in Action"));
+        assertEquals("a%26b%3Dc%2Fd%3Fe", EscapeHelper.url("a&b=c/d?e"));
+        assertEquals("caf%C3%A9", EscapeHelper.url("caf\u00e9"));
+        assertEquals("plain-text_1.2*", EscapeHelper.url("plain-text_1.2*"));
+    }
+
+    @Test
+    public void testNoChangeReturnsSameInstance() {
+        String value = "nothing to escape";
+        assertSame(value, EscapeHelper.html(value));
+        assertSame(value, EscapeHelper.xml(value));

Review Comment:
   ⚠️ **Missing test: `url()` with `+` in input.** The `url()` implementation relies on `URLEncoder.encode().replace("+", "%20")` — the correctness of this approach depends on `URLEncoder` encoding a literal `+` from the input as `%2B` (not `+`). Without a test that pins this, a future reader has no documented proof that `url("a+b")` returns `"a%2Bb"` and not `"a%20b"`.
   
   ```suggestion
           assertEquals("Camel%20in%20Action", EscapeHelper.url("Camel in Action"));
           assertEquals("a%26b%3Dc%2Fd%3Fe", EscapeHelper.url("a&b=c/d?e"));
           assertEquals("caf%C3%A9", EscapeHelper.url("caf\u00e9"));
           assertEquals("plain-text_1.2*", EscapeHelper.url("plain-text_1.2*"));
           assertEquals("a%2Bb", EscapeHelper.url("a+b")); // + in input → %2B, not %20
   ```



##########
core/camel-util/src/main/java/org/apache/camel/util/EscapeHelper.java:
##########
@@ -0,0 +1,237 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.util;
+
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Locale;
+
+/**
+ * Helper for escaping special characters so a value can be embedded safely in HTML, XML, JSON, JavaScript, SQL or a
+ * URL.
+ */
+public final class EscapeHelper {
+
+    /**
+     * The supported escape kinds.
+     */
+    public enum Kind {
+        HTML,
+        XML,
+        JSON,
+        JS,
+        SQL,
+        URL;
+
+        /**
+         * Resolves the escape kind from its name (case-insensitive).
+         *
+         * @param  name the name such as html, xml, json, js, sql, or url
+         * @return      the kind, or <tt>null</tt> if the name is not a supported kind
+         */
+        public static Kind fromName(String name) {
+            if (name == null) {
+                return null;
+            }
+            String key = name.trim().toUpperCase(Locale.ROOT);
+            if ("JAVASCRIPT".equals(key)) {
+                return JS;
+            }
+            for (Kind kind : values()) {
+                if (kind.name().equals(key)) {
+                    return kind;
+                }
+            }
+            return null;
+        }
+
+        /**
+         * Escapes the value according to this kind.
+         */
+        public String escape(String value) {

Review Comment:
   💡 **Missing `@param`/`@return` Javadoc on `Kind.escape(String)`.** All other public methods in this file have full Javadoc; this one only has a description line.
   
   ```suggestion
           /**
            * Escapes the value according to this kind.
            *
            * @param  value the value to escape
            * @return       the escaped value, or {@code null} if {@code value} is {@code null}
            */
           public String escape(String value) {
   ```



-- 
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: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] CAMEL-24802: camel-core - simple: add escape function for html/xml/json/js/sql/url special characters [camel]

Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #26565:
URL: https://github.com/apache/camel/pull/26565#issuecomment-5719890953

   :star2: Thank you for your contribution to the Apache Camel project! :star2:
     :robot: CI automation will test this PR automatically.
   
     :camel: Apache Camel Committers, please review the following items:
   
     * First-time contributors **require MANUAL approval** for the GitHub Actions to run
     * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot although they are normally detected and executed by CI.
     * You can label PRs using `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR.
     * Build and test logs are available in the summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary.
     
     :warning: Be careful when sharing logs. Review their contents before sharing them publicly.


-- 
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: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] CAMEL-24802: camel-core - simple: add escape function for html/xml/json/js/sql/url special characters [camel]

Posted by "davsclaus (via GitHub)" <gi...@apache.org>.
davsclaus merged PR #26565:
URL: https://github.com/apache/camel/pull/26565


-- 
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: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] CAMEL-24802: camel-core - simple: add escape function for html/xml/json/js/sql/url special characters [camel]

Posted by "davsclaus (via GitHub)" <gi...@apache.org>.
davsclaus commented on code in PR #26565:
URL: https://github.com/apache/camel/pull/26565#discussion_r4040737310


##########
core/camel-util/src/test/java/org/apache/camel/util/EscapeHelperTest.java:
##########
@@ -0,0 +1,108 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.util;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
+public class EscapeHelperTest {
+
+    @Test
+    public void testHtml() {
+        assertEquals("Monday &amp; Tuesday", EscapeHelper.html("Monday & Tuesday"));
+        assertEquals("&lt;b&gt;bold&lt;/b&gt;", EscapeHelper.html("<b>bold</b>"));
+        assertEquals("say &quot;hi&quot; &amp; &#39;bye&#39;", EscapeHelper.html("say \"hi\" & 'bye'"));
+        assertEquals("caf\u00e9", EscapeHelper.html("caf\u00e9"));
+    }
+
+    @Test
+    public void testXml() {
+        assertEquals("Monday &amp; Tuesday", EscapeHelper.xml("Monday & Tuesday"));
+        assertEquals("&lt;a href=&quot;x&quot;&gt;it&apos;s&lt;/a&gt;", EscapeHelper.xml("<a href=\"x\">it's</a>"));
+    }
+
+    @Test
+    public void testJson() {
+        assertEquals("say \\\"hi\\\"", EscapeHelper.json("say \"hi\""));
+        assertEquals("c:\\\\temp", EscapeHelper.json("c:\\temp"));
+        assertEquals("line1\\nline2\\ttab\\r\\b\\f", EscapeHelper.json("line1\nline2\ttab\r\b\f"));
+        assertEquals("a\\u0001b", EscapeHelper.json("a\u0001b"));
+        assertEquals("it's <b>", EscapeHelper.json("it's <b>"));
+    }
+
+    @Test
+    public void testJs() {
+        assertEquals("it\\'s \\\"quoted\\\"", EscapeHelper.js("it's \"quoted\""));
+        assertEquals("<\\/script>", EscapeHelper.js("</script>"));
+        assertEquals("a\\nb", EscapeHelper.js("a\nb"));
+        assertEquals("a/b", EscapeHelper.js("a/b"));
+    }
+
+    @Test
+    public void testSql() {
+        assertEquals("O''Reilly", EscapeHelper.sql("O'Reilly"));
+        assertEquals("'''' ", EscapeHelper.sql("'' "));
+        assertEquals("plain", EscapeHelper.sql("plain"));
+    }
+
+    @Test
+    public void testUrl() {
+        assertEquals("Camel%20in%20Action", EscapeHelper.url("Camel in Action"));
+        assertEquals("a%26b%3Dc%2Fd%3Fe", EscapeHelper.url("a&b=c/d?e"));
+        assertEquals("caf%C3%A9", EscapeHelper.url("caf\u00e9"));
+        assertEquals("plain-text_1.2*", EscapeHelper.url("plain-text_1.2*"));
+    }
+
+    @Test
+    public void testNoChangeReturnsSameInstance() {
+        String value = "nothing to escape";
+        assertSame(value, EscapeHelper.html(value));
+        assertSame(value, EscapeHelper.xml(value));

Review Comment:
   Added in e36296973a41 — `url("a+b")` now asserts `"a%2Bb"`, pinning that `URLEncoder` encodes a literal `+` as `%2B` before the `+` → `%20` replacement.
   
   _Claude Code on behalf of davsclaus_



##########
core/camel-util/src/main/java/org/apache/camel/util/EscapeHelper.java:
##########
@@ -0,0 +1,237 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.util;
+
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Locale;
+
+/**
+ * Helper for escaping special characters so a value can be embedded safely in HTML, XML, JSON, JavaScript, SQL or a
+ * URL.
+ */
+public final class EscapeHelper {
+
+    /**
+     * The supported escape kinds.
+     */
+    public enum Kind {
+        HTML,
+        XML,
+        JSON,
+        JS,
+        SQL,
+        URL;
+
+        /**
+         * Resolves the escape kind from its name (case-insensitive).
+         *
+         * @param  name the name such as html, xml, json, js, sql, or url
+         * @return      the kind, or <tt>null</tt> if the name is not a supported kind
+         */
+        public static Kind fromName(String name) {
+            if (name == null) {
+                return null;
+            }
+            String key = name.trim().toUpperCase(Locale.ROOT);
+            if ("JAVASCRIPT".equals(key)) {
+                return JS;
+            }
+            for (Kind kind : values()) {
+                if (kind.name().equals(key)) {
+                    return kind;
+                }
+            }
+            return null;
+        }
+
+        /**
+         * Escapes the value according to this kind.
+         */
+        public String escape(String value) {

Review Comment:
   Added the `@param`/`@return` Javadoc in e36296973a41, using the same `<tt>null</tt>` phrasing as the static `escape(Kind, String)` below it so the file stays consistent.
   
   _Claude Code on behalf of davsclaus_



-- 
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: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org