This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push: new 088d546fca3 Use UTF_VALIDATOR rather than STRICT_VALIDATOR - UTF_VALIDATOR seems like the default and the replacement for setValidate(true) and STRICT_VALIDATOR may have additional requirements (#1273) 088d546fca3 is described below commit 088d546fca3d9f59ae093942f84e2a88ff912822 Author: Tom Cunningham <tcunn...@redhat.com> AuthorDate: Thu Oct 31 14:57:38 2024 -0400 Use UTF_VALIDATOR rather than STRICT_VALIDATOR - UTF_VALIDATOR seems like the default and the replacement for setValidate(true) and STRICT_VALIDATOR may have additional requirements (#1273) --- .../org/apache/camel/springboot/catalog/components/smooks.json | 3 +++ .../jackson/avro/springboot/test/JacksonAvroLookupResolverTest.java | 2 +- .../avro/springboot/test/JacksonAvroMarshalUnmarshalJsonNodeTest.java | 4 ++-- .../avro/springboot/test/JacksonAvroMarshalUnmarshalPojoListTest.java | 2 +- .../avro/springboot/test/JacksonAvroMarshalUnmarshalPojoTest.java | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/smooks.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/smooks.json index ede3e9db2d1..efec87ee9e1 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/smooks.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/smooks.json @@ -28,6 +28,9 @@ "autowiredEnabled": { "index": 1, "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching t [...] "smooksFactory": { "index": 2, "kind": "property", "displayName": "Smooks Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.smooks.SmooksFactory", "deprecated": false, "autowired": true, "secret": false, "description": "To use a custom factory for creating Smooks." } }, + "headers": { + "CamelSmooksExecutionContext": { "index": 0, "kind": "header", "displayName": "", "group": "advanced", "label": "advanced", "required": false, "javaType": "org.smooks.api.ExecutionContext", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The Smooks execution context.", "constantName": "org.apache.camel.component.smooks.SmooksConstants#SMOOKS_EXECUTION_CONTEXT" } + }, "properties": { "smooksConfig": { "index": 0, "kind": "path", "displayName": "Smooks Config", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "supportFileReference": true, "description": "Path to the Smooks configuration file" }, "reportPath": { "index": 1, "kind": "parameter", "displayName": "Report Path", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "File path to place the generated HTML execution report. The report is a useful tool in the developers arsenal for diagnosing issues or comprehending a transformation. Do not set in production since this is a major performance drain" }, diff --git a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroLookupResolverTest.java b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroLookupResolverTest.java index 428e603d389..bba78d44095 100644 --- a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroLookupResolverTest.java +++ b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroLookupResolverTest.java @@ -58,7 +58,7 @@ public class JacksonAvroLookupResolverTest { private SchemaResolver getSchemaResolver() { String schemaJson = "{\n" + "\"type\": \"record\",\n" + "\"name\": \"Pojo\",\n" + "\"fields\": [\n" + " {\"name\": \"text\", \"type\": \"string\"}\n" + "]}"; - Schema raw = new Schema.Parser(NameValidator.STRICT_VALIDATOR).parse(schemaJson); + Schema raw = new Schema.Parser(NameValidator.UTF_VALIDATOR).parse(schemaJson); AvroSchema schema = new AvroSchema(raw); SchemaResolver resolver = ex -> schema; diff --git a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalJsonNodeTest.java b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalJsonNodeTest.java index 9fc92b401f1..d8338423e83 100644 --- a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalJsonNodeTest.java +++ b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalJsonNodeTest.java @@ -71,10 +71,10 @@ public class JacksonAvroMarshalUnmarshalJsonNodeTest { + " \"type\":\"record\",\n" + " \"fields\":[\n" + " {\"name\":\"text\", \"type\":\"string\"}\n" + " ]\n" + " }\n" + "}"; - Schema raw = new Schema.Parser(NameValidator.STRICT_VALIDATOR).parse(schemaJson); + Schema raw = new Schema.Parser(NameValidator.UTF_VALIDATOR).parse(schemaJson); AvroSchema schema = new AvroSchema(raw); - Schema rawList = new Schema.Parser(NameValidator.STRICT_VALIDATOR).parse(listSchemaJson); + Schema rawList = new Schema.Parser(NameValidator.UTF_VALIDATOR).parse(listSchemaJson); AvroSchema schemaList = new AvroSchema(rawList); SchemaResolver resolver = ex -> { diff --git a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoListTest.java b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoListTest.java index b9e1c2dcd03..1d68d7be1bb 100644 --- a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoListTest.java +++ b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoListTest.java @@ -63,7 +63,7 @@ public class JacksonAvroMarshalUnmarshalPojoListTest { String schemaJson = "{\n" + " \"type\": \"array\", \n" + " \"items\":{\n" + " \"name\":\"Pojo\",\n" + " \"type\":\"record\",\n" + " \"fields\":[\n" + " {\"name\":\"text\", \"type\":\"string\"}\n" + " ]\n" + " }\n" + "}"; - Schema raw = new Schema.Parser(NameValidator.STRICT_VALIDATOR).parse(schemaJson); + Schema raw = new Schema.Parser(NameValidator.UTF_VALIDATOR).parse(schemaJson); AvroSchema schema = new AvroSchema(raw); SchemaResolver resolver = ex -> schema; diff --git a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoTest.java b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoTest.java index d1570817158..6157fc0bd6f 100644 --- a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoTest.java +++ b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoTest.java @@ -58,7 +58,7 @@ public class JacksonAvroMarshalUnmarshalPojoTest { private SchemaResolver getSchemaResolver() { String schemaJson = "{\n" + "\"type\": \"record\",\n" + "\"name\": \"Pojo\",\n" + "\"fields\": [\n" + " {\"name\": \"text\", \"type\": \"string\"}\n" + "]}"; - Schema raw = new Schema.Parser(NameValidator.STRICT_VALIDATOR).parse(schemaJson); + Schema raw = new Schema.Parser(NameValidator.UTF_VALIDATOR).parse(schemaJson); AvroSchema schema = new AvroSchema(raw); SchemaResolver resolver = ex -> schema;