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 cac3a346a76f4e390dbb2a5152c7389c29cfae65 Author: Otavio Rodolfo Piske <angusyo...@gmail.com> AuthorDate: Tue Aug 20 13:10:54 2024 +0200 (chores) convert core/camel-cloud to use pattern matching for instanceof --- .../camel/impl/cloud/ServiceCallProcessorFactory.java | 16 ++++++++-------- .../camel/impl/cloud/ServiceRegistrationRoutePolicy.java | 4 +--- .../camel/impl/cloud/ServiceCallConfigurationTest.java | 8 ++++---- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java index dc42fff7804..ff9822b3454 100644 --- a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java +++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java @@ -77,14 +77,14 @@ public class ServiceCallProcessorFactory extends TypedProcessorFactory<ServiceCa CamelContextAware.trySetCamelContext(serviceChooser, camelContext); CamelContextAware.trySetCamelContext(loadBalancer, camelContext); - if (loadBalancer instanceof ServiceDiscoveryAware) { - ((ServiceDiscoveryAware) loadBalancer).setServiceDiscovery(serviceDiscovery); + if (loadBalancer instanceof ServiceDiscoveryAware serviceDiscoveryAware) { + serviceDiscoveryAware.setServiceDiscovery(serviceDiscovery); } - if (loadBalancer instanceof ServiceFilterAware) { - ((ServiceFilterAware) loadBalancer).setServiceFilter(serviceFilter); + if (loadBalancer instanceof ServiceFilterAware serviceFilterAware) { + serviceFilterAware.setServiceFilter(serviceFilter); } - if (loadBalancer instanceof ServiceChooserAware) { - ((ServiceChooserAware) loadBalancer).setServiceChooser(serviceChooser); + if (loadBalancer instanceof ServiceChooserAware serviceChooserAware) { + serviceChooserAware.setServiceChooser(serviceChooser); } // The component is used to configure the default scheme to use (eg @@ -131,8 +131,8 @@ public class ServiceCallProcessorFactory extends TypedProcessorFactory<ServiceCa ExchangePattern pattern = CamelContextHelper.parse(camelContext, ExchangePattern.class, definition.getPattern()); Expression expression = retrieveExpression(camelContext, endpointScheme); - if (expression instanceof ExpressionFactory) { - expression = ((ExpressionFactory) expression).createExpression(camelContext); + if (expression instanceof ExpressionFactory expressionFactory) { + expression = expressionFactory.createExpression(camelContext); } return new DefaultServiceCallProcessor( camelContext, camelContext.resolvePropertyPlaceholders(definition.getName()), endpointScheme, endpointUri, diff --git a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrationRoutePolicy.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrationRoutePolicy.java index f310bf58f3f..fa384e28c6a 100644 --- a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrationRoutePolicy.java +++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrationRoutePolicy.java @@ -127,9 +127,7 @@ public class ServiceRegistrationRoutePolicy extends RoutePolicySupport implement final Endpoint endpoint = route.getConsumer().getEndpoint(); final Map<String, String> properties = new HashMap<>(); - if (endpoint instanceof DiscoverableService) { - final DiscoverableService service = (DiscoverableService) endpoint; - + if (endpoint instanceof DiscoverableService service) { // first load all the properties from the endpoint properties.putAll(service.getServiceProperties()); } diff --git a/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceCallConfigurationTest.java b/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceCallConfigurationTest.java index d31351c8f57..831e0ccf451 100644 --- a/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceCallConfigurationTest.java +++ b/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceCallConfigurationTest.java @@ -448,11 +448,11 @@ public class ServiceCallConfigurationTest { private DefaultServiceCallProcessor findServiceCallProcessor(Route route) { for (Processor processor : route.navigate().next()) { - if (processor instanceof DefaultChannel) { - processor = ((DefaultChannel) processor).getNextProcessor(); + if (processor instanceof DefaultChannel defaultChannel) { + processor = defaultChannel.getNextProcessor(); } - if (processor instanceof DefaultServiceCallProcessor) { - return (DefaultServiceCallProcessor) processor; + if (processor instanceof DefaultServiceCallProcessor defaultServiceCallProcessor) { + return defaultServiceCallProcessor; } }