From 447ffd4436f18a64cb232004d9de5fbf16bb79f1 Mon Sep 17 00:00:00 2001 From: Adriano Machado <60320+ammachado@users.noreply.github.com> Date: Mon, 25 Mar 2024 22:20:08 -0400 Subject: [PATCH 1/3] Fix typo on Elasticsearch aggregation strategy --- .../resources/org/apache/camel/catalog/beans.properties | 2 +- ...son => ElasticsearchBulkRequestAggregationStrategy.json} | 6 +++--- ...sticsearchBulkRequestAggregationStrategyConfigurer.java} | 4 ++-- .../META-INF/services/org/apache/camel/bean.properties | 2 +- ...son => ElasticsearchBulkRequestAggregationStrategy.json} | 6 +++--- ...aggregation.ElastichsearchBulkRequestAggregationStrategy | 2 -- ....aggregation.ElasticsearchBulkRequestAggregationStrategy | 2 ++ ...ava => ElasticsearchBulkRequestAggregationStrategy.java} | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans/{ElastichsearchBulkRequestAggregationStrategy.json => ElasticsearchBulkRequestAggregationStrategy.json} (70%) rename components/camel-elasticsearch/src/generated/java/org/apache/camel/component/es/aggregation/{ElastichsearchBulkRequestAggregationStrategyConfigurer.java => ElasticsearchBulkRequestAggregationStrategyConfigurer.java} (75%) rename components/camel-elasticsearch/src/generated/resources/META-INF/services/org/apache/camel/bean/{ElastichsearchBulkRequestAggregationStrategy.json => ElasticsearchBulkRequestAggregationStrategy.json} (70%) delete mode 100644 components/camel-elasticsearch/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.es.aggregation.ElastichsearchBulkRequestAggregationStrategy create mode 100644 components/camel-elasticsearch/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.es.aggregation.ElasticsearchBulkRequestAggregationStrategy rename components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/aggregation/{ElastichsearchBulkRequestAggregationStrategy.java => ElasticsearchBulkRequestAggregationStrategy.java} (96%) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans.properties index 2c899ecfe46d0..9426062c8f081 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans.properties @@ -8,7 +8,7 @@ DurationRoutePolicy DurationRoutePolicyFactory EhcacheAggregationRepository EhcacheIdempotentRepository -ElastichsearchBulkRequestAggregationStrategy +ElasticsearchBulkRequestAggregationStrategy Etcd3AggregationRepository FileIdempotentRepository GroupedBodyAggregationStrategy diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans/ElastichsearchBulkRequestAggregationStrategy.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans/ElasticsearchBulkRequestAggregationStrategy.json similarity index 70% rename from catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans/ElastichsearchBulkRequestAggregationStrategy.json rename to catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans/ElasticsearchBulkRequestAggregationStrategy.json index 19e93a9e8dfc4..83facccd2ed2d 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans/ElastichsearchBulkRequestAggregationStrategy.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans/ElasticsearchBulkRequestAggregationStrategy.json @@ -1,10 +1,10 @@ { "bean": { "kind": "bean", - "name": "ElastichsearchBulkRequestAggregationStrategy", - "javaType": "org.apache.camel.component.es.aggregation.ElastichsearchBulkRequestAggregationStrategy", + "name": "ElasticsearchBulkRequestAggregationStrategy", + "javaType": "org.apache.camel.component.es.aggregation.ElasticsearchBulkRequestAggregationStrategy", "interfaceType": "org.apache.camel.AggregationStrategy", - "title": "Elastichsearch Bulk Request Aggregation Strategy", + "title": "Elasticsearch Bulk Request Aggregation Strategy", "description": "Aggregates two ElasticSearch BulkOperation into a single BulkRequest", "deprecated": false, "groupId": "org.apache.camel", diff --git a/components/camel-elasticsearch/src/generated/java/org/apache/camel/component/es/aggregation/ElastichsearchBulkRequestAggregationStrategyConfigurer.java b/components/camel-elasticsearch/src/generated/java/org/apache/camel/component/es/aggregation/ElasticsearchBulkRequestAggregationStrategyConfigurer.java similarity index 75% rename from components/camel-elasticsearch/src/generated/java/org/apache/camel/component/es/aggregation/ElastichsearchBulkRequestAggregationStrategyConfigurer.java rename to components/camel-elasticsearch/src/generated/java/org/apache/camel/component/es/aggregation/ElasticsearchBulkRequestAggregationStrategyConfigurer.java index 36ec2b10107dc..eb1690821e6e8 100644 --- a/components/camel-elasticsearch/src/generated/java/org/apache/camel/component/es/aggregation/ElastichsearchBulkRequestAggregationStrategyConfigurer.java +++ b/components/camel-elasticsearch/src/generated/java/org/apache/camel/component/es/aggregation/ElasticsearchBulkRequestAggregationStrategyConfigurer.java @@ -9,13 +9,13 @@ import org.apache.camel.spi.ConfigurerStrategy; import org.apache.camel.spi.GeneratedPropertyConfigurer; import org.apache.camel.util.CaseInsensitiveMap; -import org.apache.camel.component.es.aggregation.ElastichsearchBulkRequestAggregationStrategy; +import org.apache.camel.component.es.aggregation.ElasticsearchBulkRequestAggregationStrategy; /** * Generated by camel build tools - do NOT edit this file! */ @SuppressWarnings("unchecked") -public class ElastichsearchBulkRequestAggregationStrategyConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter { +public class ElasticsearchBulkRequestAggregationStrategyConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter { @Override public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) { diff --git a/components/camel-elasticsearch/src/generated/resources/META-INF/services/org/apache/camel/bean.properties b/components/camel-elasticsearch/src/generated/resources/META-INF/services/org/apache/camel/bean.properties index dc45b3b8367c9..a1970194e1cfb 100644 --- a/components/camel-elasticsearch/src/generated/resources/META-INF/services/org/apache/camel/bean.properties +++ b/components/camel-elasticsearch/src/generated/resources/META-INF/services/org/apache/camel/bean.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -bean=ElastichsearchBulkRequestAggregationStrategy +bean=ElasticsearchBulkRequestAggregationStrategy groupId=org.apache.camel artifactId=camel-elasticsearch version=4.5.0-SNAPSHOT diff --git a/components/camel-elasticsearch/src/generated/resources/META-INF/services/org/apache/camel/bean/ElastichsearchBulkRequestAggregationStrategy.json b/components/camel-elasticsearch/src/generated/resources/META-INF/services/org/apache/camel/bean/ElasticsearchBulkRequestAggregationStrategy.json similarity index 70% rename from components/camel-elasticsearch/src/generated/resources/META-INF/services/org/apache/camel/bean/ElastichsearchBulkRequestAggregationStrategy.json rename to components/camel-elasticsearch/src/generated/resources/META-INF/services/org/apache/camel/bean/ElasticsearchBulkRequestAggregationStrategy.json index 19e93a9e8dfc4..83facccd2ed2d 100644 --- a/components/camel-elasticsearch/src/generated/resources/META-INF/services/org/apache/camel/bean/ElastichsearchBulkRequestAggregationStrategy.json +++ b/components/camel-elasticsearch/src/generated/resources/META-INF/services/org/apache/camel/bean/ElasticsearchBulkRequestAggregationStrategy.json @@ -1,10 +1,10 @@ { "bean": { "kind": "bean", - "name": "ElastichsearchBulkRequestAggregationStrategy", - "javaType": "org.apache.camel.component.es.aggregation.ElastichsearchBulkRequestAggregationStrategy", + "name": "ElasticsearchBulkRequestAggregationStrategy", + "javaType": "org.apache.camel.component.es.aggregation.ElasticsearchBulkRequestAggregationStrategy", "interfaceType": "org.apache.camel.AggregationStrategy", - "title": "Elastichsearch Bulk Request Aggregation Strategy", + "title": "Elasticsearch Bulk Request Aggregation Strategy", "description": "Aggregates two ElasticSearch BulkOperation into a single BulkRequest", "deprecated": false, "groupId": "org.apache.camel", diff --git a/components/camel-elasticsearch/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.es.aggregation.ElastichsearchBulkRequestAggregationStrategy b/components/camel-elasticsearch/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.es.aggregation.ElastichsearchBulkRequestAggregationStrategy deleted file mode 100644 index c73733d464a33..0000000000000 --- a/components/camel-elasticsearch/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.es.aggregation.ElastichsearchBulkRequestAggregationStrategy +++ /dev/null @@ -1,2 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -class=org.apache.camel.component.es.aggregation.ElastichsearchBulkRequestAggregationStrategyConfigurer diff --git a/components/camel-elasticsearch/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.es.aggregation.ElasticsearchBulkRequestAggregationStrategy b/components/camel-elasticsearch/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.es.aggregation.ElasticsearchBulkRequestAggregationStrategy new file mode 100644 index 0000000000000..d70a08f83bed6 --- /dev/null +++ b/components/camel-elasticsearch/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.es.aggregation.ElasticsearchBulkRequestAggregationStrategy @@ -0,0 +1,2 @@ +# Generated by camel build tools - do NOT edit this file! +class=org.apache.camel.component.es.aggregation.ElasticsearchBulkRequestAggregationStrategyConfigurer diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/aggregation/ElastichsearchBulkRequestAggregationStrategy.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/aggregation/ElasticsearchBulkRequestAggregationStrategy.java similarity index 96% rename from components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/aggregation/ElastichsearchBulkRequestAggregationStrategy.java rename to components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/aggregation/ElasticsearchBulkRequestAggregationStrategy.java index 9e2a3d8f462cd..eb7d2e91b65ab 100644 --- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/aggregation/ElastichsearchBulkRequestAggregationStrategy.java +++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/aggregation/ElasticsearchBulkRequestAggregationStrategy.java @@ -30,7 +30,7 @@ description = "Aggregates two ElasticSearch BulkOperation into a single BulkRequest", annotations = { "interfaceName=org.apache.camel.AggregationStrategy" }) @Configurer(metadataOnly = true) -public class ElastichsearchBulkRequestAggregationStrategy implements AggregationStrategy { +public class ElasticsearchBulkRequestAggregationStrategy implements AggregationStrategy { @Override public Exchange aggregate(Exchange oldExchange, Exchange newExchange) { From e2a931f20e8e8b8b61e966f509428abad93441ad Mon Sep 17 00:00:00 2001 From: Adriano Machado <60320+ammachado@users.noreply.github.com> Date: Tue, 26 Mar 2024 09:23:41 -0400 Subject: [PATCH 2/3] Doc fixes --- .../modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc | 2 +- .../modules/ROOT/pages/camel-4x-upgrade-guide-4_6.adoc | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc index 2784ad1d7aa84..ab84f0c2f2073 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc @@ -262,7 +262,7 @@ to use from Camel. === camel-elasticsearch / camel-opensearch The class `BulkRequestAggregationStrategy` has been renamed to `OpensearchBulkRequestAggregationStrategy` -The class `BulkRequestAggregationStrategy` has been renamed to `ElasticsearchBulkRequestAggregationStrategy` +The class `BulkRequestAggregationStrategy` has been renamed to `ElastichsearchBulkRequestAggregationStrategy` === camel-spring-redis diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_6.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_6.adoc index d297df9c99e1e..7b926dc871afc 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_6.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_6.adoc @@ -14,3 +14,7 @@ For example calling a route that fails due to an exception being thrown (even if then the variable is no longer set. Also, if the route is marked for rollback, or to stop continue routing with `.stop()`. This is the same logic that the routing engine uses, whether to continue routing the `Exchange` or not. + +=== camel-elasticsearch + +The class `ElastichsearchBulkRequestAggregationStrategy` has been renamed to `ElasticsearchBulkRequestAggregationStrategy`. \ No newline at end of file From 4c607e92ef37a5a60f497600ee67f6d370a10870 Mon Sep 17 00:00:00 2001 From: Adriano Machado <60320+ammachado@users.noreply.github.com> Date: Tue, 26 Mar 2024 09:29:38 -0400 Subject: [PATCH 3/3] More doc fixes --- .../modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc | 8 ++++---- .../modules/ROOT/pages/camel-4x-upgrade-guide-4_6.adoc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc index ab84f0c2f2073..54c545b4d6adc 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc @@ -261,13 +261,13 @@ to use from Camel. === camel-elasticsearch / camel-opensearch -The class `BulkRequestAggregationStrategy` has been renamed to `OpensearchBulkRequestAggregationStrategy` -The class `BulkRequestAggregationStrategy` has been renamed to `ElastichsearchBulkRequestAggregationStrategy` +The class `org.apache.camel.component.opensearch.aggregation.BulkRequestAggregationStrategy` has been renamed to `org.apache.camel.component.opensearch.aggregation.OpensearchBulkRequestAggregationStrategy` +The class `org.apache.camel.component.es.aggregation.BulkRequestAggregationStrategy` has been renamed to `org.apache.camel.component.es.aggregation.ElastichsearchBulkRequestAggregationStrategy` === camel-spring-redis -The class `RedisIdempotentRepository` has been renamed to `SpringRedisIdempotentRepository` -The class `RedisStringIdempotentRepository` has been renamed to `SpringRedisStringIdempotentRepository` +The class `org.apache.camel.component.redis.processor.idempotent.RedisIdempotentRepository` has been renamed to `org.apache.camel.component.redis.processor.idempotent.SpringRedisIdempotentRepository` +The class `org.apache.camel.component.redis.processor.idempotent.RedisStringIdempotentRepository` has been renamed to `org.apache.camel.component.redis.processor.idempotent.SpringRedisStringIdempotentRepository` == Camel Spring Boot diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_6.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_6.adoc index 7b926dc871afc..360199e51bb43 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_6.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_6.adoc @@ -17,4 +17,4 @@ This is the same logic that the routing engine uses, whether to continue routing === camel-elasticsearch -The class `ElastichsearchBulkRequestAggregationStrategy` has been renamed to `ElasticsearchBulkRequestAggregationStrategy`. \ No newline at end of file +The class `org.apache.camel.component.es.aggregation.ElastichsearchBulkRequestAggregationStrategy` has been renamed to `org.apache.camel.component.es.aggregation.ElasticsearchBulkRequestAggregationStrategy`. \ No newline at end of file