You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/06/23 05:05:09 UTC
[camel] branch master updated (c6d0c89 -> 9e3d24b)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from c6d0c89 Sync Properties
new eba38a5 CAMEL-15224: camel-api-component - Avoid reflection when configured nested configuration classes.
new ab98fdf Regen
new 9e3d24b CAMEL-15224: camel-api-component - Avoid reflection when configured nested configuration classes.
The 3 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:
.../camel/catalog/archetypes/archetype-catalog.xml | 36 +++++------
.../apache/camel/catalog/components/braintree.json | 2 +-
.../camel/component/olingo4/Olingo4Endpoint.java | 73 +++++++++++++++++-----
.../olingo4/AbstractOlingo4TestSupport.java | 10 +--
.../olingo4/Olingo4ComponentConsumerTest.java | 19 +++++-
.../olingo4/Olingo4ComponentProducerTest.java | 15 +++++
.../support/component/AbstractApiEndpoint.java | 1 +
.../camel/support/component/ApiConsumerHelper.java | 3 +-
.../modules/ROOT/pages/braintree-component.adoc | 2 +-
9 files changed, 115 insertions(+), 46 deletions(-)
[camel] 03/03: CAMEL-15224: camel-api-component - Avoid reflection
when configured nested configuration classes.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9e3d24b6f977091a5f2fdf3af74d6b327b29116e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jun 23 07:04:34 2020 +0200
CAMEL-15224: camel-api-component - Avoid reflection when configured nested configuration classes.
---
.../apache/camel/component/olingo4/Olingo4Endpoint.java | 15 ++++++++++++++-
.../component/olingo4/AbstractOlingo4TestSupport.java | 10 ++--------
.../component/olingo4/Olingo4ComponentConsumerTest.java | 9 ++++++---
.../component/olingo4/Olingo4ComponentProducerTest.java | 15 +++++++++++++++
4 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java
index b9e462d..9415491 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java
@@ -33,6 +33,7 @@ import org.apache.camel.component.olingo4.internal.Olingo4ApiName;
import org.apache.camel.component.olingo4.internal.Olingo4Constants;
import org.apache.camel.component.olingo4.internal.Olingo4PropertiesHelper;
import org.apache.camel.spi.PropertyConfigurer;
+import org.apache.camel.spi.PropertyConfigurerGetter;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.support.PropertyBindingSupport;
@@ -119,8 +120,20 @@ public class Olingo4Endpoint extends AbstractApiEndpoint<Olingo4ApiName, Olingo4
}
});
options.keySet().removeIf(known::containsKey);
+
+ // configure endpoint first (from the known options) and then specialized configuration class afterwards
+ PropertyConfigurer configurer = getComponent().getEndpointPropertyConfigurer();
+ if (configurer instanceof PropertyConfigurerGetter) {
+ PropertyConfigurerGetter getter = (PropertyConfigurerGetter) configurer;
+ for (String name : getter.getAllOptions(this).keySet()) {
+ if (known.containsKey(name)) {
+ Object value = known.remove(name);
+ configurer.configure(getCamelContext(), this, name, value, true);
+ }
+ };
+ }
// configure on configuration first to be reflection free
- PropertyConfigurer configurer = getCamelContext().adapt(ExtendedCamelContext.class).getConfigurerResolver().resolvePropertyConfigurer(configuration.getClass().getSimpleName(), getCamelContext());
+ configurer = getCamelContext().adapt(ExtendedCamelContext.class).getConfigurerResolver().resolvePropertyConfigurer(configuration.getClass().getSimpleName(), getCamelContext());
if (configurer != null) {
PropertyBindingSupport.build()
.withConfigurer(configurer)
diff --git a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/AbstractOlingo4TestSupport.java b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/AbstractOlingo4TestSupport.java
index 9a58826..99e302f 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/AbstractOlingo4TestSupport.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/AbstractOlingo4TestSupport.java
@@ -17,12 +17,10 @@
package org.apache.camel.component.olingo4;
import java.io.IOException;
-import java.util.HashMap;
import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
-import org.apache.camel.support.PropertyBindingSupport;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.http.HttpHost;
import org.apache.http.client.ClientProtocolException;
@@ -50,15 +48,11 @@ public class AbstractOlingo4TestSupport extends CamelTestSupport {
@Override
protected CamelContext createCamelContext() throws Exception {
-
final CamelContext context = super.createCamelContext();
- Map<String, Object> options = new HashMap<>();
- options.put("serviceUri", getRealServiceUrl(TEST_SERVICE_BASE_URL));
- options.put("contentType", "application/json;charset=utf-8");
-
final Olingo4Configuration configuration = new Olingo4Configuration();
- PropertyBindingSupport.bindProperties(context, configuration, options);
+ configuration.setServiceUri(getRealServiceUrl(TEST_SERVICE_BASE_URL));
+ configuration.setContentType("application/json;charset=utf-8");
// add OlingoComponent to Camel context
final Olingo4Component component = new Olingo4Component(context);
diff --git a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java
index 81e6024..706833e 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java
@@ -93,9 +93,8 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
}
// should be reflection free
- // TODO: We are down to 2 calls now (from unit test itself)
-// long counter = context.adapt(ExtendedCamelContext.class).getBeanIntrospection().getInvokedCounter();
-// assertEquals(0, counter);
+ long counter = context.adapt(ExtendedCamelContext.class).getBeanIntrospection().getInvokedCounter();
+ assertEquals(0, counter);
}
/**
@@ -280,6 +279,10 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
ClientProperty nameProp = ksfoEntity.getProperty("Name");
assertNotNull(nameProp);
assertEquals("San Francisco International Airport", nameProp.getValue().toString());
+
+ // should be reflection free
+ long counter = context.adapt(ExtendedCamelContext.class).getBeanIntrospection().getInvokedCounter();
+ assertEquals(0, counter);
}
/**
diff --git a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentProducerTest.java b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentProducerTest.java
index e524bf5..00b8ab5 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentProducerTest.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentProducerTest.java
@@ -22,7 +22,10 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
+import org.apache.camel.ExtendedCamelContext;
+import org.apache.camel.LoggingLevel;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.olingo4.api.batch.Olingo4BatchChangeRequest;
@@ -73,6 +76,14 @@ public class Olingo4ComponentProducerTest extends AbstractOlingo4TestSupport {
private static final String TEST_UPDATE_JSON = "{\n" + " \"UserName\": \"lewisblack\",\n" + " \"FirstName\": \"Lewis\",\n" + " \"MiddleName\": \"Black\",\n"
+ " \"LastName\": \"Black\"\n" + "}";
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext context = super.createCamelContext();
+ context.adapt(ExtendedCamelContext.class).getBeanIntrospection().setLoggingLevel(LoggingLevel.INFO);
+ context.adapt(ExtendedCamelContext.class).getBeanIntrospection().setExtendedStatistics(true);
+ return context;
+ }
+
@Test
public void testRead() throws Exception {
final Map<String, Object> headers = new HashMap<>();
@@ -125,6 +136,10 @@ public class Olingo4ComponentProducerTest extends AbstractOlingo4TestSupport {
final ClientEntity unbFuncReturn = (ClientEntity)requestBodyAndHeaders("direct:callunboundfunction", null, headers);
assertNotNull(unbFuncReturn);
+
+ // should be reflection free
+ long counter = context.adapt(ExtendedCamelContext.class).getBeanIntrospection().getInvokedCounter();
+ assertEquals(0, counter);
}
@Test
[camel] 01/03: CAMEL-15224: camel-api-component - Avoid reflection
when configured nested configuration classes.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit eba38a52355da86e22e2c985b336267d62df22b2
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jun 23 06:05:38 2020 +0200
CAMEL-15224: camel-api-component - Avoid reflection when configured nested configuration classes.
---
.../camel/component/olingo4/Olingo4Endpoint.java | 60 +++++++++++++++++-----
.../olingo4/Olingo4ComponentConsumerTest.java | 16 ++++--
.../support/component/AbstractApiEndpoint.java | 1 +
.../camel/support/component/ApiConsumerHelper.java | 3 +-
4 files changed, 62 insertions(+), 18 deletions(-)
diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java
index bf7fc09..b9e462d 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java
@@ -19,19 +19,23 @@ package org.apache.camel.component.olingo4;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
import org.apache.camel.Category;
import org.apache.camel.Consumer;
+import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.component.olingo4.internal.Olingo4ApiCollection;
import org.apache.camel.component.olingo4.internal.Olingo4ApiName;
import org.apache.camel.component.olingo4.internal.Olingo4Constants;
import org.apache.camel.component.olingo4.internal.Olingo4PropertiesHelper;
+import org.apache.camel.spi.PropertyConfigurer;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
+import org.apache.camel.support.PropertyBindingSupport;
import org.apache.camel.support.component.AbstractApiEndpoint;
import org.apache.camel.support.component.ApiMethod;
import org.apache.camel.support.component.ApiMethodPropertiesHelper;
@@ -59,7 +63,7 @@ public class Olingo4Endpoint extends AbstractApiEndpoint<Olingo4ApiName, Olingo4
// unparsed variants
private static final String UREAD_METHOD = "uread";
- private final Set<String> endpointPropertyNames;
+ private Set<String> olingo4endpointPropertyNames;
@UriParam
private Olingo4Configuration configuration;
@@ -68,16 +72,7 @@ public class Olingo4Endpoint extends AbstractApiEndpoint<Olingo4ApiName, Olingo4
public Olingo4Endpoint(String uri, Olingo4Component component, Olingo4ApiName apiName, String methodName, Olingo4Configuration endpointConfiguration) {
super(uri, component, apiName, methodName, Olingo4ApiCollection.getCollection().getHelper(apiName), endpointConfiguration);
-
this.configuration = endpointConfiguration;
-
- // get all endpoint property names
- endpointPropertyNames = new HashSet<>(getPropertiesHelper().getValidEndpointProperties(component.getCamelContext(), configuration));
- // avoid adding edm as queryParam
- endpointPropertyNames.add(EDM_PROPERTY);
- endpointPropertyNames.add(ENDPOINT_HTTP_HEADERS_PROPERTY);
- endpointPropertyNames.add(SERVICE_URI_PROPERTY);
- endpointPropertyNames.add(FILTER_ALREADY_SEEN);
}
@Override
@@ -113,13 +108,50 @@ public class Olingo4Endpoint extends AbstractApiEndpoint<Olingo4ApiName, Olingo4
@Override
public void configureProperties(Map<String, Object> options) {
- super.configureProperties(options);
- // handle individual query params
- parseQueryParams(options);
+ // filter out options that are with $ as they are for query
+ Map<String, Object> query = new LinkedHashMap<>();
+ Map<String, Object> known = new LinkedHashMap<>();
+ options.forEach((k, v) -> {
+ if (k.startsWith("$")) {
+ query.put(k, v);
+ } else {
+ known.put(k, v);
+ }
+ });
+ options.keySet().removeIf(known::containsKey);
+ // configure on configuration first to be reflection free
+ PropertyConfigurer configurer = getCamelContext().adapt(ExtendedCamelContext.class).getConfigurerResolver().resolvePropertyConfigurer(configuration.getClass().getSimpleName(), getCamelContext());
+ if (configurer != null) {
+ PropertyBindingSupport.build()
+ .withConfigurer(configurer)
+ .withIgnoreCase(true)
+ .withTarget(configuration)
+ .withCamelContext(getCamelContext())
+ .withProperties(known)
+ .withRemoveParameters(true)
+ .bind();
+ }
+ super.configureProperties(known);
+ if (!known.isEmpty()) {
+ // handle individual query params
+ query.putAll(known);
+ }
+ // and remove from original options as it was used by query
+ options.keySet().removeIf(query::containsKey);
+ // this will parse query and expand these $ keys into the actual query keys
+ parseQueryParams(query);
+ // and restore back to options
+ options.putAll(query);
}
@Override
protected void afterConfigureProperties() {
+ olingo4endpointPropertyNames = new HashSet<>(getEndpointPropertyNames());
+ olingo4endpointPropertyNames.add(EDM_PROPERTY);
+ olingo4endpointPropertyNames.add(ENDPOINT_HTTP_HEADERS_PROPERTY);
+ olingo4endpointPropertyNames.add(SERVICE_URI_PROPERTY);
+ olingo4endpointPropertyNames.add(FILTER_ALREADY_SEEN);
+
// set default inBody
if (!(READ_METHOD.equals(methodName) || DELETE_METHOD.equals(methodName) || UREAD_METHOD.equals(methodName)) && inBody == null) {
inBody = DATA_PROPERTY;
@@ -210,7 +242,7 @@ public class Olingo4Endpoint extends AbstractApiEndpoint<Olingo4ApiName, Olingo4
continue;
}
- if (!endpointPropertyNames.contains(paramName)) {
+ if (!olingo4endpointPropertyNames.contains(paramName)) {
// add to query params
final Object value = entry.getValue();
diff --git a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java
index 28d33bc..81e6024 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.olingo4;
import java.util.Iterator;
+import org.apache.camel.CamelContext;
import org.apache.camel.ExtendedCamelContext;
+import org.apache.camel.LoggingLevel;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.olingo.client.api.domain.ClientCollectionValue;
@@ -52,6 +54,14 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
startCamelContext();
}
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext context = super.createCamelContext();
+ context.adapt(ExtendedCamelContext.class).getBeanIntrospection().setLoggingLevel(LoggingLevel.INFO);
+ context.adapt(ExtendedCamelContext.class).getBeanIntrospection().setExtendedStatistics(true);
+ return context;
+ }
+
@Test
public void testConsumerQueryWithExpand() throws Exception {
int expectedMsgCount = 1;
@@ -83,9 +93,9 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
}
// should be reflection free
- // TODO: We are down to 10 calls now
- // long counter = context.adapt(ExtendedCamelContext.class).getBeanIntrospection().getInvokedCounter();
- // assertEquals(0, counter);
+ // TODO: We are down to 2 calls now (from unit test itself)
+// long counter = context.adapt(ExtendedCamelContext.class).getBeanIntrospection().getInvokedCounter();
+// assertEquals(0, counter);
}
/**
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/component/AbstractApiEndpoint.java b/core/camel-support/src/main/java/org/apache/camel/support/component/AbstractApiEndpoint.java
index d18f8d2..c3693fb 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/component/AbstractApiEndpoint.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/component/AbstractApiEndpoint.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/component/ApiConsumerHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/component/ApiConsumerHelper.java
index 6ffe292..27d7a99 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/component/ApiConsumerHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/component/ApiConsumerHelper.java
@@ -49,7 +49,8 @@ public final class ApiConsumerHelper {
ApiMethod result;
// find one that takes the largest subset of endpoint parameters
- final Set<String> argNames = new HashSet<>(endpoint.getEndpointPropertyNames());
+ Set<String> names = endpoint.getEndpointPropertyNames();
+ final Set<String> argNames = new HashSet<>(names);
propertyNamesInterceptor.interceptPropertyNames(argNames);
List<ApiMethod> filteredMethods = endpoint.methodHelper.filterMethods(
[camel] 02/03: Regen
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ab98fdff94b2ea2b4b9f3fab3ad38e1c0373f3f1
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jun 23 06:13:33 2020 +0200
Regen
---
.../camel/catalog/archetypes/archetype-catalog.xml | 36 +++++++++++-----------
.../apache/camel/catalog/components/braintree.json | 2 +-
.../modules/ROOT/pages/braintree-component.adoc | 2 +-
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/archetypes/archetype-catalog.xml b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/archetypes/archetype-catalog.xml
index 1c960fa..eb476a6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/archetypes/archetype-catalog.xml
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/archetypes/archetype-catalog.xml
@@ -3,57 +3,57 @@
<archetypes>
<archetype>
<groupId>org.apache.camel.archetypes</groupId>
- <artifactId>camel-archetype-api-component</artifactId>
+ <artifactId>camel-archetype-component</artifactId>
<version>3.5.0-SNAPSHOT</version>
- <description>Creates a new Camel component that wraps one or more API proxies.</description>
+ <description>Creates a new Camel component.</description>
</archetype>
<archetype>
<groupId>org.apache.camel.archetypes</groupId>
- <artifactId>camel-archetype-blueprint</artifactId>
+ <artifactId>camel-archetype-main</artifactId>
<version>3.5.0-SNAPSHOT</version>
- <description>Creates a new Camel project with OSGi blueprint support. Ready to be deployed in OSGi.</description>
+ <description>Creates a new Camel project using standalone Camel Main.</description>
</archetype>
<archetype>
<groupId>org.apache.camel.archetypes</groupId>
- <artifactId>camel-archetype-cdi</artifactId>
+ <artifactId>camel-archetype-java</artifactId>
<version>3.5.0-SNAPSHOT</version>
- <description>Creates a new Camel project using CDI.</description>
+ <description>Creates a new Camel project using Java DSL.</description>
</archetype>
<archetype>
<groupId>org.apache.camel.archetypes</groupId>
- <artifactId>camel-archetype-component</artifactId>
+ <artifactId>camel-archetype-spring-boot</artifactId>
<version>3.5.0-SNAPSHOT</version>
- <description>Creates a new Camel component.</description>
+ <description>Creates a new Camel project using Spring Boot.</description>
</archetype>
<archetype>
<groupId>org.apache.camel.archetypes</groupId>
- <artifactId>camel-archetype-dataformat</artifactId>
+ <artifactId>camel-archetype-cdi</artifactId>
<version>3.5.0-SNAPSHOT</version>
- <description>Creates a new Camel data format.</description>
+ <description>Creates a new Camel project using CDI.</description>
</archetype>
<archetype>
<groupId>org.apache.camel.archetypes</groupId>
- <artifactId>camel-archetype-java</artifactId>
+ <artifactId>camel-archetype-blueprint</artifactId>
<version>3.5.0-SNAPSHOT</version>
- <description>Creates a new Camel project using Java DSL.</description>
+ <description>Creates a new Camel project with OSGi blueprint support. Ready to be deployed in OSGi.</description>
</archetype>
<archetype>
<groupId>org.apache.camel.archetypes</groupId>
- <artifactId>camel-archetype-spring-boot</artifactId>
+ <artifactId>camel-archetype-api-component</artifactId>
<version>3.5.0-SNAPSHOT</version>
- <description>Creates a new Camel project using Spring Boot.</description>
+ <description>Creates a new Camel component that wraps one or more API proxies.</description>
</archetype>
<archetype>
<groupId>org.apache.camel.archetypes</groupId>
- <artifactId>camel-archetype-spring</artifactId>
+ <artifactId>camel-archetype-dataformat</artifactId>
<version>3.5.0-SNAPSHOT</version>
- <description>Creates a new Camel project with added Spring DSL support.</description>
+ <description>Creates a new Camel data format.</description>
</archetype>
<archetype>
<groupId>org.apache.camel.archetypes</groupId>
- <artifactId>camel-archetype-main</artifactId>
+ <artifactId>camel-archetype-spring</artifactId>
<version>3.5.0-SNAPSHOT</version>
- <description>Creates a new Camel project using standalone Camel Main.</description>
+ <description>Creates a new Camel project with added Spring DSL support.</description>
</archetype>
</archetypes>
</archetype-catalog>
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/braintree.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/braintree.json
index f72bc6f..18b6133 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/braintree.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/braintree.json
@@ -41,7 +41,7 @@
"basicPropertyBinding": { "kind": "parameter", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
"httpReadTimeout": { "kind": "parameter", "displayName": "Http Read Timeout", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "Set read timeout for http calls." },
"synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
- "httpLogLevel": { "kind": "parameter", "displayName": "Http Log Level", "group": "logging", "label": "logging", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "Set logging level for http calls, see java.util.logging.Level" },
+ "httpLogLevel": { "kind": "parameter", "displayName": "Http Log Level", "group": "logging", "label": "logging", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "OFF", "SEVERE", "WARNING", "INFO", "CONFIG", "FINE", "FINER", "FINEST", "ALL" ], "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "Set logging level for http calls, see [...]
"httpLogName": { "kind": "parameter", "displayName": "Http Log Name", "group": "logging", "label": "logging", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "Braintree", "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "Set log category to use to log http calls." },
"logHandlerEnabled": { "kind": "parameter", "displayName": "Log Handler Enabled", "group": "logging", "label": "logging", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "Sets whether to enable the BraintreeLogHandler. It may be desirable to set this to 'false' where an exi [...]
"proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "The proxy host" },
diff --git a/docs/components/modules/ROOT/pages/braintree-component.adoc b/docs/components/modules/ROOT/pages/braintree-component.adoc
index ebd5e46..bf8788b 100644
--- a/docs/components/modules/ROOT/pages/braintree-component.adoc
+++ b/docs/components/modules/ROOT/pages/braintree-component.adoc
@@ -102,7 +102,7 @@ with the following path and query parameters:
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
| *httpReadTimeout* (advanced) | Set read timeout for http calls. | | Integer
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
-| *httpLogLevel* (logging) | Set logging level for http calls, see java.util.logging.Level | | String
+| *httpLogLevel* (logging) | Set logging level for http calls, see java.util.logging.Level. The value can be one of: OFF, SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST, ALL | | String
| *httpLogName* (logging) | Set log category to use to log http calls. | Braintree | String
| *logHandlerEnabled* (logging) | Sets whether to enable the BraintreeLogHandler. It may be desirable to set this to 'false' where an existing JUL - SLF4J logger bridge is on the classpath. This option can also be configured globally on the BraintreeComponent. | true | boolean
| *proxyHost* (proxy) | The proxy host | | String