This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 567914b97b17bf5b3f021622615ae6fe794383e3
Author: Luca Burgazzoli <lburgazz...@gmail.com>
AuthorDate: Thu Feb 25 18:24:23 2021 +0100
CAMEL-12545: create a yaml based route loader (add support for auto
generated ToDefinition)
---
.../dsl/yaml/deserializers/CustomResolver.java | 3 --
.../deserializers/ToDefinitionDeserializer.java | 45 ----------------------
.../src/generated/resources/camel-yaml-dsl.json | 9 +++++
3 files changed, 9 insertions(+), 48 deletions(-)
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/CustomResolver.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/CustomResolver.java
index 390bbe5..845785c 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/CustomResolver.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/CustomResolver.java
@@ -58,9 +58,6 @@ public class CustomResolver implements
YamlDeserializerResolver {
return new TryDefinitionDeserializer();
case "org.apache.camel.model.ProcessorDefinition":
return new ProcessorDefinitionDeserializer();
- case "to":
- case "org.apache.camel.model.ToDefinition":
- return new ToDefinitionDeserializer();
default:
return null;
}
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/ToDefinitionDeserializer.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/ToDefinitionDeserializer.java
deleted file mode 100644
index db93ce8..0000000
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/ToDefinitionDeserializer.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.dsl.yaml.deserializers;
-
-import org.apache.camel.dsl.yaml.common.YamlDeserializerResolver;
-import org.apache.camel.dsl.yaml.common.YamlSupport;
-import org.apache.camel.model.ToDefinition;
-import org.apache.camel.spi.annotations.YamlProperty;
-import org.apache.camel.spi.annotations.YamlType;
-import org.snakeyaml.engine.v2.api.ConstructNode;
-import org.snakeyaml.engine.v2.nodes.Node;
-
-@YamlType(
- inline = true,
- types = ToDefinition.class,
- order = YamlDeserializerResolver.ORDER_DEFAULT,
- properties = {
- @YamlProperty(name = "uri", type = "string", required =
true),
- @YamlProperty(name = "properties", type = "object")
- })
-public class ToDefinitionDeserializer implements ConstructNode {
- @Override
- public Object construct(Node node) {
- String uri = YamlSupport.creteEndpointUri(node,
EndpointProducerDeserializersResolver::resolveEndpointUri);
- if (uri == null) {
- throw new IllegalStateException("The endpoint URI must be set");
- }
-
- return new ToDefinition(uri);
- }
-}
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
index 22919e2..9855ccf 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
@@ -164,6 +164,9 @@
"throw-exception" : {
"$ref" :
"#/items/definitions/org.apache.camel.model.ThrowExceptionDefinition"
},
+ "to" : {
+ "$ref" : "#/items/definitions/org.apache.camel.model.ToDefinition"
+ },
"to-d" : {
"$ref" :
"#/items/definitions/org.apache.camel.model.ToDynamicDefinition"
},
@@ -2412,6 +2415,12 @@
}, {
"type" : "object",
"properties" : {
+ "inherit-error-handler" : {
+ "type" : "boolean"
+ },
+ "pattern" : {
+ "type" : "string"
+ },
"properties" : {
"type" : "object"
},
