You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/06/19 12:54:01 UTC
[camel] branch main updated (fdf008b3391 -> 21200b3cb97)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from fdf008b3391 CAMEL-18190: camel-jbang - Downloading dependencies - Did you mean
new a97cee80b4f (chores) catalog: removed unused parameters
new 80c31608136 (chores) camel-google-calendar: removed unused code
new ef7cd5e9480 (chores) camel-huaweicloud-common: removed unused code
new 4c01428df68 (chores) camel-huaweicloud-common: removed unused parameters
new 3eb152616e3 (chores) camel-jetty-common: removed unused parameters
new 0a097e99bcc (chores) camel-jgroups-raft: removed unused parameters
new 5f3b3f65bed (chores) camel-jooq: removed unused parameters
new c8761b42bcc (chores) camel-joor: removed unused parameters
new d904086d998 (chores) camel-jt400: removed unused parameters
new da6572fbd18 (chores) camel-mvel: removed unused parameters
new 3de7c4f09b5 (chores) camel-ognl: removed unused parameters
new bd14bde4aff (chores) camel-openapi-java: removed unused parameters
new 20f6c53d0eb (chores) camel-pdf: removed unused parameters
new 37747bc6717 (chores) camel-printer: removed unused parameters
new a0ca6807d7d (chores) camel-printer: fix sub-expression assigment
new ebda5e9738b (chores) camel-quickfix: removed unused parameters
new 535ef80c017 (chores) camel-saxon: removed unused parameters
new b5690258e33 (chores) camel-servicenow: removed unused code and parameters
new 89716e77050 (chores) camel-zipkin: removed unused parameters
new e5224a056a9 (chores) camel-zipkin: fixed incorrect log marker usage
new 21200b3cb97 (chores) camel-package-maven-plugin: removed unused parameters
The 21 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/camel/parser/RestDslParser.java | 10 ++++------
.../camel/parser/helper/CamelJavaRestDslParserHelper.java | 14 +++++++-------
.../apache/camel/parser/java/RoasterJavaRestDslTest.java | 4 ++--
.../google/calendar/GoogleCalendarEndpointConfigurer.java | 2 +-
.../camel/component/google/calendar/google-calendar.json | 4 ++--
.../google/calendar/stream/google-calendar-stream.json | 2 +-
.../google/calendar/BatchGoogleCalendarClientFactory.java | 8 ++------
.../component/huaweicloud/common/models/ServiceKeys.java | 5 -----
.../apache/camel/component/jetty/JettyHttpComponent.java | 14 +++++++-------
.../apache/camel/component/jgroups/raft/jgroups-raft.json | 4 ++--
.../component/jgroups/raft/JGroupsRaftComponent.java | 2 +-
.../camel/component/jgroups/raft/JGroupsRaftEndpoint.java | 4 +---
.../resources/org/apache/camel/component/jooq/jooq.json | 4 ++--
.../org/apache/camel/component/jooq/JooqComponent.java | 2 +-
.../org/apache/camel/component/jooq/JooqEndpoint.java | 2 +-
.../java/org/apache/camel/language/joor/JoorLanguage.java | 2 +-
.../apache/camel/language/joor/JoorScriptingCompiler.java | 6 +++---
.../resources/org/apache/camel/component/jt400/jt400.json | 4 ++--
.../apache/camel/component/jt400/Jt400PgmProducer.java | 4 ++--
.../resources/org/apache/camel/component/mvel/mvel.json | 2 +-
.../org/apache/camel/language/mvel/MvelExpression.java | 4 ++--
.../java/org/apache/camel/language/mvel/MvelLanguage.java | 4 ++--
.../org/apache/camel/language/ognl/OgnlExpression.java | 4 ++--
.../java/org/apache/camel/language/ognl/OgnlLanguage.java | 4 ++--
.../org/apache/camel/openapi/RestOpenApiProcessor.java | 2 +-
.../java/org/apache/camel/openapi/RestOpenApiReader.java | 8 ++++----
.../java/org/apache/camel/openapi/RestOpenApiSupport.java | 2 +-
.../resources/org/apache/camel/component/pdf/pdf.json | 4 ++--
.../org/apache/camel/component/pdf/text/PdfUtils.java | 4 ----
.../resources/org/apache/camel/component/printer/lpr.json | 4 ++--
.../apache/camel/component/printer/DocFlavorAssigner.java | 15 +++++++++------
.../camel/component/printer/PrinterConfiguration.java | 6 +++---
.../org/apache/camel/component/quickfixj/quickfix.json | 4 ++--
.../camel/component/quickfixj/MessageCorrelator.java | 6 +++---
.../camel/component/quickfixj/QuickfixjProducer.java | 2 +-
.../org/apache/camel/component/xquery/xquery.json | 4 ++--
.../org/apache/camel/component/xquery/XQueryBuilder.java | 6 +++---
.../org/apache/camel/component/servicenow/servicenow.json | 2 +-
.../camel/component/servicenow/ServiceNowClient.java | 14 ++++++--------
.../releases/fuji/FujiServiceNowAggregateProcessor.java | 4 ++--
.../releases/fuji/FujiServiceNowImportSetProcessor.java | 4 ++--
.../releases/fuji/FujiServiceNowTableProcessor.java | 8 ++++----
.../main/java/org/apache/camel/zipkin/ZipkinTracer.java | 10 +++++-----
.../org/apache/camel/maven/packaging/EndpointDslMojo.java | 4 ++--
.../apache/camel/maven/packaging/UpdateReadmeMojo.java | 13 ++++++-------
45 files changed, 112 insertions(+), 129 deletions(-)
[camel] 12/21: (chores) camel-openapi-java: removed unused parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit bd14bde4affc1eb9df3685615fa8b30e2e0cffb9
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sun Jun 19 11:21:51 2022 +0200
(chores) camel-openapi-java: removed unused parameters
---
.../main/java/org/apache/camel/openapi/RestOpenApiProcessor.java | 2 +-
.../src/main/java/org/apache/camel/openapi/RestOpenApiReader.java | 8 ++++----
.../main/java/org/apache/camel/openapi/RestOpenApiSupport.java | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiProcessor.java b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiProcessor.java
index 182a763ebe5..d561cd377d2 100644
--- a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiProcessor.java
+++ b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiProcessor.java
@@ -72,7 +72,7 @@ public class RestOpenApiProcessor implements Processor {
}
try {
- support.renderResourceListing(exchange.getContext(), adapter, openApiConfig, json, yaml,
+ support.renderResourceListing(exchange.getContext(), adapter, openApiConfig, json,
exchange.getIn().getHeaders(), exchange.getContext().getClassResolver(), configuration);
} catch (Exception e) {
LOG.warn("Error rendering OpenApi API due {}", e.getMessage(), e);
diff --git a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
index e89e4ea2179..2716f6806a1 100644
--- a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
+++ b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
@@ -707,7 +707,7 @@ public class RestOpenApiReader {
bp.schema = arrayModel;
} else {
- String ref = modelTypeAsRef(type, openApi);
+ String ref = modelTypeAsRef(type);
if (ref != null) {
Oas30Schema refModel = (Oas30Schema) bp.createSchema();
refModel.$ref = OAS30_SCHEMA_DEFINITION_PREFIX + ref;
@@ -930,7 +930,7 @@ public class RestOpenApiReader {
arrayModel = modelTypeAsProperty(type, openApi, arrayModel);
bp.schema = arrayModel;
} else {
- String ref = modelTypeAsRef(type, openApi);
+ String ref = modelTypeAsRef(type);
if (ref != null) {
Oas20Schema refModel = (Oas20Schema) bp.createSchema();
refModel.$ref = OAS20_SCHEMA_DEFINITION_PREFIX + ref;
@@ -1357,7 +1357,7 @@ public class RestOpenApiReader {
response.headers.addHeader(name, ip);
}
- private String modelTypeAsRef(String typeName, OasDocument openApi) {
+ private String modelTypeAsRef(String typeName) {
boolean array = typeName.endsWith("[]");
if (array) {
typeName = typeName.substring(0, typeName.length() - 2);
@@ -1376,7 +1376,7 @@ public class RestOpenApiReader {
typeName = typeName.substring(0, typeName.length() - 2);
}
- String ref = modelTypeAsRef(typeName, openApi);
+ String ref = modelTypeAsRef(typeName);
if (ref != null) {
if (openApi instanceof Oas20Document) {
diff --git a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiSupport.java b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiSupport.java
index 86a89ca6391..b1cf571ca4f 100644
--- a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiSupport.java
+++ b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiSupport.java
@@ -368,7 +368,7 @@ public class RestOpenApiSupport {
public void renderResourceListing(
CamelContext camelContext, RestApiResponseAdapter response,
BeanConfig openApiConfig, boolean json,
- boolean yaml, Map<String, Object> headers, ClassResolver classResolver,
+ Map<String, Object> headers, ClassResolver classResolver,
RestConfiguration configuration)
throws Exception {
LOG.trace("renderResourceListing");
[camel] 01/21: (chores) catalog: removed unused parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a97cee80b4fabd0d19ae8cee1823f93e62bcde83
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sun Jun 19 11:02:19 2022 +0200
(chores) catalog: removed unused parameters
Removed unused method parameters in the camel-route-parser
---
.../main/java/org/apache/camel/parser/RestDslParser.java | 10 ++++------
.../camel/parser/helper/CamelJavaRestDslParserHelper.java | 14 +++++++-------
.../apache/camel/parser/java/RoasterJavaRestDslTest.java | 4 ++--
3 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/RestDslParser.java b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/RestDslParser.java
index a3f8232355b..9e125831ac5 100644
--- a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/RestDslParser.java
+++ b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/RestDslParser.java
@@ -42,12 +42,11 @@ public final class RestDslParser {
* java source class.
*
* @param clazz the java source class
- * @param baseDir the base of the source code
* @param fullyQualifiedFileName the fully qualified source code file name
* @return a list of rest configurations (often there is only one)
*/
public static List<RestConfigurationDetails> parseRestConfiguration(
- JavaClassSource clazz, String baseDir, String fullyQualifiedFileName,
+ JavaClassSource clazz, String fullyQualifiedFileName,
boolean includeInlinedRouteBuilders) {
List<MethodSource<JavaClassSource>> methods = new ArrayList<>();
@@ -67,7 +66,7 @@ public final class RestDslParser {
for (MethodSource<JavaClassSource> configureMethod : methods) {
// there may be multiple route builder configure methods
List<RestConfigurationDetails> details
- = parser.parseRestConfiguration(clazz, baseDir, fullyQualifiedFileName, configureMethod);
+ = parser.parseRestConfiguration(clazz, fullyQualifiedFileName, configureMethod);
list.addAll(details);
}
// we end up parsing bottom->up so reverse list
@@ -81,12 +80,11 @@ public final class RestDslParser {
* class.
*
* @param clazz the java source class
- * @param baseDir the base of the source code
* @param fullyQualifiedFileName the fully qualified source code file name
* @return a list of rest services
*/
public static List<RestServiceDetails> parseRestService(
- JavaClassSource clazz, String baseDir, String fullyQualifiedFileName,
+ JavaClassSource clazz, String fullyQualifiedFileName,
boolean includeInlinedRouteBuilders) {
List<MethodSource<JavaClassSource>> methods = new ArrayList<>();
@@ -105,7 +103,7 @@ public final class RestDslParser {
List<RestServiceDetails> list = new ArrayList<>();
for (MethodSource<JavaClassSource> configureMethod : methods) {
// there may be multiple route builder configure methods
- List<RestServiceDetails> details = parser.parseRestService(clazz, baseDir, fullyQualifiedFileName, configureMethod);
+ List<RestServiceDetails> details = parser.parseRestService(clazz, fullyQualifiedFileName, configureMethod);
list.addAll(details);
}
// we end up parsing bottom->up so reverse list
diff --git a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaRestDslParserHelper.java b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaRestDslParserHelper.java
index 18065604b2a..08a7d24b525 100644
--- a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaRestDslParserHelper.java
+++ b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaRestDslParserHelper.java
@@ -60,7 +60,7 @@ import org.jboss.forge.roaster.model.source.MethodSource;
public final class CamelJavaRestDslParserHelper {
public List<RestConfigurationDetails> parseRestConfiguration(
- JavaClassSource clazz, String baseDir, String fullyQualifiedFileName,
+ JavaClassSource clazz, String fullyQualifiedFileName,
MethodSource<JavaClassSource> configureMethod) {
List<RestConfigurationDetails> answer = new ArrayList<>();
@@ -94,7 +94,7 @@ public final class CamelJavaRestDslParserHelper {
node.setClassName(clazz.getQualifiedName());
node.setMethodName(configureMethod.getName());
- parseExpression(node, fullyQualifiedFileName, clazz, configureMethod, block, exp);
+ parseExpression(node, fullyQualifiedFileName, clazz, block, exp);
}
}
}
@@ -105,7 +105,7 @@ public final class CamelJavaRestDslParserHelper {
}
public List<RestServiceDetails> parseRestService(
- JavaClassSource clazz, String baseDir, String fullyQualifiedFileName,
+ JavaClassSource clazz, String fullyQualifiedFileName,
MethodSource<JavaClassSource> configureMethod) {
List<RestServiceDetails> answer = new ArrayList<>();
@@ -204,17 +204,17 @@ public final class CamelJavaRestDslParserHelper {
private void parseExpression(
RestConfigurationDetails node, String fullyQualifiedFileName,
- JavaClassSource clazz, MethodSource<JavaClassSource> configureMethod, Block block,
+ JavaClassSource clazz, Block block,
Expression exp) {
if (exp == null) {
return;
}
if (exp instanceof MethodInvocation) {
MethodInvocation mi = (MethodInvocation) exp;
- doParseRestConfiguration(node, fullyQualifiedFileName, clazz, configureMethod, block, mi);
+ doParseRestConfiguration(node, fullyQualifiedFileName, clazz, block, mi);
// if the method was called on another method, then recursive
exp = mi.getExpression();
- parseExpression(node, fullyQualifiedFileName, clazz, configureMethod, block, exp);
+ parseExpression(node, fullyQualifiedFileName, clazz, block, exp);
}
}
@@ -246,7 +246,7 @@ public final class CamelJavaRestDslParserHelper {
private void doParseRestConfiguration(
RestConfigurationDetails node, String fullyQualifiedFileName,
- JavaClassSource clazz, MethodSource<JavaClassSource> configureMethod, Block block,
+ JavaClassSource clazz, Block block,
MethodInvocation mi) {
// end line number is the first node in the method chain we parse
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaRestDslTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaRestDslTest.java
index 55b98b3675a..3f7cd705a68 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaRestDslTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaRestDslTest.java
@@ -42,7 +42,7 @@ public class RoasterJavaRestDslTest extends CamelTestSupport {
JavaClassSource clazz = (JavaClassSource) Roaster
.parse(new File("src/test/java/org/apache/camel/parser/java/MyRestDslRouteBuilder.java"));
- List<RestConfigurationDetails> list = RestDslParser.parseRestConfiguration(clazz, ".",
+ List<RestConfigurationDetails> list = RestDslParser.parseRestConfiguration(clazz,
"src/test/java/org/apache/camel/parser/java/MyRestDslRouteBuilder.java", true);
assertEquals(1, list.size());
RestConfigurationDetails details = list.get(0);
@@ -78,7 +78,7 @@ public class RoasterJavaRestDslTest extends CamelTestSupport {
JavaClassSource clazz = (JavaClassSource) Roaster
.parse(new File("src/test/java/org/apache/camel/parser/java/MyRestDslRouteBuilder.java"));
- List<RestServiceDetails> list = RestDslParser.parseRestService(clazz, ".",
+ List<RestServiceDetails> list = RestDslParser.parseRestService(clazz,
"src/test/java/org/apache/camel/parser/java/MyRestDslRouteBuilder.java", true);
assertEquals(1, list.size());
RestServiceDetails details = list.get(0);
[camel] 11/21: (chores) camel-ognl: removed unused parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3de7c4f09b5bb38b652652a1d747cf4ccd6721c0
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sun Jun 19 11:20:42 2022 +0200
(chores) camel-ognl: removed unused parameters
---
.../src/main/java/org/apache/camel/language/ognl/OgnlExpression.java | 4 ++--
.../src/main/java/org/apache/camel/language/ognl/OgnlLanguage.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java b/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java
index 1a44d785a1f..261bde4371c 100644
--- a/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java
+++ b/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java
@@ -33,7 +33,7 @@ public class OgnlExpression extends ExpressionSupport {
private final Class<?> type;
private Object expression;
- public OgnlExpression(OgnlLanguage language, String expressionString, Class<?> type) {
+ public OgnlExpression(String expressionString, Class<?> type) {
this.expressionString = expressionString;
this.type = type;
try {
@@ -44,7 +44,7 @@ public class OgnlExpression extends ExpressionSupport {
}
public static OgnlExpression ognl(String expression) {
- return new OgnlExpression(new OgnlLanguage(), expression, Object.class);
+ return new OgnlExpression(expression, Object.class);
}
@Override
diff --git a/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlLanguage.java b/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlLanguage.java
index c896d805012..8412250ab0b 100644
--- a/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlLanguage.java
+++ b/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlLanguage.java
@@ -33,13 +33,13 @@ public class OgnlLanguage extends LanguageSupport implements ScriptingLanguage {
@Override
public Predicate createPredicate(String expression) {
expression = loadResource(expression);
- return new OgnlExpression(this, expression, Boolean.class);
+ return new OgnlExpression(expression, Boolean.class);
}
@Override
public Expression createExpression(String expression) {
expression = loadResource(expression);
- return new OgnlExpression(this, expression, Object.class);
+ return new OgnlExpression(expression, Object.class);
}
@Override
[camel] 10/21: (chores) camel-mvel: removed unused parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit da6572fbd18ac81cb3033fe327bb4c0262b22367
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sun Jun 19 11:19:33 2022 +0200
(chores) camel-mvel: removed unused parameters
---
.../src/generated/resources/org/apache/camel/component/mvel/mvel.json | 2 +-
.../src/main/java/org/apache/camel/language/mvel/MvelExpression.java | 4 ++--
.../src/main/java/org/apache/camel/language/mvel/MvelLanguage.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/components/camel-mvel/src/generated/resources/org/apache/camel/component/mvel/mvel.json b/components/camel-mvel/src/generated/resources/org/apache/camel/component/mvel/mvel.json
index 23c7688a904..80eb97fe133 100644
--- a/components/camel-mvel/src/generated/resources/org/apache/camel/component/mvel/mvel.json
+++ b/components/camel-mvel/src/generated/resources/org/apache/camel/component/mvel/mvel.json
@@ -37,6 +37,6 @@
"allowTemplateFromHeader": { "kind": "parameter", "displayName": "Allow Template From Header", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vuln [...]
"contentCache": { "kind": "parameter", "displayName": "Content Cache", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether to use resource content cache or not" },
"encoding": { "kind": "parameter", "displayName": "Encoding", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Character encoding of the resource content." },
- "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may other [...]
+ "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
}
}
diff --git a/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelExpression.java b/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelExpression.java
index ecb16ae9fae..32cd37bf9e0 100644
--- a/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelExpression.java
+++ b/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelExpression.java
@@ -29,7 +29,7 @@ public class MvelExpression extends ExpressionSupport {
private final Class<?> type;
private final Serializable compiled;
- public MvelExpression(MvelLanguage language, String expressionString, Class<?> type) {
+ public MvelExpression(String expressionString, Class<?> type) {
this.expressionString = expressionString;
this.type = type;
@@ -41,7 +41,7 @@ public class MvelExpression extends ExpressionSupport {
}
public static MvelExpression mvel(String expression) {
- return new MvelExpression(new MvelLanguage(), expression, Object.class);
+ return new MvelExpression(expression, Object.class);
}
@Override
diff --git a/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelLanguage.java b/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelLanguage.java
index 39f3f70ef10..c9e7e046956 100644
--- a/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelLanguage.java
+++ b/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelLanguage.java
@@ -35,13 +35,13 @@ public class MvelLanguage extends LanguageSupport implements ScriptingLanguage {
@Override
public Predicate createPredicate(String expression) {
expression = loadResource(expression);
- return new MvelExpression(this, expression, Boolean.class);
+ return new MvelExpression(expression, Boolean.class);
}
@Override
public Expression createExpression(String expression) {
expression = loadResource(expression);
- return new MvelExpression(this, expression, Object.class);
+ return new MvelExpression(expression, Object.class);
}
@Override
[camel] 17/21: (chores) camel-saxon: removed unused parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 535ef80c017595a431f74728b15624ca792c9565
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sun Jun 19 11:38:23 2022 +0200
(chores) camel-saxon: removed unused parameters
---
.../resources/org/apache/camel/component/xquery/xquery.json | 4 ++--
.../main/java/org/apache/camel/component/xquery/XQueryBuilder.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/components/camel-saxon/src/generated/resources/org/apache/camel/component/xquery/xquery.json b/components/camel-saxon/src/generated/resources/org/apache/camel/component/xquery/xquery.json
index cd5ba557283..544b91f74b9 100644
--- a/components/camel-saxon/src/generated/resources/org/apache/camel/component/xquery/xquery.json
+++ b/components/camel-saxon/src/generated/resources/org/apache/camel/component/xquery/xquery.json
@@ -37,12 +37,12 @@
"resultsFormat": { "kind": "parameter", "displayName": "Results Format", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.xquery.ResultFormat", "enum": [ "Bytes", "BytesSource", "DOM", "DOMSource", "List", "String", "StringSource" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DOM", "description": "What output result to use" },
"resultType": { "kind": "parameter", "displayName": "Result Type", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.Class<java.lang.Object>", "deprecated": false, "autowired": false, "secret": false, "description": "What output result to use defined as a class" },
"stripsAllWhiteSpace": { "kind": "parameter", "displayName": "Strips All White Space", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to strip all whitespaces" },
+ "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a m [...]
"sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send Empty Message When Idle", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead." },
- "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now [...]
"exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
"pollStrategy": { "kind": "parameter", "displayName": "Poll Strategy", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.PollingConsumerPollStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation [...]
- "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may other [...]
+ "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
"configuration": { "kind": "parameter", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "net.sf.saxon.Configuration", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom Saxon configuration" },
"configurationProperties": { "kind": "parameter", "displayName": "Configuration Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false, "autowired": false, "secret": false, "description": "To set custom Saxon configuration properties" },
"moduleURIResolver": { "kind": "parameter", "displayName": "Module URIResolver", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "net.sf.saxon.lib.ModuleURIResolver", "deprecated": false, "autowired": false, "secret": false, "description": "To use the custom ModuleURIResolver" },
diff --git a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
index 85eb51c78ae..400e97aab17 100644
--- a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
+++ b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
@@ -258,7 +258,7 @@ public abstract class XQueryBuilder implements Expression, Predicate, NamespaceA
LOG.debug("Matches: {} for exchange: {}", expression, exchange);
try {
List<?> list = evaluateAsList(exchange);
- return matches(exchange, list);
+ return matches(list);
} catch (Exception e) {
throw new RuntimeExpressionException(e);
}
@@ -274,7 +274,7 @@ public abstract class XQueryBuilder implements Expression, Predicate, NamespaceA
throw new AssertionError(e);
}
- if (!matches(exchange, list)) {
+ if (!matches(list)) {
throw new AssertionError(this + " failed on " + exchange + " as evaluated: " + list);
}
}
@@ -722,7 +722,7 @@ public abstract class XQueryBuilder implements Expression, Predicate, NamespaceA
}
}
- protected boolean matches(Exchange exchange, List<?> results) {
+ protected boolean matches(List<?> results) {
return ObjectHelper.matches(results);
}
[camel] 07/21: (chores) camel-jooq: removed unused parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5f3b3f65bed3799fb6a3cbe5a1bb83bd8b830d29
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sun Jun 19 11:15:57 2022 +0200
(chores) camel-jooq: removed unused parameters
---
.../src/generated/resources/org/apache/camel/component/jooq/jooq.json | 4 ++--
.../src/main/java/org/apache/camel/component/jooq/JooqComponent.java | 2 +-
.../src/main/java/org/apache/camel/component/jooq/JooqEndpoint.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/components/camel-jooq/src/generated/resources/org/apache/camel/component/jooq/jooq.json b/components/camel-jooq/src/generated/resources/org/apache/camel/component/jooq/jooq.json
index ccaeaed3e2a..42e6ac7b137 100644
--- a/components/camel-jooq/src/generated/resources/org/apache/camel/component/jooq/jooq.json
+++ b/components/camel-jooq/src/generated/resources/org/apache/camel/component/jooq/jooq.json
@@ -34,15 +34,15 @@
"properties": {
"entityType": { "kind": "path", "displayName": "Entity Type", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.Class<java.lang.Object>", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jooq.JooqConfiguration", "configurationField": "configuration", "description": "JOOQ entity class" },
"databaseConfiguration": { "kind": "parameter", "displayName": "Database Configuration", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "org.jooq.Configuration", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jooq.JooqConfiguration", "configurationField": "configuration", "description": "To use a specific database configuration" },
+ "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a m [...]
"consumeDelete": { "kind": "parameter", "displayName": "Consume Delete", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jooq.JooqConfiguration", "configurationField": "configuration", "description": "Delete entity after it is consumed" },
"sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send Empty Message When Idle", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead." },
- "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now [...]
"exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
"pollStrategy": { "kind": "parameter", "displayName": "Poll Strategy", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.PollingConsumerPollStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation [...]
+ "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
"operation": { "kind": "parameter", "displayName": "Operation", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.jooq.JooqOperation", "enum": [ "EXECUTE", "FETCH", "NONE" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "NONE", "configurationClass": "org.apache.camel.component.jooq.JooqConfiguration", "configurationField": "configuration", "description": "Type of operation to execute on [...]
"query": { "kind": "parameter", "displayName": "Query", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jooq.JooqConfiguration", "configurationField": "configuration", "description": "To execute plain SQL query" },
- "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may other [...]
"backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
"backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
"backoffMultiplier": { "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening agai [...]
diff --git a/components/camel-jooq/src/main/java/org/apache/camel/component/jooq/JooqComponent.java b/components/camel-jooq/src/main/java/org/apache/camel/component/jooq/JooqComponent.java
index 9486e45d0a2..90705ac2626 100644
--- a/components/camel-jooq/src/main/java/org/apache/camel/component/jooq/JooqComponent.java
+++ b/components/camel-jooq/src/main/java/org/apache/camel/component/jooq/JooqComponent.java
@@ -34,7 +34,7 @@ public class JooqComponent extends DefaultComponent {
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
JooqConfiguration conf = configuration != null ? configuration.copy() : new JooqConfiguration();
- JooqEndpoint endpoint = new JooqEndpoint(uri, remaining, this, conf);
+ JooqEndpoint endpoint = new JooqEndpoint(uri, this, conf);
setProperties(endpoint, parameters);
initConfiguration(getCamelContext(), conf, remaining);
return endpoint;
diff --git a/components/camel-jooq/src/main/java/org/apache/camel/component/jooq/JooqEndpoint.java b/components/camel-jooq/src/main/java/org/apache/camel/component/jooq/JooqEndpoint.java
index e0bf2aa43fe..4d59e334c03 100644
--- a/components/camel-jooq/src/main/java/org/apache/camel/component/jooq/JooqEndpoint.java
+++ b/components/camel-jooq/src/main/java/org/apache/camel/component/jooq/JooqEndpoint.java
@@ -42,7 +42,7 @@ public class JooqEndpoint extends ScheduledPollEndpoint {
@UriParam
private JooqConfiguration configuration;
- public JooqEndpoint(String uri, String remaining, JooqComponent component, JooqConfiguration configuration) {
+ public JooqEndpoint(String uri, JooqComponent component, JooqConfiguration configuration) {
super(uri, component);
this.configuration = configuration;
}
[camel] 14/21: (chores) camel-printer: removed unused parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 37747bc6717262e5d416765e68d2984d9a45fb77
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sun Jun 19 11:26:14 2022 +0200
(chores) camel-printer: removed unused parameters
---
.../generated/resources/org/apache/camel/component/printer/lpr.json | 4 ++--
.../java/org/apache/camel/component/printer/DocFlavorAssigner.java | 6 +++---
.../org/apache/camel/component/printer/PrinterConfiguration.java | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/components/camel-printer/src/generated/resources/org/apache/camel/component/printer/lpr.json b/components/camel-printer/src/generated/resources/org/apache/camel/component/printer/lpr.json
index 9920835bda5..83fd8629772 100644
--- a/components/camel-printer/src/generated/resources/org/apache/camel/component/printer/lpr.json
+++ b/components/camel-printer/src/generated/resources/org/apache/camel/component/printer/lpr.json
@@ -35,13 +35,13 @@
"copies": { "kind": "parameter", "displayName": "Copies", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.printer.PrinterConfiguration", "configurationField": "config", "description": "Number of copies to print" },
"docFlavor": { "kind": "parameter", "displayName": "Doc Flavor", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "javax.print.DocFlavor", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.printer.PrinterConfiguration", "configurationField": "config", "description": "Sets DocFlavor to use." },
"flavor": { "kind": "parameter", "displayName": "Flavor", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.printer.PrinterConfiguration", "configurationField": "config", "description": "Sets DocFlavor to use." },
+ "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
"mediaSize": { "kind": "parameter", "displayName": "Media Size", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "na-letter", "configurationClass": "org.apache.camel.component.printer.PrinterConfiguration", "configurationField": "config", "description": "Sets the stationary as defined by enumeration names in the javax.print.attribute.standard.MediaSizeName [...]
"mediaTray": { "kind": "parameter", "displayName": "Media Tray", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.printer.PrinterConfiguration", "configurationField": "config", "description": "Sets MediaTray supported by the javax.print.DocFlavor API, for example upper,middle etc." },
"mimeType": { "kind": "parameter", "displayName": "Mime Type", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.printer.PrinterConfiguration", "configurationField": "config", "description": "Sets mimeTypes supported by the javax.print.DocFlavor API" },
"orientation": { "kind": "parameter", "displayName": "Orientation", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "portrait", "landscape", "reverse-portrait", "reverse-landscape" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "portrait", "configurationClass": "org.apache.camel.component.printer.PrinterConfiguration", "configurationField": "config", "description": "Sets the page orientation." },
"printerPrefix": { "kind": "parameter", "displayName": "Printer Prefix", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.printer.PrinterConfiguration", "configurationField": "config", "description": "Sets the prefix name of the printer, it is useful when the printer name does not start with \/\/hostname\/printer" },
"sendToPrinter": { "kind": "parameter", "displayName": "Send To Printer", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.printer.PrinterConfiguration", "configurationField": "config", "description": "etting this option to false prevents sending of the print data to the printer" },
- "sides": { "kind": "parameter", "displayName": "Sides", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "one-sided", "duplex", "tumble", "two-sided-short-edge", "two-sided-long-edge" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "one-sided", "configurationClass": "org.apache.camel.component.printer.PrinterConfiguration", "configurationField": "config", "description": "Sets one sided or two [...]
- "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may other [...]
+ "sides": { "kind": "parameter", "displayName": "Sides", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "one-sided", "duplex", "tumble", "two-sided-short-edge", "two-sided-long-edge" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "one-sided", "configurationClass": "org.apache.camel.component.printer.PrinterConfiguration", "configurationField": "config", "description": "Sets one sided or two [...]
}
}
diff --git a/components/camel-printer/src/main/java/org/apache/camel/component/printer/DocFlavorAssigner.java b/components/camel-printer/src/main/java/org/apache/camel/component/printer/DocFlavorAssigner.java
index 67ae45eb1b9..3f1aee3ac55 100644
--- a/components/camel-printer/src/main/java/org/apache/camel/component/printer/DocFlavorAssigner.java
+++ b/components/camel-printer/src/main/java/org/apache/camel/component/printer/DocFlavorAssigner.java
@@ -247,15 +247,15 @@ public class DocFlavorAssigner {
return d;
}
- public DocFlavor forMimeTypePAGEABLE(String flavor) {
+ public DocFlavor forMimeTypePAGEABLE() {
return d = DocFlavor.SERVICE_FORMATTED.PAGEABLE;
}
- public DocFlavor forMimeTypePRINTABLE(String flavor) {
+ public DocFlavor forMimeTypePRINTABLE() {
return d = DocFlavor.SERVICE_FORMATTED.PRINTABLE;
}
- public DocFlavor forMimeTypeRENDERABLEIMAGE(String flavor) {
+ public DocFlavor forMimeTypeRENDERABLEIMAGE() {
return d = DocFlavor.SERVICE_FORMATTED.RENDERABLE_IMAGE;
}
}
diff --git a/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java b/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java
index 63b9ad66e57..7856cc99075 100644
--- a/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java
+++ b/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java
@@ -169,11 +169,11 @@ public class PrinterConfiguration {
} else if (mimeType.equalsIgnoreCase("TEXT_PLAIN")) {
d = docFlavorAssigner.forMimeTypeBasic(flavor, mimeType);
} else if (mimeType.equalsIgnoreCase("PAGEABLE")) {
- d = docFlavorAssigner.forMimeTypePAGEABLE(flavor);
+ d = docFlavorAssigner.forMimeTypePAGEABLE();
} else if (mimeType.equalsIgnoreCase("PRINTABLE")) {
- d = docFlavorAssigner.forMimeTypePRINTABLE(flavor);
+ d = docFlavorAssigner.forMimeTypePRINTABLE();
} else if (mimeType.equalsIgnoreCase("RENDERABLE_IMAGE")) {
- d = docFlavorAssigner.forMimeTypeRENDERABLEIMAGE(flavor);
+ d = docFlavorAssigner.forMimeTypeRENDERABLEIMAGE();
}
return d;
[camel] 13/21: (chores) camel-pdf: removed unused parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 20f6c53d0eb6214841e1849e2c140f60a7eff12a
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sun Jun 19 11:24:08 2022 +0200
(chores) camel-pdf: removed unused parameters
---
.../src/generated/resources/org/apache/camel/component/pdf/pdf.json | 4 ++--
.../src/main/java/org/apache/camel/component/pdf/text/PdfUtils.java | 4 ----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/components/camel-pdf/src/generated/resources/org/apache/camel/component/pdf/pdf.json b/components/camel-pdf/src/generated/resources/org/apache/camel/component/pdf/pdf.json
index 4fccca8fb3c..5c792532ee2 100644
--- a/components/camel-pdf/src/generated/resources/org/apache/camel/component/pdf/pdf.json
+++ b/components/camel-pdf/src/generated/resources/org/apache/camel/component/pdf/pdf.json
@@ -34,12 +34,12 @@
"operation": { "kind": "path", "displayName": "Operation", "group": "producer", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.pdf.PdfOperation", "enum": [ "create", "append", "extractText" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.pdf.PdfConfiguration", "configurationField": "pdfConfiguration", "description": "Operation type" },
"font": { "kind": "parameter", "displayName": "Font", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Courier", "Courier-Bold", "Courier-Oblique", "Courier-BoldOblique", "Helvetica", "Helvetica-Bold", "Helvetica-Oblique", "Helvetica-BoldOblique", "Times-Roman", "Times-Bold", "Times-Italic", "Times-BoldItalic", "Symbol", "ZapfDingbats" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "Helveti [...]
"fontSize": { "kind": "parameter", "displayName": "Font Size", "group": "producer", "label": "", "required": false, "type": "number", "javaType": "float", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 14.0, "configurationClass": "org.apache.camel.component.pdf.PdfConfiguration", "configurationField": "pdfConfiguration", "description": "Font size in pixels" },
+ "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
"marginBottom": { "kind": "parameter", "displayName": "Margin Bottom", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 20, "configurationClass": "org.apache.camel.component.pdf.PdfConfiguration", "configurationField": "pdfConfiguration", "description": "Margin bottom in pixels" },
"marginLeft": { "kind": "parameter", "displayName": "Margin Left", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 20, "configurationClass": "org.apache.camel.component.pdf.PdfConfiguration", "configurationField": "pdfConfiguration", "description": "Margin left in pixels" },
"marginRight": { "kind": "parameter", "displayName": "Margin Right", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 40, "configurationClass": "org.apache.camel.component.pdf.PdfConfiguration", "configurationField": "pdfConfiguration", "description": "Margin right in pixels" },
"marginTop": { "kind": "parameter", "displayName": "Margin Top", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 20, "configurationClass": "org.apache.camel.component.pdf.PdfConfiguration", "configurationField": "pdfConfiguration", "description": "Margin top in pixels" },
"pageSize": { "kind": "parameter", "displayName": "Page Size", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "LETTER", "LEGAL", "A0", "A1", "A2", "A3", "A4", "A5", "A6" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "A4", "configurationClass": "org.apache.camel.component.pdf.PdfConfiguration", "configurationField": "pdfConfiguration", "description": "Page size" },
- "textProcessingFactory": { "kind": "parameter", "displayName": "Text Processing Factory", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.pdf.TextProcessingFactory", "enum": [ "autoFormatting", "lineTermination" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "lineTermination", "configurationClass": "org.apache.camel.component.pdf.PdfConfiguration", "configurationField": "pdfConfiguration", "d [...]
- "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may other [...]
+ "textProcessingFactory": { "kind": "parameter", "displayName": "Text Processing Factory", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.pdf.TextProcessingFactory", "enum": [ "autoFormatting", "lineTermination" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "lineTermination", "configurationClass": "org.apache.camel.component.pdf.PdfConfiguration", "configurationField": "pdfConfiguration", "d [...]
}
}
diff --git a/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/text/PdfUtils.java b/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/text/PdfUtils.java
index fc76202c0ad..5713303a2cd 100644
--- a/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/text/PdfUtils.java
+++ b/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/text/PdfUtils.java
@@ -30,10 +30,6 @@ public final class PdfUtils {
return font.getBoundingBox().getHeight() / PDF_PIXEL_SIZE * fontSize;
}
- public static float getFontHeightForString(String str, PDFont font, float fontSize) throws IOException {
- return font.getBoundingBox().getHeight() / PDF_PIXEL_SIZE * fontSize;
- }
-
public static float getFontWidth(String str, PDFont font, float fontSize) throws IOException {
return font.getStringWidth(str) / PDF_PIXEL_SIZE * fontSize;
}
[camel] 16/21: (chores) camel-quickfix: removed unused parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ebda5e9738bd13086ae736a850f8ea0aa97df136
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sun Jun 19 11:32:54 2022 +0200
(chores) camel-quickfix: removed unused parameters
---
.../resources/org/apache/camel/component/quickfixj/quickfix.json | 4 ++--
.../org/apache/camel/component/quickfixj/MessageCorrelator.java | 6 +++---
.../org/apache/camel/component/quickfixj/QuickfixjProducer.java | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/components/camel-quickfix/src/generated/resources/org/apache/camel/component/quickfixj/quickfix.json b/components/camel-quickfix/src/generated/resources/org/apache/camel/component/quickfixj/quickfix.json
index 4710ead1666..fa422bb4cee 100644
--- a/components/camel-quickfix/src/generated/resources/org/apache/camel/component/quickfixj/quickfix.json
+++ b/components/camel-quickfix/src/generated/resources/org/apache/camel/component/quickfixj/quickfix.json
@@ -40,9 +40,9 @@
"configurationName": { "kind": "path", "displayName": "Configuration Name", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Path to the quickfix configuration file. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the configuration file using these protocols (classpath is default). ref will lookup [...]
"lazyCreateEngine": { "kind": "parameter", "displayName": "Lazy Create Engine", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "This option allows creating QuickFIX\/J engine on demand. Value true means the engine is started when first message is send or there's consumer configured in route definition. When false value is used, the engine is st [...]
"sessionID": { "kind": "parameter", "displayName": "Session ID", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The optional sessionID identifies a specific FIX session. The format of the sessionID is: (BeginString):(SenderCompID)\/(SenderSubID)\/(SenderLocationID)-(TargetCompID)\/(TargetSubID)\/(TargetLocationID)" },
- "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now [...]
+ "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a m [...]
"exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
- "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may other [...]
+ "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
}
}
diff --git a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/MessageCorrelator.java b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/MessageCorrelator.java
index c1cb13614d8..9ca073db44e 100644
--- a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/MessageCorrelator.java
+++ b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/MessageCorrelator.java
@@ -31,10 +31,10 @@ public class MessageCorrelator implements QuickfixjEventListener {
public static final long DEFAULT_CORRELATION_TIMEOUT = 1000L;
private final List<MessageCorrelationRule> rules = new CopyOnWriteArrayList<>();
- public Callable<Message> getReply(SessionID sessionID, Exchange exchange) {
+ public Callable<Message> getReply(Exchange exchange) {
MessagePredicate messageCriteria = (MessagePredicate) exchange.getProperty(QuickfixjProducer.CORRELATION_CRITERIA_KEY);
- final MessageCorrelationRule correlationRule = new MessageCorrelationRule(exchange, sessionID, messageCriteria);
+ final MessageCorrelationRule correlationRule = new MessageCorrelationRule(exchange, messageCriteria);
rules.add(correlationRule);
final long timeout = exchange.getProperty(
@@ -72,7 +72,7 @@ public class MessageCorrelator implements QuickfixjEventListener {
private Message replyMessage;
- MessageCorrelationRule(Exchange exchange, SessionID sessionID, MessagePredicate messageCriteria) {
+ MessageCorrelationRule(Exchange exchange, MessagePredicate messageCriteria) {
this.exchange = exchange;
this.messageCriteria = messageCriteria;
}
diff --git a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjProducer.java b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjProducer.java
index 485bbfc627c..bd7335c887d 100644
--- a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjProducer.java
+++ b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjProducer.java
@@ -83,7 +83,7 @@ public class QuickfixjProducer extends DefaultProducer {
if (exchange.getPattern().isOutCapable()) {
MessageCorrelator messageCorrelator = getEndpoint().getEngine().getMessageCorrelator();
- callable = messageCorrelator.getReply(getEndpoint().getSID(), exchange);
+ callable = messageCorrelator.getReply(exchange);
}
if (!session.send(message)) {
[camel] 03/21: (chores) camel-huaweicloud-common: removed unused code
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ef7cd5e9480b1eb5c1253d83c30cbf7098878a6d
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sun Jun 19 11:07:00 2022 +0200
(chores) camel-huaweicloud-common: removed unused code
---
.../camel/component/huaweicloud/common/models/ServiceKeys.java | 5 -----
1 file changed, 5 deletions(-)
diff --git a/components/camel-huawei/camel-huaweicloud-common/src/main/java/org/apache/camel/component/huaweicloud/common/models/ServiceKeys.java b/components/camel-huawei/camel-huaweicloud-common/src/main/java/org/apache/camel/component/huaweicloud/common/models/ServiceKeys.java
index ac03a914c34..8ac87743872 100644
--- a/components/camel-huawei/camel-huaweicloud-common/src/main/java/org/apache/camel/component/huaweicloud/common/models/ServiceKeys.java
+++ b/components/camel-huawei/camel-huaweicloud-common/src/main/java/org/apache/camel/component/huaweicloud/common/models/ServiceKeys.java
@@ -28,11 +28,6 @@ public class ServiceKeys {
this.secretKey = secretKey;
}
- public ServiceKeys(String accessKey, String secretKey, String projectId) {
- this.accessKey = accessKey;
- this.secretKey = secretKey;
- }
-
public String getAccessKey() {
return accessKey;
}
[camel] 08/21: (chores) camel-joor: removed unused parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c8761b42bcc4c38e939436fba5a1d253b8f091fa
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sun Jun 19 11:17:08 2022 +0200
(chores) camel-joor: removed unused parameters
---
.../src/main/java/org/apache/camel/language/joor/JoorLanguage.java | 2 +-
.../java/org/apache/camel/language/joor/JoorScriptingCompiler.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorLanguage.java b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorLanguage.java
index 696e4a47eb0..c72d19b7293 100644
--- a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorLanguage.java
+++ b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorLanguage.java
@@ -89,7 +89,7 @@ public class JoorLanguage extends LanguageSupport implements ScriptingLanguage,
@SuppressWarnings("unchecked")
public <T> T evaluate(String script, Map<String, Object> bindings, Class<T> resultType) {
Object out;
- JoorScriptingMethod target = scriptingCompiler.compile(getCamelContext(), script, bindings, resultType, singleQuotes);
+ JoorScriptingMethod target = scriptingCompiler.compile(getCamelContext(), script, bindings, singleQuotes);
try {
out = target.evaluate(bindings);
} catch (Exception e) {
diff --git a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorScriptingCompiler.java b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorScriptingCompiler.java
index 10bbca21432..5e5a9252fbf 100644
--- a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorScriptingCompiler.java
+++ b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorScriptingCompiler.java
@@ -72,12 +72,12 @@ public class JoorScriptingCompiler extends ServiceSupport implements StaticServi
}
public JoorScriptingMethod compile(
- CamelContext camelContext, String script, Map<String, Object> bindings, Class<?> resultType, boolean singleQuotes) {
+ CamelContext camelContext, String script, Map<String, Object> bindings, boolean singleQuotes) {
StopWatch watch = new StopWatch();
JoorScriptingMethod answer;
String className = nextFQN();
- String code = evalCode(camelContext, className, script, bindings, resultType, singleQuotes);
+ String code = evalCode(camelContext, className, script, bindings, singleQuotes);
try {
if (LOG.isDebugEnabled()) {
LOG.debug("Compiling code:\n\n{}\n", code);
@@ -96,7 +96,7 @@ public class JoorScriptingCompiler extends ServiceSupport implements StaticServi
@SuppressWarnings("unchecked")
public String evalCode(
- CamelContext camelContext, String fqn, String script, Map<String, Object> bindings, Class<?> resultType,
+ CamelContext camelContext, String fqn, String script, Map<String, Object> bindings,
boolean singleQuotes) {
String qn = fqn.substring(0, fqn.lastIndexOf('.'));
String name = fqn.substring(fqn.lastIndexOf('.') + 1);
[camel] 05/21: (chores) camel-jetty-common: removed unused parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3eb152616e3dc77eaf97188c09f7ff9a69e0c4b3
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sun Jun 19 11:14:00 2022 +0200
(chores) camel-jetty-common: removed unused parameters
---
.../main/java/org/apache/camel/component/jetty/JettyHttpComponent.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index b9f2f22c793..c69a50c96ae 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -693,7 +693,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent
// ignore
} catch (IllegalArgumentException e) {
// ignore
- } catch (gIllegalAccessException e) {
+ } catch (IllegalAccessException e) {
// ignore
} catch (InvocationTargetException e) {
// ignore
[camel] 02/21: (chores) camel-google-calendar: removed unused code
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 80c3160813699d596b23391d497cae653d751504
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sun Jun 19 11:05:19 2022 +0200
(chores) camel-google-calendar: removed unused code
---
.../google/calendar/GoogleCalendarEndpointConfigurer.java | 2 +-
.../apache/camel/component/google/calendar/google-calendar.json | 4 ++--
.../component/google/calendar/stream/google-calendar-stream.json | 2 +-
.../google/calendar/BatchGoogleCalendarClientFactory.java | 8 ++------
4 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointConfigurer.java b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointConfigurer.java
index 963391ef856..9386a170d5d 100644
--- a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointConfigurer.java
+++ b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointConfigurer.java
@@ -27,8 +27,8 @@ public class GoogleCalendarEndpointConfigurer extends PropertyConfigurerSupport
map.put("delegate", java.lang.String.class);
map.put("inBody", java.lang.String.class);
map.put("scopes", java.util.List.class);
- map.put("sendEmptyMessageWhenIdle", boolean.class);
map.put("bridgeErrorHandler", boolean.class);
+ map.put("sendEmptyMessageWhenIdle", boolean.class);
map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
map.put("pollStrategy", org.apache.camel.spi.PollingConsumerPollStrategy.class);
diff --git a/components/camel-google/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/google-calendar.json b/components/camel-google/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/google-calendar.json
index e1323d914b0..3a30ea0b2dd 100644
--- a/components/camel-google/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/google-calendar.json
+++ b/components/camel-google/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/google-calendar.json
@@ -48,12 +48,12 @@
"delegate": { "kind": "parameter", "displayName": "Delegate", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.calendar.GoogleCalendarConfiguration", "configurationField": "configuration", "description": "Delegate for wide-domain service account" },
"inBody": { "kind": "parameter", "displayName": "In Body", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the name of a parameter to be passed in the exchange In Body" },
"scopes": { "kind": "parameter", "displayName": "Scopes", "group": "common", "label": "", "required": false, "type": "array", "javaType": "java.util.List<java.lang.String>", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "https:\/\/www.googleapis.com\/auth\/calendar", "configurationClass": "org.apache.camel.component.google.calendar.GoogleCalendarConfiguration", "configurationField": "configuration", "description": "Specifies the level of permissions you wa [...]
+ "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a m [...]
"sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send Empty Message When Idle", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead." },
- "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now [...]
"exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
"pollStrategy": { "kind": "parameter", "displayName": "Poll Strategy", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.PollingConsumerPollStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation [...]
- "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may other [...]
+ "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
"backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
"backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
"backoffMultiplier": { "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening agai [...]
diff --git a/components/camel-google/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/stream/google-calendar-stream.json b/components/camel-google/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/stream/google-calendar-stream.json
index b297b3360f0..df5901a5fc7 100644
--- a/components/camel-google/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/stream/google-calendar-stream.json
+++ b/components/camel-google/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/stream/google-calendar-stream.json
@@ -50,6 +50,7 @@
"properties": {
"index": { "kind": "path", "displayName": "Index", "group": "consumer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Specifies an index for the endpoint" },
"applicationName": { "kind": "parameter", "displayName": "Application Name", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Google Calendar application name. Example would be camel-google-calendar\/1.0" },
+ "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a m [...]
"calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "primary", "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "The calendarId to be used" },
"clientId": { "kind": "parameter", "displayName": "Client Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Client ID of the calendar application" },
"considerLastUpdate": { "kind": "parameter", "displayName": "Consider Last Update", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Take into account the lastUpdate of the last event polled as sta [...]
@@ -60,7 +61,6 @@
"scopes": { "kind": "parameter", "displayName": "Scopes", "group": "consumer", "label": "", "required": false, "type": "array", "javaType": "java.util.List<java.lang.String>", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Specifies the level of permissions you want a calendar application to have to a user accou [...]
"sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send Empty Message When Idle", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead." },
"syncFlow": { "kind": "parameter", "displayName": "Sync Flow", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Sync events, see https:\/\/developers.google.com\/calendar\/v3\/sync Note: not compat [...]
- "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now [...]
"exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
"pollStrategy": { "kind": "parameter", "displayName": "Poll Strategy", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.PollingConsumerPollStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation [...]
diff --git a/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/BatchGoogleCalendarClientFactory.java b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/BatchGoogleCalendarClientFactory.java
index 784c33fed40..6490afcc74c 100644
--- a/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/BatchGoogleCalendarClientFactory.java
+++ b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/BatchGoogleCalendarClientFactory.java
@@ -30,12 +30,8 @@ import com.google.api.services.calendar.Calendar;
import org.apache.camel.CamelContext;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.support.ResourceHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class BatchGoogleCalendarClientFactory implements GoogleCalendarClientFactory {
-
- private static final Logger LOG = LoggerFactory.getLogger(BatchGoogleCalendarClientFactory.class);
private NetHttpTransport transport;
private JacksonFactory jsonFactory;
@@ -64,7 +60,7 @@ public class BatchGoogleCalendarClientFactory implements GoogleCalendarClientFac
if (serviceAccount) {
credential = authorizeServiceAccount(emailAddress, p12FileName, scopes, user);
} else {
- credential = authorize(clientId, clientSecret, scopes);
+ credential = authorize(clientId, clientSecret);
if (refreshToken != null && !"".equals(refreshToken)) {
credential.setRefreshToken(refreshToken);
}
@@ -79,7 +75,7 @@ public class BatchGoogleCalendarClientFactory implements GoogleCalendarClientFac
}
// Authorizes the installed application to access user's protected data.
- private Credential authorize(String clientId, String clientSecret, Collection<String> scopes) {
+ private Credential authorize(String clientId, String clientSecret) {
// authorize
return new GoogleCredential.Builder()
.setJsonFactory(jsonFactory)
[camel] 06/21: (chores) camel-jgroups-raft: removed unused parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0a097e99bcc4d27315c05cb3e2173b9e16783fc9
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sun Jun 19 11:15:31 2022 +0200
(chores) camel-jgroups-raft: removed unused parameters
---
.../org/apache/camel/component/jgroups/raft/jgroups-raft.json | 4 ++--
.../org/apache/camel/component/jgroups/raft/JGroupsRaftComponent.java | 2 +-
.../org/apache/camel/component/jgroups/raft/JGroupsRaftEndpoint.java | 4 +---
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/components/camel-jgroups-raft/src/generated/resources/org/apache/camel/component/jgroups/raft/jgroups-raft.json b/components/camel-jgroups-raft/src/generated/resources/org/apache/camel/component/jgroups/raft/jgroups-raft.json
index 5e753b976b0..30c536b918a 100644
--- a/components/camel-jgroups-raft/src/generated/resources/org/apache/camel/component/jgroups/raft/jgroups-raft.json
+++ b/components/camel-jgroups-raft/src/generated/resources/org/apache/camel/component/jgroups/raft/jgroups-raft.json
@@ -47,10 +47,10 @@
},
"properties": {
"clusterName": { "kind": "path", "displayName": "Cluster Name", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The name of the JGroupsraft cluster the component should connect to." },
+ "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a m [...]
"enableRoleChangeEvents": { "kind": "parameter", "displayName": "Enable Role Change Events", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If set to true, the consumer endpoint will receive roleChange event as well (not just connecting and\/or using the state machine). By default it is set to false." },
- "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now [...]
"exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
- "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may other [...]
+ "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
}
}
diff --git a/components/camel-jgroups-raft/src/main/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponent.java b/components/camel-jgroups-raft/src/main/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponent.java
index a9309fdd6f5..0510241c36a 100644
--- a/components/camel-jgroups-raft/src/main/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponent.java
+++ b/components/camel-jgroups-raft/src/main/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponent.java
@@ -53,7 +53,7 @@ public class JGroupsRaftComponent extends DefaultComponent {
@Override
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) {
return new JGroupsRaftEndpoint(
- uri, remaining, this, remaining, parameters, raftId, channelProperties, stateMachine, raftHandle);
+ uri, remaining, this, raftId, channelProperties, stateMachine, raftHandle);
}
public RaftHandle getRaftHandle() {
diff --git a/components/camel-jgroups-raft/src/main/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpoint.java b/components/camel-jgroups-raft/src/main/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpoint.java
index 8dba7752983..644e1ecb8bb 100644
--- a/components/camel-jgroups-raft/src/main/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpoint.java
+++ b/components/camel-jgroups-raft/src/main/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpoint.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.jgroups.raft;
-import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.Category;
@@ -58,8 +57,7 @@ public class JGroupsRaftEndpoint extends DefaultEndpoint {
@UriParam(label = "consumer", defaultValue = "false")
private boolean enableRoleChangeEvents;
- public JGroupsRaftEndpoint(String endpointUri, String clusterName, Component component, String remaining,
- Map<String, Object> parameters,
+ public JGroupsRaftEndpoint(String endpointUri, String clusterName, Component component,
String raftId, String channelProperties, StateMachine stateMachine, RaftHandle raftHandle) {
super(endpointUri, component);
this.clusterName = clusterName;
[camel] 21/21: (chores) camel-package-maven-plugin: removed unused parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 21200b3cb9743f4a4068c128aff312eb9afed6fb
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sun Jun 19 11:56:42 2022 +0200
(chores) camel-package-maven-plugin: removed unused parameters
---
.../org/apache/camel/maven/packaging/EndpointDslMojo.java | 4 ++--
.../org/apache/camel/maven/packaging/UpdateReadmeMojo.java | 13 ++++++-------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index b857b49c94c..9708ae905ff 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -199,12 +199,12 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
overrideComponentName = model.getArtifactId().replace("camel-", "");
}
- createEndpointDsl(model, compModels, overrideComponentName);
+ createEndpointDsl(model, compModels);
}
}
}
- private void createEndpointDsl(ComponentModel model, List<ComponentModel> aliases, String overrideComponentName)
+ private void createEndpointDsl(ComponentModel model, List<ComponentModel> aliases)
throws MojoFailureException {
List<Method> staticBuilders = new ArrayList<>();
boolean updated = doCreateEndpointDsl(model, aliases, staticBuilders);
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
index 768d87938de..650e6d39734 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
@@ -178,7 +178,7 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo {
String title = asComponentTitle(model.getScheme(), model.getTitle());
model.setTitle(title);
- boolean updated = updateHeader(componentName, file, model, " Component", kind);
+ boolean updated = updateHeader(componentName, file, model, " Component");
checkComponentHeader(file);
checkSince(file);
@@ -234,7 +234,7 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo {
File file = new File(componentDocDir, componentName + ".adoc");
boolean exists = file.exists();
- boolean updated = updateHeader(componentName, file, model, " Component", kind);
+ boolean updated = updateHeader(componentName, file, model, " Component");
checkSince(file);
if (updated) {
@@ -289,7 +289,7 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo {
model.setTitle(title);
boolean exists = file.exists();
- boolean updated = updateHeader(dataFormatName, file, model, " DataFormat", kind);
+ boolean updated = updateHeader(dataFormatName, file, model, " DataFormat");
checkSince(file);
String options = evaluateTemplate("dataformat-options.mvel", model);
@@ -354,7 +354,7 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo {
LanguageModel model = JsonMapper.generateLanguageModel(json);
- boolean updated = updateHeader(languageName, file, model, " Language", kind);
+ boolean updated = updateHeader(languageName, file, model, " Language");
checkSince(file);
String options = evaluateTemplate("language-options.mvel", model);
@@ -416,7 +416,7 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo {
File file = new File(eipDocDir, eipName + "-" + kind + ".adoc");
boolean exists = file.exists();
- boolean updated = updateHeader(eipName, file, model, " EIP", kind);
+ boolean updated = updateHeader(eipName, file, model, " EIP");
String options = evaluateTemplate("eip-options.mvel", model);
updated |= updateOptionsIn(file, kind, options);
@@ -471,8 +471,7 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo {
}
private boolean updateHeader(
- String name, final File file, final BaseModel<? extends BaseOptionModel> model, String titleSuffix,
- String kind)
+ String name, final File file, final BaseModel<? extends BaseOptionModel> model, String titleSuffix)
throws MojoExecutionException {
if (getLog().isDebugEnabled()) {
getLog().debug("updateHeader " + file);
[camel] 15/21: (chores) camel-printer: fix sub-expression assigment
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a0ca6807d7d1559d533c96b43602585479f18d63
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sun Jun 19 11:27:55 2022 +0200
(chores) camel-printer: fix sub-expression assigment
---
.../org/apache/camel/component/printer/DocFlavorAssigner.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/components/camel-printer/src/main/java/org/apache/camel/component/printer/DocFlavorAssigner.java b/components/camel-printer/src/main/java/org/apache/camel/component/printer/DocFlavorAssigner.java
index 3f1aee3ac55..b7235442540 100644
--- a/components/camel-printer/src/main/java/org/apache/camel/component/printer/DocFlavorAssigner.java
+++ b/components/camel-printer/src/main/java/org/apache/camel/component/printer/DocFlavorAssigner.java
@@ -248,14 +248,17 @@ public class DocFlavorAssigner {
}
public DocFlavor forMimeTypePAGEABLE() {
- return d = DocFlavor.SERVICE_FORMATTED.PAGEABLE;
+ d = DocFlavor.SERVICE_FORMATTED.PAGEABLE;
+ return d;
}
public DocFlavor forMimeTypePRINTABLE() {
- return d = DocFlavor.SERVICE_FORMATTED.PRINTABLE;
+ d = DocFlavor.SERVICE_FORMATTED.PRINTABLE;
+ return d;
}
public DocFlavor forMimeTypeRENDERABLEIMAGE() {
- return d = DocFlavor.SERVICE_FORMATTED.RENDERABLE_IMAGE;
+ d = DocFlavor.SERVICE_FORMATTED.RENDERABLE_IMAGE;
+ return d;
}
}
[camel] 18/21: (chores) camel-servicenow: removed unused code and parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b5690258e33395bb62926551353f48897e9a6e7d
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sun Jun 19 11:44:55 2022 +0200
(chores) camel-servicenow: removed unused code and parameters
---
.../org/apache/camel/component/servicenow/servicenow.json | 2 +-
.../camel/component/servicenow/ServiceNowClient.java | 14 ++++++--------
.../releases/fuji/FujiServiceNowAggregateProcessor.java | 4 ++--
.../releases/fuji/FujiServiceNowImportSetProcessor.java | 4 ++--
.../releases/fuji/FujiServiceNowTableProcessor.java | 8 ++++----
5 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/components/camel-servicenow/camel-servicenow-component/src/generated/resources/org/apache/camel/component/servicenow/servicenow.json b/components/camel-servicenow/camel-servicenow-component/src/generated/resources/org/apache/camel/component/servicenow/servicenow.json
index 854b35f37e6..e8c20c570c7 100644
--- a/components/camel-servicenow/camel-servicenow-component/src/generated/resources/org/apache/camel/component/servicenow/servicenow.json
+++ b/components/camel-servicenow/camel-servicenow-component/src/generated/resources/org/apache/camel/component/servicenow/servicenow.json
@@ -150,6 +150,7 @@
"includeScores": { "kind": "parameter", "displayName": "Include Scores", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.servicenow.ServiceNowConfiguration", "configurationField": "configuration", "description": "Set this parameter to true to return all scores for a scorecard. If a value is not specified, this parameter d [...]
"inputDisplayValue": { "kind": "parameter", "displayName": "Input Display Value", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.servicenow.ServiceNowConfiguration", "configurationField": "configuration", "description": "True to set raw value of input fields (default: false)" },
"key": { "kind": "parameter", "displayName": "Key", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.servicenow.ServiceNowConfiguration", "configurationField": "configuration", "description": "Set this parameter to true to return only scorecards for key indicators." },
+ "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
"models": { "kind": "parameter", "displayName": "Models", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Class<java.lang.Object>>", "prefix": "model.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.servicenow.ServiceNowConfiguration", "configurationField": "configuration", "description": "Defines both request and response models" },
"perPage": { "kind": "parameter", "displayName": "Per Page", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "10", "configurationClass": "org.apache.camel.component.servicenow.ServiceNowConfiguration", "configurationField": "configuration", "description": "Enter the maximum number of scorecards each query can return. By default this value is 10, and the m [...]
"release": { "kind": "parameter", "displayName": "Release", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.servicenow.ServiceNowRelease", "enum": [ "FUJI", "GENEVA", "HELSINKI" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "HELSINKI", "configurationClass": "org.apache.camel.component.servicenow.ServiceNowConfiguration", "configurationField": "configuration", "description": "The ServiceNow r [...]
@@ -163,7 +164,6 @@
"table": { "kind": "parameter", "displayName": "Table", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.servicenow.ServiceNowConfiguration", "configurationField": "configuration", "description": "The default table, can be overridden by header CamelServiceNowTable" },
"target": { "kind": "parameter", "displayName": "Target", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.servicenow.ServiceNowConfiguration", "configurationField": "configuration", "description": "Set this parameter to true to return only scorecards that have a target." },
"topLevelOnly": { "kind": "parameter", "displayName": "Top Level Only", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.servicenow.ServiceNowConfiguration", "configurationField": "configuration", "description": "Gets only those categories whose parent is a catalog." },
- "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may other [...]
"apiVersion": { "kind": "parameter", "displayName": "Api Version", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.servicenow.ServiceNowConfiguration", "configurationField": "configuration", "description": "The ServiceNow REST API version, default latest" },
"dateFormat": { "kind": "parameter", "displayName": "Date Format", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "yyyy-MM-dd", "configurationClass": "org.apache.camel.component.servicenow.ServiceNowConfiguration", "configurationField": "configuration", "description": "The date format used for Json serialization\/deserialization" },
"dateTimeFormat": { "kind": "parameter", "displayName": "Date Time Format", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "yyyy-MM-dd HH:mm:ss", "configurationClass": "org.apache.camel.component.servicenow.ServiceNowConfiguration", "configurationField": "configuration", "description": "The date-time format used for Json serialization\/deserialization" },
diff --git a/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/ServiceNowClient.java b/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/ServiceNowClient.java
index 27164af9182..4a652c8a62e 100644
--- a/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/ServiceNowClient.java
+++ b/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/ServiceNowClient.java
@@ -45,12 +45,10 @@ import org.slf4j.LoggerFactory;
public final class ServiceNowClient {
private static final Logger LOGGER = LoggerFactory.getLogger(ServiceNowClient.class);
- private final CamelContext camelContext;
private final ServiceNowConfiguration configuration;
private final WebClient client;
public ServiceNowClient(CamelContext camelContext, ServiceNowConfiguration configuration) {
- this.camelContext = camelContext;
this.configuration = configuration;
this.client = WebClient.create(
configuration.getApiUrl(),
@@ -59,10 +57,10 @@ public final class ServiceNowClient {
new JacksonJsonProvider(configuration.getOrCreateMapper())),
true);
- configureRequestContext(camelContext, configuration, client);
+ configureRequestContext(client);
configureTls(camelContext, configuration, client);
- configureHttpClientPolicy(camelContext, configuration, client);
- configureProxyAuthorizationPolicy(camelContext, configuration, client);
+ configureHttpClientPolicy(configuration, client);
+ configureProxyAuthorizationPolicy(configuration, client);
}
public ServiceNowClient types(MediaType type) {
@@ -206,7 +204,7 @@ public final class ServiceNowClient {
}
private static void configureRequestContext(
- CamelContext context, ServiceNowConfiguration configuration, WebClient client) {
+ WebClient client) {
WebClient.getConfig(client)
.getRequestContext()
@@ -236,7 +234,7 @@ public final class ServiceNowClient {
}
private static void configureHttpClientPolicy(
- CamelContext context, ServiceNowConfiguration configuration, WebClient client) {
+ ServiceNowConfiguration configuration, WebClient client) {
HTTPClientPolicy httpPolicy = configuration.getHttpClientPolicy();
if (httpPolicy == null) {
@@ -256,7 +254,7 @@ public final class ServiceNowClient {
}
private static void configureProxyAuthorizationPolicy(
- CamelContext context, ServiceNowConfiguration configuration, WebClient client) {
+ ServiceNowConfiguration configuration, WebClient client) {
ProxyAuthorizationPolicy proxyPolicy = configuration.getProxyAuthorizationPolicy();
if (proxyPolicy == null) {
diff --git a/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/releases/fuji/FujiServiceNowAggregateProcessor.java b/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/releases/fuji/FujiServiceNowAggregateProcessor.java
index 2a3b0491fd5..1c76326f94d 100644
--- a/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/releases/fuji/FujiServiceNowAggregateProcessor.java
+++ b/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/releases/fuji/FujiServiceNowAggregateProcessor.java
@@ -40,7 +40,7 @@ class FujiServiceNowAggregateProcessor extends FujiServiceNowProcessor {
throws Exception {
Response response;
if (ObjectHelper.equal(ServiceNowConstants.ACTION_RETRIEVE, action, true)) {
- response = retrieveStats(exchange.getIn(), requestModel, responseModel, tableName);
+ response = retrieveStats(exchange.getIn(), responseModel, tableName);
} else {
throw new IllegalArgumentException("Unknown action " + action);
}
@@ -48,7 +48,7 @@ class FujiServiceNowAggregateProcessor extends FujiServiceNowProcessor {
setBodyAndHeaders(exchange.getIn(), responseModel, response);
}
- private Response retrieveStats(Message in, Class<?> requestModel, Class<?> responseModel, String tableName)
+ private Response retrieveStats(Message in, Class<?> responseModel, String tableName)
throws Exception {
final String apiVersion = getApiVersion(in);
diff --git a/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/releases/fuji/FujiServiceNowImportSetProcessor.java b/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/releases/fuji/FujiServiceNowImportSetProcessor.java
index fb43991afd6..61666c0eff7 100644
--- a/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/releases/fuji/FujiServiceNowImportSetProcessor.java
+++ b/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/releases/fuji/FujiServiceNowImportSetProcessor.java
@@ -39,7 +39,7 @@ class FujiServiceNowImportSetProcessor extends FujiServiceNowProcessor {
throws Exception {
Response response;
if (ObjectHelper.equal(ServiceNowConstants.ACTION_RETRIEVE, action, true)) {
- response = retrieveRecord(exchange.getIn(), requestModel, responseModel, apiVersion, tableName, sysId);
+ response = retrieveRecord(responseModel, apiVersion, tableName, sysId);
} else if (ObjectHelper.equal(ServiceNowConstants.ACTION_CREATE, action, true)) {
response = createRecord(exchange.getIn(), requestModel, responseModel, apiVersion, tableName);
} else {
@@ -54,7 +54,7 @@ class FujiServiceNowImportSetProcessor extends FujiServiceNowProcessor {
* https://instance.service-now.com/api/now/import/{tableName}/{sys_id}
*/
private Response retrieveRecord(
- Message in, Class<?> requestModel, Class<?> responseModel, String apiVersion, String tableName, String sysId)
+ Class<?> responseModel, String apiVersion, String tableName, String sysId)
throws Exception {
return client.reset()
.types(MediaType.APPLICATION_JSON_TYPE)
diff --git a/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/releases/fuji/FujiServiceNowTableProcessor.java b/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/releases/fuji/FujiServiceNowTableProcessor.java
index 4ff845e8d0c..eee60d3766c 100644
--- a/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/releases/fuji/FujiServiceNowTableProcessor.java
+++ b/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/releases/fuji/FujiServiceNowTableProcessor.java
@@ -39,13 +39,13 @@ class FujiServiceNowTableProcessor extends FujiServiceNowProcessor {
throws Exception {
Response response;
if (ObjectHelper.equal(ServiceNowConstants.ACTION_RETRIEVE, action, true)) {
- response = retrieveRecord(exchange.getIn(), requestModel, responseModel, apiVersion, tableName, sysId);
+ response = retrieveRecord(exchange.getIn(), responseModel, apiVersion, tableName, sysId);
} else if (ObjectHelper.equal(ServiceNowConstants.ACTION_CREATE, action, true)) {
response = createRecord(exchange.getIn(), requestModel, responseModel, apiVersion, tableName);
} else if (ObjectHelper.equal(ServiceNowConstants.ACTION_MODIFY, action, true)) {
response = modifyRecord(exchange.getIn(), requestModel, responseModel, apiVersion, tableName, sysId);
} else if (ObjectHelper.equal(ServiceNowConstants.ACTION_DELETE, action, true)) {
- response = deleteRecord(exchange.getIn(), requestModel, responseModel, apiVersion, tableName, sysId);
+ response = deleteRecord(responseModel, apiVersion, tableName, sysId);
} else if (ObjectHelper.equal(ServiceNowConstants.ACTION_UPDATE, action, true)) {
response = updateRecord(exchange.getIn(), requestModel, responseModel, apiVersion, tableName, sysId);
} else {
@@ -61,7 +61,7 @@ class FujiServiceNowTableProcessor extends FujiServiceNowProcessor {
* https://instance.service-now.com/api/now/table/{tableName}/{sys_id}
*/
private Response retrieveRecord(
- Message in, Class<?> requestModel, Class<?> responseModel, String apiVersion, String tableName, String sysId)
+ Message in, Class<?> responseModel, String apiVersion, String tableName, String sysId)
throws Exception {
return ObjectHelper.isEmpty(sysId)
? client.reset()
@@ -147,7 +147,7 @@ class FujiServiceNowTableProcessor extends FujiServiceNowProcessor {
* https://instance.service-now.com/api/now/table/{tableName}/{sys_id}
*/
private Response deleteRecord(
- Message in, Class<?> requestModel, Class<?> responseModel, String apiVersion, String tableName, String sysId)
+ Class<?> responseModel, String apiVersion, String tableName, String sysId)
throws Exception {
return client.reset()
.types(MediaType.APPLICATION_JSON_TYPE)
[camel] 04/21: (chores) camel-huaweicloud-common: removed unused parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4c01428df68e6f5aa305d3ac29f75f9615b1e73a
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sun Jun 19 11:13:39 2022 +0200
(chores) camel-huaweicloud-common: removed unused parameters
---
.../apache/camel/component/jetty/JettyHttpComponent.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index b51044cae3a..b9f2f22c793 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -366,11 +366,11 @@ public abstract class JettyHttpComponent extends HttpCommonComponent
}
if (endpoint.isEnableMultipartFilter()) {
- enableMultipartFilter(endpoint, connectorRef.server, connectorKey);
+ enableMultipartFilter(endpoint, connectorRef.server);
}
if (endpoint.getFilters() != null && !endpoint.getFilters().isEmpty()) {
- setFilters(endpoint, connectorRef.server, connectorKey);
+ setFilters(endpoint, connectorRef.server);
}
connectorRef.servlet.connect(consumer);
}
@@ -400,7 +400,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent
}
}
- private void setFilters(JettyHttpEndpoint endpoint, Server server, String connectorKey) {
+ private void setFilters(JettyHttpEndpoint endpoint, Server server) {
ServletContextHandler context = server.getChildHandlerByClass(ServletContextHandler.class);
List<Filter> filters = endpoint.getFilters();
for (Filter filter : filters) {
@@ -424,7 +424,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent
context.getServletHandler().addFilterWithMapping(filterHolder, pathSpec, 0);
}
- private void enableMultipartFilter(HttpCommonEndpoint endpoint, Server server, String connectorKey) throws Exception {
+ private void enableMultipartFilter(HttpCommonEndpoint endpoint, Server server) throws Exception {
ServletContextHandler context = server.getChildHandlerByClass(ServletContextHandler.class);
CamelContext camelContext = this.getCamelContext();
FilterHolder filterHolder = new FilterHolder();
@@ -693,7 +693,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent
// ignore
} catch (IllegalArgumentException e) {
// ignore
- } catch (IllegalAccessException e) {
+ } catch (gIllegalAccessException e) {
// ignore
} catch (InvocationTargetException e) {
// ignore
@@ -1046,7 +1046,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent
CamelContext camelContext, Processor processor, String verb, String basePath, String uriTemplate,
String consumes, String produces, RestConfiguration configuration, Map<String, Object> parameters)
throws Exception {
- return doCreateConsumer(camelContext, processor, verb, basePath, uriTemplate, consumes, produces, configuration,
+ return doCreateConsumer(camelContext, processor, verb, basePath, uriTemplate, configuration,
parameters, false);
}
@@ -1056,12 +1056,12 @@ public abstract class JettyHttpComponent extends HttpCommonComponent
RestConfiguration configuration, Map<String, Object> parameters)
throws Exception {
// reuse the createConsumer method we already have. The api need to use GET and match on uri prefix
- return doCreateConsumer(camelContext, processor, "GET", contextPath, null, null, null, configuration, parameters, true);
+ return doCreateConsumer(camelContext, processor, "GET", contextPath, null, configuration, parameters, true);
}
Consumer doCreateConsumer(
CamelContext camelContext, Processor processor, String verb, String basePath, String uriTemplate,
- String consumes, String produces, RestConfiguration configuration, Map<String, Object> parameters, boolean api)
+ RestConfiguration configuration, Map<String, Object> parameters, boolean api)
throws Exception {
String path = basePath;
[camel] 20/21: (chores) camel-zipkin: fixed incorrect log marker usage
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e5224a056a99a06fafab1f4f72c231468e4270fe
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sun Jun 19 11:49:39 2022 +0200
(chores) camel-zipkin: fixed incorrect log marker usage
---
.../src/main/java/org/apache/camel/zipkin/ZipkinTracer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java
index 7d60ad1980b..6934986f285 100644
--- a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java
+++ b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java
@@ -601,7 +601,7 @@ public class ZipkinTracer extends ServiceSupport implements RoutePolicyFactory,
brave = braves.get(serviceName);
if (brave == null && useFallbackServiceNames) {
- LOG.debug("Creating Tracing assigned to serviceName: {}", serviceName + " as fallback");
+ LOG.debug("Creating Tracing assigned to serviceName: {} as fallback", serviceName);
brave = newTracing(serviceName);
braves.put(serviceName, brave);
}
[camel] 09/21: (chores) camel-jt400: removed unused parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d904086d99810d309dd6f92536e078f7656d7215
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sun Jun 19 11:17:51 2022 +0200
(chores) camel-jt400: removed unused parameters
---
.../generated/resources/org/apache/camel/component/jt400/jt400.json | 4 ++--
.../main/java/org/apache/camel/component/jt400/Jt400PgmProducer.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/components/camel-jt400/src/generated/resources/org/apache/camel/component/jt400/jt400.json b/components/camel-jt400/src/generated/resources/org/apache/camel/component/jt400/jt400.json
index ed977a4f2d0..8c65fbb98a3 100644
--- a/components/camel-jt400/src/generated/resources/org/apache/camel/component/jt400/jt400.json
+++ b/components/camel-jt400/src/generated/resources/org/apache/camel/component/jt400/jt400.json
@@ -49,19 +49,19 @@
"guiAvailable": { "kind": "parameter", "displayName": "Gui Available", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jt400.Jt400Configuration", "configurationField": "configuration", "description": "Sets whether IBM i prompting is enabled in the environment running Camel." },
"keyed": { "kind": "parameter", "displayName": "Keyed", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jt400.Jt400Configuration", "configurationField": "configuration", "description": "Whether to use keyed or non-keyed data queues." },
"searchKey": { "kind": "parameter", "displayName": "Search Key", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jt400.Jt400Configuration", "configurationField": "configuration", "description": "Search key for keyed data queues." },
+ "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a m [...]
"messageAction": { "kind": "parameter", "displayName": "Message Action", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.jt400.Jt400Configuration.MessageAction", "enum": [ "OLD", "REMOVE", "SAME" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "OLD", "configurationClass": "org.apache.camel.component.jt400.Jt400Configuration", "configurationField": "configuration", "description": "Actio [...]
"readTimeout": { "kind": "parameter", "displayName": "Read Timeout", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 30000, "configurationClass": "org.apache.camel.component.jt400.Jt400Configuration", "configurationField": "configuration", "description": "Timeout in millis the consumer will wait while trying to read a new message of the data queue." },
"searchType": { "kind": "parameter", "displayName": "Search Type", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.jt400.Jt400Configuration.SearchType", "enum": [ "EQ", "NE", "LT", "LE", "GT", "GE" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "EQ", "configurationClass": "org.apache.camel.component.jt400.Jt400Configuration", "configurationField": "configuration", "description": "Sear [...]
"sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send Empty Message When Idle", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead." },
"sendingReply": { "kind": "parameter", "displayName": "Sending Reply", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jt400.Jt400Configuration", "configurationField": "configuration", "description": "If true, the consumer endpoint will set the Jt400Constants.MESSAGE_REPLYTO_KEY header of the camel mes [...]
- "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now [...]
"exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
"pollStrategy": { "kind": "parameter", "displayName": "Poll Strategy", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.PollingConsumerPollStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation [...]
+ "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
"outputFieldsIdxArray": { "kind": "parameter", "displayName": "Output Fields Idx Array", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Integer[]", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jt400.Jt400Configuration", "configurationField": "configuration", "description": "Specifies which fields (program parameters) are output parameters." },
"outputFieldsLengthArray": { "kind": "parameter", "displayName": "Output Fields Length Array", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Integer[]", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jt400.Jt400Configuration", "configurationField": "configuration", "description": "Specifies the fields (program parameters) length as in the IBM i program definition." },
"procedureName": { "kind": "parameter", "displayName": "Procedure Name", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jt400.Jt400Configuration", "configurationField": "configuration", "description": "Procedure name from a service program to call" },
- "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may other [...]
"backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
"backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
"backoffMultiplier": { "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening agai [...]
diff --git a/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmProducer.java b/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmProducer.java
index 045c36ee6b2..a70b9454aa7 100644
--- a/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmProducer.java
+++ b/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmProducer.java
@@ -85,7 +85,7 @@ public class Jt400PgmProducer extends DefaultProducer {
}
if (result) {
- handlePGMOutput(exchange, pgmCall, parameterList, iSeries);
+ handlePGMOutput(exchange, pgmCall, iSeries);
} else {
throw new Jt400PgmCallException(getOutputMessages(pgmCall));
}
@@ -172,7 +172,7 @@ public class Jt400PgmProducer extends DefaultProducer {
return parameterList;
}
- private void handlePGMOutput(Exchange exchange, ProgramCall pgmCall, ProgramParameter[] inputs, AS400 iSeries)
+ private void handlePGMOutput(Exchange exchange, ProgramCall pgmCall, AS400 iSeries)
throws InvalidPayloadException {
Object body = exchange.getIn().getMandatoryBody();
[camel] 19/21: (chores) camel-zipkin: removed unused parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 89716e77050e7992525307b038618ea98b180b44
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sun Jun 19 11:48:33 2022 +0200
(chores) camel-zipkin: removed unused parameters
---
.../src/main/java/org/apache/camel/zipkin/ZipkinTracer.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java
index a6e3f82f06f..7d60ad1980b 100644
--- a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java
+++ b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java
@@ -666,7 +666,7 @@ public class ZipkinTracer extends ServiceSupport implements RoutePolicyFactory,
producerComponentToSpanKind.putIfAbsent(component, kind);
}
- private void clientResponse(Tracing brave, String serviceName, ExchangeSentEvent event) {
+ private void clientResponse(String serviceName, ExchangeSentEvent event) {
Span span = null;
ExtendedExchange exchange = event.getExchange().adapt(ExtendedExchange.class);
ZipkinState state = exchange.getSafeCopyProperty(ZipkinState.KEY, ZipkinState.class);
@@ -749,7 +749,7 @@ public class ZipkinTracer extends ServiceSupport implements RoutePolicyFactory,
return consumerComponentToSpanKind.getOrDefault(getComponentName(endpoint), Span.Kind.SERVER);
}
- private void serverResponse(Tracing brave, String serviceName, Exchange exchange) {
+ private void serverResponse(String serviceName, Exchange exchange) {
Span span = null;
ExtendedExchange extendedExchange = exchange.adapt(ExtendedExchange.class);
ZipkinState state = extendedExchange.getSafeCopyProperty(ZipkinState.KEY, ZipkinState.class);
@@ -815,7 +815,7 @@ public class ZipkinTracer extends ServiceSupport implements RoutePolicyFactory,
String serviceName = getServiceName(ese.getExchange(), ese.getEndpoint(), false, true);
Tracing brave = getTracing(serviceName);
if (brave != null) {
- clientResponse(brave, serviceName, ese);
+ clientResponse(serviceName, ese);
}
}
}
@@ -863,7 +863,7 @@ public class ZipkinTracer extends ServiceSupport implements RoutePolicyFactory,
String serviceName = getServiceName(exchange, route.getEndpoint(), true, false);
Tracing brave = getTracing(serviceName);
if (brave != null) {
- serverResponse(brave, serviceName, exchange);
+ serverResponse(serviceName, exchange);
}
}
}