This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d207c72fc94d005fca0f2eca6fe0a88b2d01de1f
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Mon Dec 21 15:43:42 2020 +0100
Full regen
---
.../resources/org/apache/camel/catalog/models/serviceCall.json | 2 +-
.../org/apache/camel/catalog/models/serviceCallConfiguration.json | 2 +-
.../java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java | 2 +-
.../generated/resources/org/apache/camel/model/cloud/serviceCall.json | 2 +-
.../org/apache/camel/model/cloud/serviceCallConfiguration.json | 2 +-
.../src/generated/java/org/apache/camel/xml/in/ModelParser.java | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/serviceCall.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/serviceCall.json
index a73231a..5dffa42 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/serviceCall.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/serviceCall.json
@@ -11,6 +11,7 @@
"output": false
},
"properties": {
+ "expression": { "kind": "element", "displayName": "Expression",
"required": false, "type": "object", "javaType":
"org.apache.camel.model.cloud.ServiceCallExpressionConfiguration",
"deprecated": false, "autowired": false, "secret": false, "description":
"Configures the Expression using the given configuration." },
"name": { "kind": "attribute", "displayName": "Name", "required": true,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the name of the
service to use" },
"uri": { "kind": "attribute", "displayName": "Uri", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The uri of the endpoint to
send to. The uri can be dynamic computed using the
org.apache.camel.language.simple.SimpleLanguage expression." },
"component": { "kind": "attribute", "displayName": "Component",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"http", "description": "The component to use." },
@@ -24,7 +25,6 @@
"serviceDiscoveryConfiguration": { "kind": "element", "displayName":
"Service Discovery Configuration", "required": true, "type": "object",
"javaType":
"org.apache.camel.model.cloud.ServiceCallServiceDiscoveryConfiguration",
"oneOf": [ "cachingServiceDiscovery", "combinedServiceDiscovery",
"consulServiceDiscovery", "dnsServiceDiscovery", "etcdServiceDiscovery",
"kubernetesServiceDiscovery", "staticServiceDiscovery",
"zookeeperServiceDiscovery" ], "deprecated": false, "autowired": fal [...]
"serviceFilterConfiguration": { "kind": "element", "displayName": "Service
Filter Configuration", "required": true, "type": "object", "javaType":
"org.apache.camel.model.cloud.ServiceCallServiceFilterConfiguration", "oneOf":
[ "blacklistServiceFilter", "combinedServiceFilter", "customServiceFilter",
"healthyServiceFilter", "passThroughServiceFilter" ], "deprecated": false,
"autowired": false, "secret": false, "description": "Configures the
ServiceFilter using the given configuration." },
"loadBalancerConfiguration": { "kind": "element", "displayName": "Load
Balancer Configuration", "required": true, "type": "object", "javaType":
"org.apache.camel.model.cloud.ServiceCallServiceLoadBalancerConfiguration",
"oneOf": [ "defaultLoadBalancer", "ribbonLoadBalancer" ], "deprecated": false,
"autowired": false, "secret": false, "description": "Configures the
LoadBalancer using the given configuration." },
- "expressionConfiguration": { "kind": "element", "displayName": "Expression
Configuration", "required": true, "type": "object", "javaType":
"org.apache.camel.model.cloud.ServiceCallExpressionConfiguration", "oneOf": [
"expressionConfiguration" ], "deprecated": false, "autowired": false, "secret":
false, "description": "Configures the Expression using the given
configuration." },
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the id of this node"
},
"description": { "kind": "element", "displayName": "Description",
"required": false, "type": "object", "javaType":
"org.apache.camel.model.DescriptionDefinition", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the description of
this node" }
}
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/serviceCallConfiguration.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/serviceCallConfiguration.json
index 66dbfed..9cb7cbb 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/serviceCallConfiguration.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/serviceCallConfiguration.json
@@ -11,6 +11,7 @@
"output": false
},
"properties": {
+ "expression": { "kind": "element", "displayName": "Expression",
"required": false, "type": "object", "javaType":
"org.apache.camel.model.cloud.ServiceCallExpressionConfiguration",
"deprecated": false, "autowired": false, "secret": false, "description":
"Configures the Expression using the given configuration." },
"uri": { "kind": "attribute", "displayName": "Uri", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The uri of the endpoint to
send to. The uri can be dynamic computed using the
org.apache.camel.language.simple.SimpleLanguage expression." },
"component": { "kind": "attribute", "displayName": "Component",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"http", "description": "The component to use." },
"pattern": { "kind": "attribute", "displayName": "Pattern", "required":
false, "type": "enum", "javaType": "org.apache.camel.ExchangePattern", "enum":
[ "InOnly", "InOptionalOut", "InOut" ], "deprecated": false, "autowired":
false, "secret": false, "description": "Sets the optional ExchangePattern used
to invoke this endpoint" },
@@ -22,7 +23,6 @@
"serviceDiscoveryConfiguration": { "kind": "element", "displayName":
"Service Discovery Configuration", "required": true, "type": "object",
"javaType":
"org.apache.camel.model.cloud.ServiceCallServiceDiscoveryConfiguration",
"oneOf": [ "cachingServiceDiscovery", "combinedServiceDiscovery",
"consulServiceDiscovery", "dnsServiceDiscovery", "etcdServiceDiscovery",
"kubernetesServiceDiscovery", "staticServiceDiscovery",
"zookeeperServiceDiscovery" ], "deprecated": false, "autowired": fal [...]
"serviceFilterConfiguration": { "kind": "element", "displayName": "Service
Filter Configuration", "required": true, "type": "object", "javaType":
"org.apache.camel.model.cloud.ServiceCallServiceFilterConfiguration", "oneOf":
[ "blacklistServiceFilter", "combinedServiceFilter", "customServiceFilter",
"healthyServiceFilter", "passThroughServiceFilter" ], "deprecated": false,
"autowired": false, "secret": false, "description": "Configures the
ServiceFilter using the given configuration." },
"loadBalancerConfiguration": { "kind": "element", "displayName": "Load
Balancer Configuration", "required": true, "type": "object", "javaType":
"org.apache.camel.model.cloud.ServiceCallServiceLoadBalancerConfiguration",
"oneOf": [ "defaultLoadBalancer", "ribbonLoadBalancer" ], "deprecated": false,
"autowired": false, "secret": false, "description": "Configures theL
oadBalancer using the given configuration." },
- "expressionConfiguration": { "kind": "element", "displayName": "Expression
Configuration", "required": true, "type": "object", "javaType":
"org.apache.camel.model.cloud.ServiceCallExpressionConfiguration", "oneOf": [
"expression" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Configures the Expression using the given configuration." },
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The id of this node" }
}
}
diff --git
a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java
b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java
index e9bdf9d..0124765 100644
---
a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java
+++
b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java
@@ -368,7 +368,7 @@ public class ServiceCallProcessorFactory extends
TypedProcessorFactory<ServiceCa
ServiceLoadBalancer.class))
.orElseGet(
// Default
- DefaultServiceLoadBalancer::new);
+ DefaultServiceLoadBalancer::new);
}
// ******************************************
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceCall.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceCall.json
index 620ef6c..5dffa42 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceCall.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceCall.json
@@ -11,6 +11,7 @@
"output": false
},
"properties": {
+ "expression": { "kind": "element", "displayName": "Expression",
"required": false, "type": "object", "javaType":
"org.apache.camel.model.cloud.ServiceCallExpressionConfiguration",
"deprecated": false, "autowired": false, "secret": false, "description":
"Configures the Expression using the given configuration." },
"name": { "kind": "attribute", "displayName": "Name", "required": true,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the name of the
service to use" },
"uri": { "kind": "attribute", "displayName": "Uri", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The uri of the endpoint to
send to. The uri can be dynamic computed using the
org.apache.camel.language.simple.SimpleLanguage expression." },
"component": { "kind": "attribute", "displayName": "Component",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"http", "description": "The component to use." },
@@ -24,7 +25,6 @@
"serviceDiscoveryConfiguration": { "kind": "element", "displayName":
"Service Discovery Configuration", "required": true, "type": "object",
"javaType":
"org.apache.camel.model.cloud.ServiceCallServiceDiscoveryConfiguration",
"oneOf": [ "cachingServiceDiscovery", "combinedServiceDiscovery",
"consulServiceDiscovery", "dnsServiceDiscovery", "etcdServiceDiscovery",
"kubernetesServiceDiscovery", "staticServiceDiscovery",
"zookeeperServiceDiscovery" ], "deprecated": false, "autowired": fal [...]
"serviceFilterConfiguration": { "kind": "element", "displayName": "Service
Filter Configuration", "required": true, "type": "object", "javaType":
"org.apache.camel.model.cloud.ServiceCallServiceFilterConfiguration", "oneOf":
[ "blacklistServiceFilter", "combinedServiceFilter", "customServiceFilter",
"healthyServiceFilter", "passThroughServiceFilter" ], "deprecated": false,
"autowired": false, "secret": false, "description": "Configures the
ServiceFilter using the given configuration." },
"loadBalancerConfiguration": { "kind": "element", "displayName": "Load
Balancer Configuration", "required": true, "type": "object", "javaType":
"org.apache.camel.model.cloud.ServiceCallServiceLoadBalancerConfiguration",
"oneOf": [ "defaultLoadBalancer", "ribbonLoadBalancer" ], "deprecated": false,
"autowired": false, "secret": false, "description": "Configures the
LoadBalancer using the given configuration." },
- "expressionConfiguration": { "kind": "element", "displayName": "Expression
Configuration", "required": false, "type": "object", "javaType":
"org.apache.camel.model.cloud.ServiceCallExpressionConfiguration",
"deprecated": false, "autowired": false, "secret": false, "description":
"Configures the Expression using the given configuration." },
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the id of this node"
},
"description": { "kind": "element", "displayName": "Description",
"required": false, "type": "object", "javaType":
"org.apache.camel.model.DescriptionDefinition", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the description of
this node" }
}
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceCallConfiguration.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceCallConfiguration.json
index 66dbfed..9cb7cbb 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceCallConfiguration.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceCallConfiguration.json
@@ -11,6 +11,7 @@
"output": false
},
"properties": {
+ "expression": { "kind": "element", "displayName": "Expression",
"required": false, "type": "object", "javaType":
"org.apache.camel.model.cloud.ServiceCallExpressionConfiguration",
"deprecated": false, "autowired": false, "secret": false, "description":
"Configures the Expression using the given configuration." },
"uri": { "kind": "attribute", "displayName": "Uri", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The uri of the endpoint to
send to. The uri can be dynamic computed using the
org.apache.camel.language.simple.SimpleLanguage expression." },
"component": { "kind": "attribute", "displayName": "Component",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"http", "description": "The component to use." },
"pattern": { "kind": "attribute", "displayName": "Pattern", "required":
false, "type": "enum", "javaType": "org.apache.camel.ExchangePattern", "enum":
[ "InOnly", "InOptionalOut", "InOut" ], "deprecated": false, "autowired":
false, "secret": false, "description": "Sets the optional ExchangePattern used
to invoke this endpoint" },
@@ -22,7 +23,6 @@
"serviceDiscoveryConfiguration": { "kind": "element", "displayName":
"Service Discovery Configuration", "required": true, "type": "object",
"javaType":
"org.apache.camel.model.cloud.ServiceCallServiceDiscoveryConfiguration",
"oneOf": [ "cachingServiceDiscovery", "combinedServiceDiscovery",
"consulServiceDiscovery", "dnsServiceDiscovery", "etcdServiceDiscovery",
"kubernetesServiceDiscovery", "staticServiceDiscovery",
"zookeeperServiceDiscovery" ], "deprecated": false, "autowired": fal [...]
"serviceFilterConfiguration": { "kind": "element", "displayName": "Service
Filter Configuration", "required": true, "type": "object", "javaType":
"org.apache.camel.model.cloud.ServiceCallServiceFilterConfiguration", "oneOf":
[ "blacklistServiceFilter", "combinedServiceFilter", "customServiceFilter",
"healthyServiceFilter", "passThroughServiceFilter" ], "deprecated": false,
"autowired": false, "secret": false, "description": "Configures the
ServiceFilter using the given configuration." },
"loadBalancerConfiguration": { "kind": "element", "displayName": "Load
Balancer Configuration", "required": true, "type": "object", "javaType":
"org.apache.camel.model.cloud.ServiceCallServiceLoadBalancerConfiguration",
"oneOf": [ "defaultLoadBalancer", "ribbonLoadBalancer" ], "deprecated": false,
"autowired": false, "secret": false, "description": "Configures theL
oadBalancer using the given configuration." },
- "expressionConfiguration": { "kind": "element", "displayName": "Expression
Configuration", "required": true, "type": "object", "javaType":
"org.apache.camel.model.cloud.ServiceCallExpressionConfiguration", "oneOf": [
"expression" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Configures the Expression using the given configuration." },
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The id of this node" }
}
}
diff --git
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
index 4feba60..fca47d5 100644
---
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
+++
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
@@ -1552,7 +1552,6 @@ public class ModelParser extends BaseParser {
return true;
}, (def, key) -> {
switch (key) {
- case "expression":
def.setExpressionConfiguration(doParseServiceCallExpressionConfiguration());
break;
case "ribbonLoadBalancer":
def.setLoadBalancerConfiguration(doParseRibbonServiceCallServiceLoadBalancerConfiguration());
break;
case "defaultLoadBalancer":
def.setLoadBalancerConfiguration(doParseDefaultServiceCallServiceLoadBalancerConfiguration());
break;
case "cachingServiceDiscovery":
def.setServiceDiscoveryConfiguration(doParseCachingServiceCallServiceDiscoveryConfiguration());
break;
@@ -1568,6 +1567,7 @@ public class ModelParser extends BaseParser {
case "customServiceFilter":
def.setServiceFilterConfiguration(doParseCustomServiceCallServiceFilterConfiguration());
break;
case "healthyServiceFilter":
def.setServiceFilterConfiguration(doParseHealthyServiceCallServiceFilterConfiguration());
break;
case "passThroughServiceFilter":
def.setServiceFilterConfiguration(doParsePassThroughServiceCallServiceFilterConfiguration());
break;
+ case "expression":
def.setExpressionConfiguration(doParseServiceCallExpressionConfiguration());
break;
default: return false;
}
return true;
@@ -1623,7 +1623,7 @@ public class ModelParser extends BaseParser {
case "customServiceFilter":
def.setServiceFilterConfiguration(doParseCustomServiceCallServiceFilterConfiguration());
break;
case "healthyServiceFilter":
def.setServiceFilterConfiguration(doParseHealthyServiceCallServiceFilterConfiguration());
break;
case "passThroughServiceFilter":
def.setServiceFilterConfiguration(doParsePassThroughServiceCallServiceFilterConfiguration());
break;
- case "expressionConfiguration":
def.setExpressionConfiguration(doParseServiceCallExpressionConfiguration());
break;
+ case "expression":
def.setExpressionConfiguration(doParseServiceCallExpressionConfiguration());
break;
default: return
optionalIdentifiedDefinitionElementHandler().accept(def, key);
}
return true;
