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 5a54d2a49fd0fbfe4937d562617643ff75e04c0c Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Thu Feb 22 18:04:09 2024 +0100 CAMEL-20014: removed deprecated methods --- .../camel/impl/engine/AbstractCamelContext.java | 173 +-------------------- .../ROOT/pages/camel-4x-upgrade-guide-4_5.adoc | 23 +++ 2 files changed, 24 insertions(+), 172 deletions(-) diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java index d14bb4760cb..7ef38a1326a 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java @@ -1603,27 +1603,6 @@ public abstract class AbstractCamelContext extends BaseService return camelContextExtension.getTypeConverter(); } - /** - * Deprecated API. - * - * @deprecated Use methods from the {@link ExtendedCamelContext} - */ - @Deprecated(since = "4.2.0", forRemoval = true) - public void setTypeConverter(TypeConverter typeConverter) { - camelContextExtension.setTypeConverter(typeConverter); - } - - /** - * Get a type converter or create a new one if unset - * - * @deprecated use DefaultCamelContextExtension#getOrCreateTypeConverter() - * @return A type converter instance - */ - @Deprecated(since = "4.2.0", forRemoval = true) - protected TypeConverter getOrCreateTypeConverter() { - return camelContextExtension.getOrCreateTypeConverter(); - } - @Override public TypeConverterRegistry getTypeConverterRegistry() { return camelContextExtension.getTypeConverterRegistry(); @@ -1654,16 +1633,6 @@ public abstract class AbstractCamelContext extends BaseService camelContextExtension.setPropertiesComponent(propertiesComponent); } - /** - * Deprecated API. - * - * @deprecated Use methods from the {@link ExtendedCamelContext} - */ - @Deprecated(since = "4.2.0", forRemoval = true) - protected void setManagementMBeanAssembler(ManagementMBeanAssembler managementMBeanAssembler) { - camelContextExtension.setManagementMBeanAssembler(managementMBeanAssembler); - } - public void setAutoCreateComponents(boolean autoCreateComponents) { this.autoCreateComponents = autoCreateComponents; } @@ -3880,30 +3849,10 @@ public abstract class AbstractCamelContext extends BaseService } protected RestRegistry createRestRegistry() { - RestRegistryFactory factory = getRestRegistryFactory(); + RestRegistryFactory factory = camelContextExtension.getRestRegistryFactory(); return factory.createRegistry(); } - /** - * Deprecated API. - * - * @deprecated Use methods from the {@link ExtendedCamelContext} - */ - @Deprecated(since = "4.2.0", forRemoval = true) - public RestRegistryFactory getRestRegistryFactory() { - return camelContextExtension.getRestRegistryFactory(); - } - - /** - * Deprecated API. - * - * @deprecated Use methods from the {@link ExtendedCamelContext} - */ - @Deprecated(since = "4.2.0", forRemoval = true) - public void setRestRegistryFactory(RestRegistryFactory restRegistryFactory) { - camelContextExtension.setRestRegistryFactory(restRegistryFactory); - } - @Override public String getGlobalOption(String key) { String value = getGlobalOptions().get(key); @@ -3932,16 +3881,6 @@ public abstract class AbstractCamelContext extends BaseService return camelContextExtension.getTransformerRegistry(); } - /** - * Deprecated API. - * - * @deprecated Use methods from the {@link ExtendedCamelContext} - */ - @Deprecated(since = "4.2.0", forRemoval = true) - public void setTransformerRegistry(TransformerRegistry transformerRegistry) { - camelContextExtension.setTransformerRegistry(transformerRegistry); - } - @Override public Validator resolveValidator(DataType type) { return getValidatorRegistry().resolveValidator(new ValidatorKey(type)); @@ -3952,16 +3891,6 @@ public abstract class AbstractCamelContext extends BaseService return camelContextExtension.getValidatorRegistry(); } - /** - * Deprecated API. - * - * @deprecated Use methods from the {@link ExtendedCamelContext} - */ - @Deprecated(since = "4.2.0", forRemoval = true) - public void setValidatorRegistry(ValidatorRegistry validatorRegistry) { - camelContextExtension.setValidatorRegistry(validatorRegistry); - } - @Override public SSLContextParameters getSSLContextParameters() { return this.sslContextParameters; @@ -4158,86 +4087,16 @@ public abstract class AbstractCamelContext extends BaseService return camelContextExtension; } - /** - * Deprecated API. - * - * @deprecated Use methods from the {@link ExtendedCamelContext} - */ - @Deprecated(since = "4.2.0", forRemoval = true) - public void setName(String name) { - camelContextExtension.setName(name); - } - @Override public String getName() { return camelContextExtension.getName(); } - /** - * Deprecated API. - * - * @deprecated Use methods from the {@link ExtendedCamelContext} - */ - @Deprecated(since = "4.2.0", forRemoval = true) - public void setDescription(String description) { - camelContextExtension.setDescription(description); - } - @Override public String getDescription() { return camelContextExtension.getDescription(); } - /** - * Deprecated API. - * - * @deprecated Use methods from the {@link ExtendedCamelContext} - */ - @Deprecated(since = "4.2.0", forRemoval = true) - public FactoryFinder getBootstrapFactoryFinder() { - return camelContextExtension.getBootstrapFactoryFinder(); - } - - /** - * Deprecated API. - * - * @deprecated Use methods from the {@link ExtendedCamelContext} - */ - @Deprecated(since = "4.2.0", forRemoval = true) - public FactoryFinder getFactoryFinder(String path) { - return camelContextExtension.getFactoryFinder(path); - } - - /** - * Deprecated API. - * - * @deprecated Use methods from the {@link ExtendedCamelContext} - */ - @Deprecated(since = "4.2.0", forRemoval = true) - public void addInterceptStrategy(InterceptStrategy interceptStrategy) { - camelContextExtension.addInterceptStrategy(interceptStrategy); - } - - /** - * Deprecated API. - * - * @deprecated Use methods from the {@link ExtendedCamelContext} - */ - @Deprecated(since = "4.2.0", forRemoval = true) - public StartupStepRecorder getStartupStepRecorder() { - return camelContextExtension.getStartupStepRecorder(); - } - - /** - * Deprecated API. - * - * @deprecated Use methods from the {@link ExtendedCamelContext} - */ - @Deprecated(since = "4.2.0", forRemoval = true) - public void setStartupStepRecorder(StartupStepRecorder startupStepRecorder) { - camelContextExtension.setStartupStepRecorder(startupStepRecorder); - } - public void addRoute(Route route) { synchronized (routes) { routes.add(route); @@ -4250,36 +4109,6 @@ public abstract class AbstractCamelContext extends BaseService } } - /** - * Deprecated API. - * - * @deprecated Use methods from the {@link ExtendedCamelContext} - */ - @Deprecated(since = "4.2.0", forRemoval = true) - public String resolvePropertyPlaceholders(String text, boolean keepUnresolvedOptional) { - return camelContextExtension.resolvePropertyPlaceholders(text, keepUnresolvedOptional); - } - - /** - * Deprecated API. - * - * @deprecated Use methods from the {@link ExtendedCamelContext} - */ - @Deprecated(since = "4.2.0", forRemoval = true) - public String getBasePackageScan() { - return camelContextExtension.getBasePackageScan(); - } - - /** - * Deprecated API. - * - * @deprecated Use methods from the {@link ExtendedCamelContext} - */ - @Deprecated(since = "4.2.0", forRemoval = true) - public void setBasePackageScan(String basePackageScan) { - camelContextExtension.setBasePackageScan(basePackageScan); - } - byte getStatusPhase() { return status; } 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 379f81d2370..0babe048602 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 @@ -12,6 +12,29 @@ Camel startup summary will now report total number of routes without (internal r This ensures the total number better reflect the total number of user created routes. The summary now includes a separate number of Kamelets and Rest DSL routes. See also the camel-kamelet section. +The following deprecated methods from the `AbstractCamelContext`, deprecated on 4.2 as part of CAMEL-19998, were finally removed: + +* `setTypeConverter` +* `getOrCreateTypeConverter` +* `setManagementMBeanAssembler` +* `getRestRegistryFactory` +* `setRestRegistryFactory` +* `setTransformerRegistry` +* `setValidatorRegistry` +* `setName` +* `setDescription` +* `getBootstrapFactoryFinder` +* `getFactoryFinder` +* `addInterceptStrategy` +* `getStartupStepRecorder` +* `setStartupStepRecorder` +* `resolvePropertyPlaceholders` +* `getBasePackageScan` +* `setBasePackageScan` + +Users of these methods should use the respective operations from the `ExtendedCamelContext` (accessed via `getCamelContextExtension()`), +instead. + === Intercept EIP The `interceptFrom` and `interceptSentToEndpoint` EIPs is now storing the intercepted endpoint using key `Exchange.INTERCEPTED_ENDPOINT`
