Skip to content

Commit 951ae00

Browse files
committed
CAMEL-22121: rest-dsl: Add client response validator
1 parent 6398504 commit 951ae00

2 files changed

Lines changed: 11 additions & 3 deletions

File tree

components-starter/camel-core-starter/src/main/java/org/apache/camel/model/rest/springboot/RestConfigurationDefinitionAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public RestConfiguration configureRestConfigurationDefinition()
6666
properties.remove("endpointProperty");
6767
properties.remove("corsHeaders");
6868
properties.remove("validationLevels");
69-
69+
7070
RestConfiguration definition = new RestConfiguration();
7171
CamelPropertiesHelper.setCamelProperties(camelContext, definition, properties, true);
7272

tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,8 @@ private void createRestModuleAutoConfigurationSource(String packageName, EipMode
460460
+ "properties.remove(\"enableCors\");\n" + "properties.remove(\"apiProperty\");\n"
461461
+ "properties.remove(\"componentProperty\");\n" + "properties.remove(\"consumerProperty\");\n"
462462
+ "properties.remove(\"dataFormatProperty\");\n" + "properties.remove(\"endpointProperty\");\n"
463-
+ "properties.remove(\"corsHeaders\");\n" + "\n"
463+
+ "properties.remove(\"corsHeaders\");\n" + "properties.remove(\"validationLevels\");\n"
464+
+ "\n"
464465
+ "RestConfiguration definition = new RestConfiguration();\n"
465466
+ "CamelPropertiesHelper.setCamelProperties(camelContext, definition, properties, true);\n" + "\n"
466467
+ "// Workaround for spring-boot properties name as It would appear\n"
@@ -480,7 +481,14 @@ private void createRestModuleAutoConfigurationSource(String packageName, EipMode
480481
+ " Map<String, Object> map = CollectionHelper.flattenKeysInMap(config.getCorsHeaders(), \".\");\n"
481482
+ " Map<String, String> target = new HashMap<>();\n"
482483
+ " map.forEach((k, v) -> target.put(k, v.toString()));\n"
483-
+ " definition.setCorsHeaders(target);\n" + "}\n" + "return definition;");
484+
+ " definition.setCorsHeaders(target);\n"
485+
+ "}\n" + "if (config.getValidationLevels() != null) {\n"
486+
+ " Map<String, Object> map = CollectionHelper.flattenKeysInMap(config.getValidationLevels(), \".\");\n"
487+
+ " Map<String, String> target = new HashMap<>();\n"
488+
+ " map.forEach((k, v) -> target.put(k, v.toString()));\n"
489+
+ " definition.setValidationLevels(target);\n"
490+
+ "}\n"
491+
+ "return definition;");
484492

485493
String fileName = packageName.replaceAll("\\.", "\\/") + "/" + name + ".java";
486494
writeSourceIfChanged(javaClass, fileName, true);

0 commit comments

Comments
 (0)