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.git
commit fb2aad50c89a90e5455b9860a92adb0fb050354c Author: Claus Ibsen <[email protected]> AuthorDate: Fri Feb 24 10:54:34 2023 +0100 CAMEL-19090: Remove deprecated apis in core --- .../java/org/apache/camel/spi/UriEndpoint.java | 6 -- .../src/main/java/org/apache/camel/Consume.java | 8 --- .../main/java/org/apache/camel/EndpointInject.java | 8 --- .../java/org/apache/camel/FallbackConverter.java | 53 --------------- .../org/apache/camel/FluentProducerTemplate.java | 24 ------- .../src/main/java/org/apache/camel/Produce.java | 8 --- .../camel/spi/PackageScanResourceResolver.java | 59 ----------------- .../src/main/java/org/apache/camel/spi/Tracer.java | 11 ---- .../camel/impl/engine/AbstractCamelContext.java | 76 ++-------------------- .../impl/engine/CamelPostProcessorHelper.java | 3 +- .../impl/engine/DefaultCamelBeanPostProcessor.java | 14 ++-- .../impl/engine/DefaultFluentProducerTemplate.java | 26 -------- .../apache/camel/impl/engine/DefaultTracer.java | 6 -- .../component/properties/PropertiesComponent.java | 19 ------ .../FastAnnotationTypeConverterLoader.java | 38 ----------- .../java/org/apache/camel/spi/UriEndpoint.java | 6 -- 16 files changed, 11 insertions(+), 354 deletions(-) diff --git a/core/camel-api/src/generated/java/org/apache/camel/spi/UriEndpoint.java b/core/camel-api/src/generated/java/org/apache/camel/spi/UriEndpoint.java index 00f97990130..972bd7d96d2 100644 --- a/core/camel-api/src/generated/java/org/apache/camel/spi/UriEndpoint.java +++ b/core/camel-api/src/generated/java/org/apache/camel/spi/UriEndpoint.java @@ -91,12 +91,6 @@ public @interface UriEndpoint { */ String alternativeSyntax() default ""; - /** - * Represents the consumer class which is injected and created by consumers - */ - @Deprecated - Class<?> consumerClass() default Object.class; - /** * The configuration parameter name prefix used on parameter names to separate the endpoint properties from the * consumer properties diff --git a/core/camel-api/src/main/java/org/apache/camel/Consume.java b/core/camel-api/src/main/java/org/apache/camel/Consume.java index 70f5a0b2bee..ad84a6498dd 100644 --- a/core/camel-api/src/main/java/org/apache/camel/Consume.java +++ b/core/camel-api/src/main/java/org/apache/camel/Consume.java @@ -40,14 +40,6 @@ public @interface Consume { */ String value() default ""; - /** - * The uri to consume from - * - * @deprecated use value instead - */ - @Deprecated - String uri() default ""; - /** * Use the field or getter on the bean to provide the uri to consume from */ diff --git a/core/camel-api/src/main/java/org/apache/camel/EndpointInject.java b/core/camel-api/src/main/java/org/apache/camel/EndpointInject.java index 6219c22b9e6..c60a15bb476 100644 --- a/core/camel-api/src/main/java/org/apache/camel/EndpointInject.java +++ b/core/camel-api/src/main/java/org/apache/camel/EndpointInject.java @@ -41,14 +41,6 @@ public @interface EndpointInject { */ String value() default ""; - /** - * The uri of the endpoint - * - * @deprecated use value instead - */ - @Deprecated - String uri() default ""; - /** * Use the field or getter on the bean to provide the uri of the endpoint */ diff --git a/core/camel-api/src/main/java/org/apache/camel/FallbackConverter.java b/core/camel-api/src/main/java/org/apache/camel/FallbackConverter.java deleted file mode 100644 index 1cdddd2c56f..00000000000 --- a/core/camel-api/src/main/java/org/apache/camel/FallbackConverter.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * An annotation used to mark methods to indicate code capable of being a fallback converter which are then - * auto-discovered using the <a href="http://camel.apache.org/type-converter.html";>Type Conversion Support</a>. - * <p/> - * The difference between a regular <tt>@Converter</tt> and a <tt>@FallbackConverter</tt> is that the fallback is - * resolved at last if no regular converter could be found. Also the method signature is scoped to be generic to allow - * handling a broader range of types trying to be converted. The fallback converter can just return <tt>null</tt> if it - * can not handle the types to convert from/to. - * - * @see org.apache.camel.component.file.GenericFileConverter GenericFileConverter for an example. - * @deprecated use @Converter(fallback = true) instead - */ -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Target({ ElementType.TYPE, ElementType.METHOD }) -@Deprecated -public @interface FallbackConverter { - - /** - * Whether or not returning <tt>null</tt> is a valid response. - */ - boolean allowNull() default false; - - /** - * Whether or not this fallback converter can be promoted to a first class type converter. - */ - boolean canPromote() default false; - -} diff --git a/core/camel-api/src/main/java/org/apache/camel/FluentProducerTemplate.java b/core/camel-api/src/main/java/org/apache/camel/FluentProducerTemplate.java index 635f86ada40..e26f177f9a2 100644 --- a/core/camel-api/src/main/java/org/apache/camel/FluentProducerTemplate.java +++ b/core/camel-api/src/main/java/org/apache/camel/FluentProducerTemplate.java @@ -170,14 +170,6 @@ public interface FluentProducerTemplate extends Service { // Fluent methods // ----------------------------------------------------------------------- - /** - * Remove the body and headers. - * - * @deprecated the template automatic clears when sending - */ - @Deprecated - FluentProducerTemplate clearAll(); - /** * Set the headers * @@ -199,14 +191,6 @@ public interface FluentProducerTemplate extends Service { */ FluentProducerTemplate withHeader(String key, Object value); - /** - * Remove the headers. - * - * @deprecated the template automatic clears when sending - */ - @Deprecated - FluentProducerTemplate clearHeaders(); - /** * Set the message body * @@ -228,14 +212,6 @@ public interface FluentProducerTemplate extends Service { */ FluentProducerTemplate withBodyAs(Object body, Class<?> type); - /** - * Remove the body. - * - * @deprecated the template automatic clears when sending - */ - @Deprecated - FluentProducerTemplate clearBody(); - /** * To customize the producer template for advanced usage like to set the executor service to use. * diff --git a/core/camel-api/src/main/java/org/apache/camel/Produce.java b/core/camel-api/src/main/java/org/apache/camel/Produce.java index a83d2091b7b..b88a1f48993 100644 --- a/core/camel-api/src/main/java/org/apache/camel/Produce.java +++ b/core/camel-api/src/main/java/org/apache/camel/Produce.java @@ -42,14 +42,6 @@ public @interface Produce { */ String value() default ""; - /** - * The uri to produce to - * - * @deprecated use value instead - */ - @Deprecated - String uri() default ""; - /** * Use the field or getter on the bean to provide the uri to produce to */ diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/PackageScanResourceResolver.java b/core/camel-api/src/main/java/org/apache/camel/spi/PackageScanResourceResolver.java index 564623b360f..e158791c3d0 100644 --- a/core/camel-api/src/main/java/org/apache/camel/spi/PackageScanResourceResolver.java +++ b/core/camel-api/src/main/java/org/apache/camel/spi/PackageScanResourceResolver.java @@ -16,13 +16,8 @@ */ package org.apache.camel.spi; -import java.io.InputStream; -import java.util.ArrayList; import java.util.Collection; -import java.util.List; import java.util.Set; -import java.util.TreeSet; -import java.util.stream.Collectors; import org.apache.camel.StaticService; @@ -75,58 +70,4 @@ public interface PackageScanResourceResolver extends StaticService { */ Collection<Resource> findResources(String location) throws Exception; - /** - * Finds the resource names from the given location. - * - * The location can be prefixed with either file: or classpath: to look in either file system or classpath. By - * default classpath is assumed if no prefix is specified. - * - * Wildcards is supported using a ANT pattern style paths, such as classpath:**/*camel*.xml - * - * Notice when using wildcards, then there is additional overhead as the classpath is scanned, where as if you - * specific the exact name for each XML file is faster as no classpath scanning is needed. - * - * @param location the location (support ANT style patterns, eg routes/camel-*.xml) - * @return the found resource names, or an empty collection if no resources found - * @throws Exception can be thrown during scanning for resources. - * @deprecated use {@link #findResources(String)} - */ - @Deprecated - default Collection<String> findResourceNames(String location) throws Exception { - return findResources(location) - .stream() - .map(Resource::getLocation) - .collect(Collectors.toCollection(TreeSet::new)); - } - - /** - * Finds the resources from the given location. - * - * The location can be prefixed with either file: or classpath: to look in either file system or classpath. By - * default classpath is assumed if no prefix is specified. - * - * Wildcards is supported using a ANT pattern style paths, such as classpath:**/*camel*.xml - * - * Notice when using wildcards, then there is additional overhead as the classpath is scanned, where as if you - * specific the exact name for each XML file is faster as no classpath scanning is needed. - * - * <b>Important:</b> Make sure to close the returned input streams after use. - * - * @param location the location (support ANT style patterns, eg routes/camel-*.xml) - * @return the found resources, or an empty collection if no resources found - * @throws Exception can be thrown during scanning for resources. - * @deprecated use {@link #findResources(String)} - */ - @Deprecated - default Collection<InputStream> findResourceStreams(String location) throws Exception { - final Collection<Resource> values = findResources(location); - final List<InputStream> answer = new ArrayList<>(values.size()); - - for (Resource resource : values) { - answer.add(resource.getInputStream()); - } - - return answer; - } - } diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/Tracer.java b/core/camel-api/src/main/java/org/apache/camel/spi/Tracer.java index 0aa3329d4b2..b904734a69e 100644 --- a/core/camel-api/src/main/java/org/apache/camel/spi/Tracer.java +++ b/core/camel-api/src/main/java/org/apache/camel/spi/Tracer.java @@ -19,7 +19,6 @@ package org.apache.camel.spi; import org.apache.camel.Exchange; import org.apache.camel.NamedNode; import org.apache.camel.NamedRoute; -import org.apache.camel.Route; import org.apache.camel.StaticService; /** @@ -67,16 +66,6 @@ public interface Tracer extends StaticService { */ void traceAfterRoute(NamedRoute route, Exchange exchange); - /** - * Trace after the route (eg output from route) - * - * @param route the route - * @param exchange the exchange - * @deprecated use {@link #traceAfterRoute(NamedRoute, Exchange)} - */ - @Deprecated - void traceAfterRoute(Route route, Exchange exchange); - /** * Number of traced messages */ 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 c7a6b96529f..de8eb2e970d 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 @@ -251,7 +251,6 @@ public abstract class AbstractCamelContext extends BaseService // special flags to control the first startup which can are special private volatile boolean firstStartDone; private volatile boolean doNotStartRoutesOnFirstStart; - private Initialization initialization = Initialization.Default; private Boolean autoStartup = Boolean.TRUE; private Boolean backlogTrace = Boolean.FALSE; private Boolean backlogTraceStandby = Boolean.FALSE; @@ -515,16 +514,6 @@ public abstract class AbstractCamelContext extends BaseService return vetoed != null; } - @Deprecated - public Initialization getInitialization() { - return initialization; - } - - @Deprecated - public void setInitialization(Initialization initialization) { - this.initialization = initialization; - } - @Override public String getName() { return getNameStrategy().getName(); @@ -2768,11 +2757,9 @@ public abstract class AbstractCamelContext extends BaseService // Initialize LRUCacheFactory as eager as possible, // to let it warm up concurrently while Camel is startup up - if (initialization != Initialization.Lazy) { - StartupStep subStep = startupStepRecorder.beginStep(CamelContext.class, null, "Setup LRUCacheFactory"); - LRUCacheFactory.init(); - startupStepRecorder.endStep(subStep); - } + StartupStep subStep = startupStepRecorder.beginStep(CamelContext.class, null, "Setup LRUCacheFactory"); + LRUCacheFactory.init(); + startupStepRecorder.endStep(subStep); // Setup management first since end users may use it to add event // notifiers using the management strategy before the CamelContext has been started @@ -3868,18 +3855,9 @@ public abstract class AbstractCamelContext extends BaseService StartupStep step = startupStepRecorder.beginStep(CamelContext.class, getName(), "Start Mandatory Services"); initEagerMandatoryServices(); startupStepRecorder.endStep(step); - - if (initialization != Initialization.Lazy) { - step = startupStepRecorder.beginStep(CamelContext.class, getName(), "Start Standard Services"); - doStartStandardServices(); - startupStepRecorder.endStep(step); - - if (initialization == Initialization.Eager) { - step = startupStepRecorder.beginStep(CamelContext.class, getName(), "Start Eager Services"); - doStartEagerServices(); - startupStepRecorder.endStep(step); - } - } + step = startupStepRecorder.beginStep(CamelContext.class, getName(), "Start Standard Services"); + doStartStandardServices(); + startupStepRecorder.endStep(step); } /** @@ -3936,41 +3914,6 @@ public abstract class AbstractCamelContext extends BaseService resolveLanguage("simple"); } - protected void doStartEagerServices() { - getPackageScanClassResolver(); - getInflightRepository(); - getAsyncProcessorAwaitManager(); - getReactiveExecutor(); - getBeanIntrospection(); - getUriFactoryResolver(); - getModelToXMLDumper(); - getNodeIdFactory(); - getModelJAXBContextFactory(); - getUnitOfWorkFactory(); - getRouteController(); - getRoutesLoader(); - getResourceLoader(); - - try { - getRestRegistryFactory(); - } catch (IllegalArgumentException e) { - // ignore in case camel-rest is not on the classpath - } - try { - getProcessorFactory(); - getInternalProcessorFactory(); - } catch (IllegalArgumentException e) { - // ignore in case camel-core-processor is not on the classpath - } - try { - getBeanProxyFactory(); - getBeanProcessorFactory(); - } catch (IllegalArgumentException e) { - // ignore in case camel-bean is not on the classpath - } - getBeanPostProcessor(); - } - /** * Force clear lazy initialization so they can be re-created on restart */ @@ -5484,13 +5427,6 @@ public abstract class AbstractCamelContext extends BaseService this.cliConnectorFactory = cliConnectorFactory; } - @Deprecated - public enum Initialization { - Eager, - Default, - Lazy - } - class LifecycleHelper implements AutoCloseable { final Map<String, String> originalContextMap; final ClassLoader tccl; diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java index 9890302f8f4..dc2fefa1d3c 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java @@ -89,8 +89,7 @@ public class CamelPostProcessorHelper implements CamelContextAware { Consume consume = method.getAnnotation(Consume.class); if (consume != null) { LOG.debug("Creating a consumer for: {}", consume); - String uri = consume.value().isEmpty() ? consume.uri() : consume.value(); - subscribeMethod(method, bean, beanName, uri, consume.property(), consume.predicate()); + subscribeMethod(method, bean, beanName, consume.value(), consume.property(), consume.predicate()); } } diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java index 6293b862603..1141f982785 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java @@ -260,16 +260,12 @@ public class DefaultCamelBeanPostProcessor implements CamelBeanPostProcessor, Ca EndpointInject endpointInject = field.getAnnotation(EndpointInject.class); if (endpointInject != null) { - @SuppressWarnings("deprecation") - String uri = endpointInject.value().isEmpty() ? endpointInject.uri() : endpointInject.value(); - injectField(field, uri, endpointInject.property(), bean, beanName); + injectField(field, endpointInject.value(), endpointInject.property(), bean, beanName); } Produce produce = field.getAnnotation(Produce.class); if (produce != null) { - @SuppressWarnings("deprecation") - String uri = produce.value().isEmpty() ? produce.uri() : produce.value(); - injectField(field, uri, produce.property(), bean, beanName, produce.binding()); + injectField(field, produce.value(), produce.property(), bean, beanName, produce.binding()); } // custom bean injector on the field @@ -430,14 +426,12 @@ public class DefaultCamelBeanPostProcessor implements CamelBeanPostProcessor, Ca EndpointInject endpointInject = method.getAnnotation(EndpointInject.class); if (endpointInject != null) { - String uri = endpointInject.value().isEmpty() ? endpointInject.uri() : endpointInject.value(); - setterInjection(method, bean, beanName, uri, endpointInject.property()); + setterInjection(method, bean, beanName, endpointInject.value(), endpointInject.property()); } Produce produce = method.getAnnotation(Produce.class); if (produce != null) { - String uri = produce.value().isEmpty() ? produce.uri() : produce.value(); - setterInjection(method, bean, beanName, uri, produce.property()); + setterInjection(method, bean, beanName, produce.value(), produce.property()); } } diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultFluentProducerTemplate.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultFluentProducerTemplate.java index 42b12afee04..386ddbdde26 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultFluentProducerTemplate.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultFluentProducerTemplate.java @@ -173,13 +173,6 @@ public class DefaultFluentProducerTemplate extends ServiceSupport implements Flu this.eventNotifierEnabled = eventNotifierEnabled; } - @Override - public FluentProducerTemplate clearAll() { - clearBody(); - clearHeaders(); - return this; - } - @Override public FluentProducerTemplate withHeaders(Map<String, Object> headers) { DefaultFluentProducerTemplate clone = checkCloned(); @@ -214,16 +207,6 @@ public class DefaultFluentProducerTemplate extends ServiceSupport implements Flu return clone; } - @Override - public FluentProducerTemplate clearHeaders() { - DefaultFluentProducerTemplate clone = checkCloned(); - - if (clone.headers != null) { - clone.headers.clear(); - } - return clone; - } - @Override public FluentProducerTemplate withBody(Object body) { DefaultFluentProducerTemplate clone = checkCloned(); @@ -250,14 +233,6 @@ public class DefaultFluentProducerTemplate extends ServiceSupport implements Flu return clone; } - @Override - public FluentProducerTemplate clearBody() { - DefaultFluentProducerTemplate clone = checkCloned(); - - clone.body = null; - return clone; - } - @Override public FluentProducerTemplate withDefaultEndpoint(String endpointUri) { if (cloned) { @@ -619,7 +594,6 @@ public class DefaultFluentProducerTemplate extends ServiceSupport implements Flu @Override protected void doStop() throws Exception { - clearAll(); this.endpoint = null; this.endpointUri = null; this.exchangeSupplier = null; diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java index 6d25689fd5c..451f526bf0b 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java @@ -23,7 +23,6 @@ import org.apache.camel.CamelContextAware; import org.apache.camel.Exchange; import org.apache.camel.NamedNode; import org.apache.camel.NamedRoute; -import org.apache.camel.Route; import org.apache.camel.spi.ExchangeFormatter; import org.apache.camel.spi.Tracer; import org.apache.camel.support.CamelContextHelper; @@ -133,11 +132,6 @@ public class DefaultTracer extends ServiceSupport implements CamelContextAware, dumpTrace(out, route); } - @Override - public void traceAfterRoute(Route route, Exchange exchange) { - // noop - } - @Override public void traceAfterRoute(NamedRoute route, Exchange exchange) { if (!traceBeforeAndAfterRoute) { diff --git a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java index dee58f6cccf..47c98424024 100644 --- a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java +++ b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java @@ -19,7 +19,6 @@ package org.apache.camel.component.properties; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.Properties; @@ -542,14 +541,6 @@ public class PropertiesComponent extends ServiceSupport return localPropertiesEnabled ? localProperties.get() : null; } - /** - * Gets the functions registered in this properties component. - */ - @Deprecated - public Map<String, PropertiesFunction> getFunctions() { - return propertiesFunctionResolver.getFunctions(); - } - @Override public PropertiesFunction getPropertiesFunction(String name) { if (name == null) { @@ -568,16 +559,6 @@ public class PropertiesComponent extends ServiceSupport return propertiesFunctionResolver.hasFunction(name); } - /** - * Is there a {@link PropertiesFunction} with the given name? - * - * @deprecated use hasPropertiesFunction - */ - @Deprecated - public boolean hasFunction(String name) { - return hasPropertiesFunction(name); - } - @ManagedAttribute(description = "System properties mode") public int getSystemPropertiesMode() { return systemPropertiesMode; diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/converter/FastAnnotationTypeConverterLoader.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/FastAnnotationTypeConverterLoader.java deleted file mode 100644 index 6c08c4827fc..00000000000 --- a/core/camel-base/src/main/java/org/apache/camel/impl/converter/FastAnnotationTypeConverterLoader.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.impl.converter; - -import org.apache.camel.Converter; -import org.apache.camel.spi.PackageScanClassResolver; - -@Deprecated -public final class FastAnnotationTypeConverterLoader extends AnnotationTypeConverterLoader { - - public FastAnnotationTypeConverterLoader(PackageScanClassResolver resolver) { - super(resolver); - } - - @Override - protected boolean acceptClass(Class<?> clazz) { - Converter conv = clazz.getAnnotation(Converter.class); - if (conv != null) { - // skip all loader classes as they have already been loaded - return !conv.generateLoader(); - } - return true; - } -} diff --git a/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriEndpoint.java b/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriEndpoint.java index 00f97990130..972bd7d96d2 100644 --- a/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriEndpoint.java +++ b/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriEndpoint.java @@ -91,12 +91,6 @@ public @interface UriEndpoint { */ String alternativeSyntax() default ""; - /** - * Represents the consumer class which is injected and created by consumers - */ - @Deprecated - Class<?> consumerClass() default Object.class; - /** * The configuration parameter name prefix used on parameter names to separate the endpoint properties from the * consumer properties
