This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new bd7faa30114 Fixed compilation and regen
bd7faa30114 is described below
commit bd7faa30114369432731a3d1104a85d13e38b40c
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Mar 31 06:50:36 2023 +0200
Fixed compilation and regen
---
.../camel/springboot/catalog/components/azure-cosmosdb.json | 4 ++--
.../org/apache/camel/springboot/catalog/components/kudu.json | 5 ++++-
.../src/main/docs/azure-cosmosdb.json | 4 ++--
.../cosmosdb/springboot/CosmosDbComponentConfiguration.java | 10 ++++------
.../azure/cosmosdb/springboot/CosmosDbComponentConverter.java | 2 --
.../kafka/integration/KafkaConsumerHealthCheckIT.java | 2 +-
.../TelegramConsumerHealthCheckErrorDisabledConsumerTest.java | 4 ++--
.../springboot/TelegramConsumerHealthCheckErrorTest.java | 4 ++--
.../telegram/springboot/TelegramConsumerHealthCheckOkTest.java | 4 ++--
.../org/apache/camel/spring/boot/CamelAutoConfiguration.java | 2 +-
.../spring/boot/actuate/console/CamelDevConsoleEndpoint.java | 4 ++--
.../spring/boot/actuate/endpoint/CamelRoutesEndpoint.java | 4 ++--
.../boot/actuate/health/CamelHealthCheckAutoConfiguration.java | 2 +-
.../endpoint/CamelRoutesEndpointReadOnlyOperationTest.java | 2 +-
.../endpoint/CamelRoutesEndpointWriteOperationTest.java | 2 +-
15 files changed, 27 insertions(+), 28 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-cosmosdb.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-cosmosdb.json
index c4f0f84c78a..3c9b745cc12 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-cosmosdb.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-cosmosdb.json
@@ -44,7 +44,7 @@
"leaseContainerName": { "kind": "property", "displayName": "Lease
Container Name", "group": "consumer", "label": "consumer", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "camel-lease",
"configurationClass":
"org.apache.camel.component.azure.cosmosdb.CosmosDbConfiguration",
"configurationField": "configuration", "description": "Sets the lease container
which acts as a state storage and co [...]
"leaseDatabaseName": { "kind": "property", "displayName": "Lease Database
Name", "group": "consumer", "label": "consumer", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.cosmosdb.CosmosDbConfiguration",
"configurationField": "configuration", "description": "Sets the lease database
where the leaseContainerName will be stored. If it is not specified, t [...]
"itemId": { "kind": "property", "displayName": "Item Id", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.azure.cosmosdb.CosmosDbConfiguration",
"configurationField": "configuration", "description": "Sets the itemId in case
needed for operation on item like delete, replace" },
- "itemPartitionKey": { "kind": "property", "displayName": "Item Partition
Key", "group": "producer", "label": "producer", "required": false, "type":
"object", "javaType": "com.azure.cosmos.models.PartitionKey", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.cosmosdb.CosmosDbConfiguration",
"configurationField": "configuration", "description": "Sets partition key.
Represents a partition key value in the Azure Cosmos DB [...]
+ "itemPartitionKey": { "kind": "property", "displayName": "Item Partition
Key", "group": "producer", "label": "producer", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.cosmosdb.CosmosDbConfiguration",
"configurationField": "configuration", "description": "Sets partition key.
Represents a partition key value in the Azure Cosmos DB database service. A
[...]
"lazyStartProducer": { "kind": "property", "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 star [...]
"operation": { "kind": "property", "displayName": "Operation", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.azure.cosmosdb.CosmosDbOperationsDefinition",
"enum": [ "listDatabases", "createDatabase", "queryDatabases",
"deleteDatabase", "createContainer", "replaceDatabaseThroughput",
"listContainers", "queryContainers", "deleteContainer",
"replaceContainerThroughput", "createItem", "upsertItem", "deleteItem", "re
[...]
"query": { "kind": "property", "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.azure.cosmosdb.CosmosDbConfiguration",
"configurationField": "configuration", "description": "An SQL query to execute
on a given resources. To learn more about Cosmos SQL API, check this link {link
https:\/\/docs.m [...]
@@ -78,7 +78,7 @@
"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" ],
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the exchange pattern when the consumer creates an exchange." },
"itemId": { "kind": "parameter", "displayName": "Item Id", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.azure.cosmosdb.CosmosDbConfiguration",
"configurationField": "configuration", "description": "Sets the itemId in case
needed for operation on item like delete, replace" },
- "itemPartitionKey": { "kind": "parameter", "displayName": "Item Partition
Key", "group": "producer", "label": "producer", "required": false, "type":
"object", "javaType": "com.azure.cosmos.models.PartitionKey", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.cosmosdb.CosmosDbConfiguration",
"configurationField": "configuration", "description": "Sets partition key.
Represents a partition key value in the Azure Cosmos DB [...]
+ "itemPartitionKey": { "kind": "parameter", "displayName": "Item Partition
Key", "group": "producer", "label": "producer", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.cosmosdb.CosmosDbConfiguration",
"configurationField": "configuration", "description": "Sets partition key.
Represents a partition key value in the Azure Cosmos DB database service. A
[...]
"operation": { "kind": "parameter", "displayName": "Operation", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.azure.cosmosdb.CosmosDbOperationsDefinition",
"enum": [ "listDatabases", "createDatabase", "queryDatabases",
"deleteDatabase", "createContainer", "replaceDatabaseThroughput",
"listContainers", "queryContainers", "deleteContainer",
"replaceContainerThroughput", "createItem", "upsertItem", "deleteItem", "r [...]
"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.azure.cosmosdb.CosmosDbConfiguration",
"configurationField": "configuration", "description": "An SQL query to execute
on a given resources. To learn more about Cosmos SQL API, check this link {link
https:\/\/docs. [...]
"queryRequestOptions": { "kind": "parameter", "displayName": "Query
Request Options", "group": "producer", "label": "producer", "required": false,
"type": "object", "javaType":
"com.azure.cosmos.models.CosmosQueryRequestOptions", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.cosmosdb.CosmosDbConfiguration",
"configurationField": "configuration", "description": "Set additional
QueryRequestOptions that can be used with [...]
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kudu.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kudu.json
index a2a50e74dac..b2fca18e05f 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kudu.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kudu.json
@@ -27,7 +27,10 @@
},
"headers": {
"CamelKuduSchema": { "kind": "header", "displayName": "", "group":
"producer", "label": "", "required": false, "javaType":
"org.apache.kudu.Schema", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "The schema",
"constantName":
"org.apache.camel.component.kudu.KuduConstants#CAMEL_KUDU_SCHEMA" },
- "CamelKuduTableOptions": { "kind": "header", "displayName": "", "group":
"producer", "label": "", "required": false, "javaType":
"org.apache.kudu.client.CreateTableOptions", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "The
create table options", "constantName":
"org.apache.camel.component.kudu.KuduConstants#CAMEL_KUDU_TABLE_OPTIONS" }
+ "CamelKuduTableOptions": { "kind": "header", "displayName": "", "group":
"producer", "label": "", "required": false, "javaType":
"org.apache.kudu.client.CreateTableOptions", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "The
create table options", "constantName":
"org.apache.camel.component.kudu.KuduConstants#CAMEL_KUDU_TABLE_OPTIONS" },
+ "CamelKuduScanColumnNames": { "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType":
"java.util.List<String>", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "The projected column names
for scan operation", "constantName":
"org.apache.camel.component.kudu.KuduConstants#CAMEL_KUDU_SCAN_COLUMN_NAMES" },
+ "CamelKuduScanPredicate": { "kind": "header", "displayName": "", "group":
"producer", "label": "", "required": false, "javaType":
"org.apache.kudu.client.KuduPredicate", "deprecated": false, "deprecationNote":
"", "autowired": false, "secret": false, "description": "The predicate for scan
operation", "constantName":
"org.apache.camel.component.kudu.KuduConstants#CAMEL_KUDU_SCAN_PREDICATE" },
+ "CamelKuduScanLimit": { "kind": "header", "displayName": "", "group":
"producer", "label": "", "required": false, "javaType": "long", "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"description": "The limit on the number of rows for scan operation",
"constantName":
"org.apache.camel.component.kudu.KuduConstants#CAMEL_KUDU_SCAN_LIMIT" }
},
"properties": {
"host": { "kind": "path", "displayName": "Host", "group": "common",
"label": "common", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Host of the server to connect to" },
diff --git
a/components-starter/camel-azure-cosmosdb-starter/src/main/docs/azure-cosmosdb.json
b/components-starter/camel-azure-cosmosdb-starter/src/main/docs/azure-cosmosdb.json
index 513a9c1d946..cfbc847abb6 100644
---
a/components-starter/camel-azure-cosmosdb-starter/src/main/docs/azure-cosmosdb.json
+++
b/components-starter/camel-azure-cosmosdb-starter/src/main/docs/azure-cosmosdb.json
@@ -143,8 +143,8 @@
},
{
"name": "camel.component.azure-cosmosdb.item-partition-key",
- "type": "com.azure.cosmos.models.PartitionKey",
- "description": "Sets partition key. Represents a partition key value in
the Azure Cosmos DB database service. A partition key identifies the partition
where the item is stored in. The option is a
com.azure.cosmos.models.PartitionKey type.",
+ "type": "java.lang.String",
+ "description": "Sets partition key. Represents a partition key value in
the Azure Cosmos DB database service. A partition key identifies the partition
where the item is stored in.",
"sourceType":
"org.apache.camel.component.azure.cosmosdb.springboot.CosmosDbComponentConfiguration"
},
{
diff --git
a/components-starter/camel-azure-cosmosdb-starter/src/main/java/org/apache/camel/component/azure/cosmosdb/springboot/CosmosDbComponentConfiguration.java
b/components-starter/camel-azure-cosmosdb-starter/src/main/java/org/apache/camel/component/azure/cosmosdb/springboot/CosmosDbComponentConfiguration.java
index 9420f63313d..023dd11b256 100644
---
a/components-starter/camel-azure-cosmosdb-starter/src/main/java/org/apache/camel/component/azure/cosmosdb/springboot/CosmosDbComponentConfiguration.java
+++
b/components-starter/camel-azure-cosmosdb-starter/src/main/java/org/apache/camel/component/azure/cosmosdb/springboot/CosmosDbComponentConfiguration.java
@@ -20,7 +20,6 @@ import com.azure.cosmos.ConsistencyLevel;
import com.azure.cosmos.CosmosAsyncClient;
import com.azure.cosmos.models.ChangeFeedProcessorOptions;
import com.azure.cosmos.models.CosmosQueryRequestOptions;
-import com.azure.cosmos.models.PartitionKey;
import com.azure.cosmos.models.ThroughputProperties;
import org.apache.camel.component.azure.cosmosdb.CosmosDbComponent;
import org.apache.camel.component.azure.cosmosdb.CosmosDbConfiguration;
@@ -201,10 +200,9 @@ public class CosmosDbComponentConfiguration
/**
* Sets partition key. Represents a partition key value in the Azure Cosmos
* DB database service. A partition key identifies the partition where the
- * item is stored in. The option is a com.azure.cosmos.models.PartitionKey
- * type.
+ * item is stored in.
*/
- private PartitionKey itemPartitionKey;
+ private String itemPartitionKey;
/**
* Whether the producer should be started lazy (on the first message). By
* starting lazy you can use this to allow CamelContext and routes to
@@ -433,11 +431,11 @@ public class CosmosDbComponentConfiguration
this.itemId = itemId;
}
- public PartitionKey getItemPartitionKey() {
+ public String getItemPartitionKey() {
return itemPartitionKey;
}
- public void setItemPartitionKey(PartitionKey itemPartitionKey) {
+ public void setItemPartitionKey(String itemPartitionKey) {
this.itemPartitionKey = itemPartitionKey;
}
diff --git
a/components-starter/camel-azure-cosmosdb-starter/src/main/java/org/apache/camel/component/azure/cosmosdb/springboot/CosmosDbComponentConverter.java
b/components-starter/camel-azure-cosmosdb-starter/src/main/java/org/apache/camel/component/azure/cosmosdb/springboot/CosmosDbComponentConverter.java
index fa881fe5acf..c4a29d6d1ca 100644
---
a/components-starter/camel-azure-cosmosdb-starter/src/main/java/org/apache/camel/component/azure/cosmosdb/springboot/CosmosDbComponentConverter.java
+++
b/components-starter/camel-azure-cosmosdb-starter/src/main/java/org/apache/camel/component/azure/cosmosdb/springboot/CosmosDbComponentConverter.java
@@ -43,7 +43,6 @@ public class CosmosDbComponentConverter implements
GenericConverter {
answer.add(new ConvertiblePair(String.class,
com.azure.cosmos.CosmosAsyncClient.class));
answer.add(new ConvertiblePair(String.class,
com.azure.cosmos.models.ThroughputProperties.class));
answer.add(new ConvertiblePair(String.class,
com.azure.cosmos.models.ChangeFeedProcessorOptions.class));
- answer.add(new ConvertiblePair(String.class,
com.azure.cosmos.models.PartitionKey.class));
answer.add(new ConvertiblePair(String.class,
com.azure.cosmos.models.CosmosQueryRequestOptions.class));
return answer;
}
@@ -65,7 +64,6 @@ public class CosmosDbComponentConverter implements
GenericConverter {
case "com.azure.cosmos.CosmosAsyncClient": return
applicationContext.getBean(ref, com.azure.cosmos.CosmosAsyncClient.class);
case "com.azure.cosmos.models.ThroughputProperties": return
applicationContext.getBean(ref,
com.azure.cosmos.models.ThroughputProperties.class);
case "com.azure.cosmos.models.ChangeFeedProcessorOptions": return
applicationContext.getBean(ref,
com.azure.cosmos.models.ChangeFeedProcessorOptions.class);
- case "com.azure.cosmos.models.PartitionKey": return
applicationContext.getBean(ref, com.azure.cosmos.models.PartitionKey.class);
case "com.azure.cosmos.models.CosmosQueryRequestOptions": return
applicationContext.getBean(ref,
com.azure.cosmos.models.CosmosQueryRequestOptions.class);
}
return null;
diff --git
a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java
b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java
index 3ef6ff6f19d..23fc81cc5ff 100644
---
a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java
+++
b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java
@@ -114,7 +114,7 @@ public class KafkaConsumerHealthCheckIT extends
BaseEmbeddedKafkaTestSupport {
registry.register(hc);
hc = registry.resolveById("consumers");
registry.register(hc);
- context.setExtension(HealthCheckRegistry.class, registry);
+
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class,
registry);
}
@Override
diff --git
a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerHealthCheckErrorDisabledConsumerTest.java
b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerHealthCheckErrorDisabledConsumerTest.java
index efabaf392c9..733e59092ae 100644
---
a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerHealthCheckErrorDisabledConsumerTest.java
+++
b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerHealthCheckErrorDisabledConsumerTest.java
@@ -62,7 +62,7 @@ public class
TelegramConsumerHealthCheckErrorDisabledConsumerTest extends Telegr
protected void configureCamelContext(CamelContext context) {
// enabling routes health check is a bit cumbersome via low-level Java
code
super.configureCamelContext(context);
- HealthCheckRegistry hcr =
context.getExtension(HealthCheckRegistry.class);
+ HealthCheckRegistry hcr =
context.getCamelContextExtension().getContextPlugin(HealthCheckRegistry.class);
HealthCheckRepository repo =
hcr.getRepository("routes").orElse((HealthCheckRepository)
hcr.resolveById("routes"));
repo.setEnabled(true);
hcr.register(repo);
@@ -75,7 +75,7 @@ public class
TelegramConsumerHealthCheckErrorDisabledConsumerTest extends Telegr
@Test
public void testReceptionOfTwoMessages() {
- HealthCheckRegistry hcr =
context.getExtension(HealthCheckRegistry.class);
+ HealthCheckRegistry hcr =
context.getCamelContextExtension().getContextPlugin(HealthCheckRegistry.class);
HealthCheckRepository repo = hcr.getRepository("routes").get();
// should not be UP from the start as routes can be started
diff --git
a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerHealthCheckErrorTest.java
b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerHealthCheckErrorTest.java
index 0c9630270c5..1c72e05c5d2 100644
---
a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerHealthCheckErrorTest.java
+++
b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerHealthCheckErrorTest.java
@@ -63,7 +63,7 @@ public class TelegramConsumerHealthCheckErrorTest extends
TelegramTestSupport {
protected void configureCamelContext(CamelContext context) {
// enabling consumers health check is a bit cumbersome via low-level
Java code
super.configureCamelContext(context);
- HealthCheckRegistry hcr =
context.getExtension(HealthCheckRegistry.class);
+ HealthCheckRegistry hcr =
context.getCamelContextExtension().getContextPlugin(HealthCheckRegistry.class);
HealthCheckRepository repo
=
hcr.getRepository("consumers").orElse((HealthCheckRepository)
hcr.resolveById("consumers"));
repo.setEnabled(true);
@@ -72,7 +72,7 @@ public class TelegramConsumerHealthCheckErrorTest extends
TelegramTestSupport {
@Test
public void testReceptionOfTwoMessages() {
- HealthCheckRegistry hcr =
context.getExtension(HealthCheckRegistry.class);
+ HealthCheckRegistry hcr =
context.getCamelContextExtension().getContextPlugin(HealthCheckRegistry.class);
HealthCheckRepository repo = hcr.getRepository("consumers").get();
// wait until HC is DOWN
diff --git
a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerHealthCheckOkTest.java
b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerHealthCheckOkTest.java
index 041aa9338ff..eda4d4d1bf6 100644
---
a/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerHealthCheckOkTest.java
+++
b/components-starter/camel-telegram-starter/src/test/java/org/apache/camel/component/telegram/springboot/TelegramConsumerHealthCheckOkTest.java
@@ -60,7 +60,7 @@ public class TelegramConsumerHealthCheckOkTest extends
TelegramTestSupport {
protected void configureCamelContext(CamelContext context) {
// enabling consumers health check is a bit cumbersome via low-level
Java code
super.configureCamelContext(context);
- HealthCheckRegistry hcr =
context.getExtension(HealthCheckRegistry.class);
+ HealthCheckRegistry hcr =
context.getCamelContextExtension().getContextPlugin(HealthCheckRegistry.class);
HealthCheckRepository repo
=
hcr.getRepository("consumers").orElse((HealthCheckRepository)
hcr.resolveById("consumers"));
repo.setEnabled(true);
@@ -69,7 +69,7 @@ public class TelegramConsumerHealthCheckOkTest extends
TelegramTestSupport {
@Test
public void testReceptionOfTwoMessages() throws Exception {
- HealthCheckRegistry hcr =
context.getExtension(HealthCheckRegistry.class);
+ HealthCheckRegistry hcr =
context.getCamelContextExtension().getContextPlugin(HealthCheckRegistry.class);
HealthCheckRepository repo = hcr.getRepository("consumers").get();
endpoint.expectedMinimumMessageCount(2);
diff --git
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
index 567ddc6a602..687cedef579 100644
---
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
+++
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
@@ -140,7 +140,7 @@ public class CamelAutoConfiguration {
if (config.getRouteFilterIncludePattern() != null ||
config.getRouteFilterExcludePattern() != null) {
LOG.info("Route filtering pattern: include={}, exclude={}",
config.getRouteFilterIncludePattern(), config.getRouteFilterExcludePattern());
-
camelContext.getExtension(Model.class).setRouteFilterPattern(config.getRouteFilterIncludePattern(),
config.getRouteFilterExcludePattern());
+
camelContext.getCamelContextExtension().getContextPlugin(Model.class).setRouteFilterPattern(config.getRouteFilterIncludePattern(),
config.getRouteFilterExcludePattern());
}
// configure the common/default options
diff --git
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/console/CamelDevConsoleEndpoint.java
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/console/CamelDevConsoleEndpoint.java
index 8b2c13edb48..1c2431f554b 100644
---
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/console/CamelDevConsoleEndpoint.java
+++
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/console/CamelDevConsoleEndpoint.java
@@ -42,7 +42,7 @@ public class CamelDevConsoleEndpoint {
@ReadOperation
public JsonObject getConsoles() {
- DevConsoleRegistry dcr =
camelContext.getExtension(DevConsoleRegistry.class);
+ DevConsoleRegistry dcr =
camelContext.getCamelContextExtension().getContextPlugin(DevConsoleRegistry.class);
if (dcr == null || !dcr.isEnabled()) {
return null;
}
@@ -61,7 +61,7 @@ public class CamelDevConsoleEndpoint {
@ReadOperation
public JsonObject getConsoleById(@Selector String id) {
- DevConsoleRegistry dcr =
camelContext.getExtension(DevConsoleRegistry.class);
+ DevConsoleRegistry dcr =
camelContext.getCamelContextExtension().getContextPlugin(DevConsoleRegistry.class);
if (dcr == null || !dcr.isEnabled()) {
return null;
}
diff --git
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
index 1db45825159..f0baf6cb184 100644
---
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
+++
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
@@ -53,7 +53,7 @@ public class CamelRoutesEndpoint {
public CamelRoutesEndpoint(CamelContext camelContext,
CamelRoutesEndpointProperties properties) {
this.camelContext = camelContext;
- this.managedCamelContext =
camelContext.getExtension(ManagedCamelContext.class);
+ this.managedCamelContext =
camelContext.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class);
this.properties = properties;
}
@@ -258,7 +258,7 @@ public class CamelRoutesEndpoint {
public RouteDetailsEndpointInfo(final CamelContext camelContext, final
Route route) {
super(route);
if (camelContext.getManagementStrategy().getManagementAgent() !=
null) {
- ManagedCamelContext mcc =
camelContext.getExtension(ManagedCamelContext.class);
+ ManagedCamelContext mcc =
camelContext.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class);
this.routeDetails = new
RouteDetails(mcc.getManagedRoute(route.getId(), ManagedRouteMBean.class));
}
}
diff --git
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckAutoConfiguration.java
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckAutoConfiguration.java
index b13ff52d03c..f6b40f43543 100644
---
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckAutoConfiguration.java
+++
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckAutoConfiguration.java
@@ -61,7 +61,7 @@ public class CamelHealthCheckAutoConfiguration {
}
// auto-detect camel-health on classpath
- HealthCheckRegistry hcr =
camelContext.getExtension(HealthCheckRegistry.class);
+ HealthCheckRegistry hcr =
camelContext.getCamelContextExtension().getContextPlugin(HealthCheckRegistry.class);
if (hcr == null) {
if (config.getEnabled() != null && config.getEnabled()) {
LOG.warn("Cannot find HealthCheckRegistry from classpath.
Add camel-health to classpath.");
diff --git
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointReadOnlyOperationTest.java
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointReadOnlyOperationTest.java
index dc83ee7a821..c18556fb64e 100644
---
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointReadOnlyOperationTest.java
+++
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointReadOnlyOperationTest.java
@@ -52,7 +52,7 @@ public class CamelRoutesEndpointReadOnlyOperationTest {
@Test
public void testWriteOperation() throws Exception {
- AbstractCamelContext acontext =
camelContext.getExtension(AbstractCamelContext.class);
+ AbstractCamelContext acontext =
camelContext.getCamelContextExtension().getContextPlugin(AbstractCamelContext.class);
ServiceStatus status = acontext.getRouteStatus("foo-route");
Assertions.assertTrue(status.isStarted());
TimeInfo timeInfo = new TimeInfo();
diff --git
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointWriteOperationTest.java
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointWriteOperationTest.java
index eb8cba761c8..32dbb6e0388 100644
---
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointWriteOperationTest.java
+++
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointWriteOperationTest.java
@@ -52,7 +52,7 @@ public class CamelRoutesEndpointWriteOperationTest {
@Test
public void testWriteOperation() throws Exception {
- AbstractCamelContext acontext =
camelContext.getExtension(AbstractCamelContext.class);
+ AbstractCamelContext acontext =
camelContext.getCamelContextExtension().getContextPlugin(AbstractCamelContext.class);
ServiceStatus status = acontext.getRouteStatus("foo-route");
Assertions.assertTrue(status.isStarted());
TimeInfo timeInfo = new TimeInfo();
