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 8d198016a06d2795e895781bdbdfd27161658311 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Wed Aug 21 13:41:36 2024 +0200 (chores) convert core/camel-xml-jaxb to use pattern matching for instanceof --- .../java/org/apache/camel/xml/jaxb/JaxbHelper.java | 63 ++++++++++------------ .../camel/xml/jaxb/JaxbModelToXMLDumper.java | 18 +++---- 2 files changed, 36 insertions(+), 45 deletions(-) diff --git a/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbHelper.java b/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbHelper.java index 879c8a431f5..3c863ffef41 100644 --- a/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbHelper.java +++ b/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbHelper.java @@ -152,10 +152,10 @@ public final class JaxbHelper { NamespaceAware na = null; Expression exp = ed.getExpressionValue(); - if (exp instanceof NamespaceAware) { - na = (NamespaceAware) exp; - } else if (ed instanceof NamespaceAware) { - na = (NamespaceAware) ed; + if (exp instanceof NamespaceAware namespaceAware) { + na = namespaceAware; + } else if (ed instanceof NamespaceAware namespaceAware) { + na = namespaceAware; } return na; @@ -307,8 +307,8 @@ public final class JaxbHelper { } // Restore namespaces to anything that's NamespaceAware - if (result instanceof RouteTemplatesDefinition) { - List<RouteTemplateDefinition> templates = ((RouteTemplatesDefinition) result).getRouteTemplates(); + if (result instanceof RouteTemplatesDefinition routeTemplatesDefinition) { + List<RouteTemplateDefinition> templates = routeTemplatesDefinition.getRouteTemplates(); for (RouteTemplateDefinition template : templates) { RouteDefinition route = template.getRoute(); applyNamespaces(route, namespaces); @@ -317,16 +317,15 @@ public final class JaxbHelper { } resolveEndpointDslUris(route); } - } else if (result instanceof RouteTemplateDefinition) { - RouteTemplateDefinition template = (RouteTemplateDefinition) result; + } else if (result instanceof RouteTemplateDefinition template) { RouteDefinition route = template.getRoute(); applyNamespaces(route, namespaces); if (!locations.isEmpty()) { applySourceLocations(route, locations); } resolveEndpointDslUris(route); - } else if (result instanceof RoutesDefinition) { - List<RouteDefinition> routes = ((RoutesDefinition) result).getRoutes(); + } else if (result instanceof RoutesDefinition routesDefinition) { + List<RouteDefinition> routes = routesDefinition.getRoutes(); for (RouteDefinition route : routes) { applyNamespaces(route, namespaces); if (!locations.isEmpty()) { @@ -334,8 +333,7 @@ public final class JaxbHelper { } resolveEndpointDslUris(route); } - } else if (result instanceof RouteDefinition) { - RouteDefinition route = (RouteDefinition) result; + } else if (result instanceof RouteDefinition route) { applyNamespaces(route, namespaces); if (!locations.isEmpty()) { applySourceLocations(route, locations); @@ -364,13 +362,12 @@ public final class JaxbHelper { // can either be routes or a single route RoutesDefinition answer; - if (result instanceof RouteDefinition) { - RouteDefinition route = (RouteDefinition) result; + if (result instanceof RouteDefinition route) { answer = new RoutesDefinition(); applyNamespaces(route, namespaces); answer.getRoutes().add(route); - } else if (result instanceof RoutesDefinition) { - answer = (RoutesDefinition) result; + } else if (result instanceof RoutesDefinition routesDefinition) { + answer = routesDefinition; for (RouteDefinition route : answer.getRoutes()) { applyNamespaces(route, namespaces); } @@ -401,13 +398,12 @@ public final class JaxbHelper { // can either be routes or a single route RouteConfigurationsDefinition answer; - if (result instanceof RouteConfigurationDefinition) { - RouteConfigurationDefinition config = (RouteConfigurationDefinition) result; + if (result instanceof RouteConfigurationDefinition config) { answer = new RouteConfigurationsDefinition(); applyNamespaces(config, namespaces); answer.getRouteConfigurations().add(config); - } else if (result instanceof RouteConfigurationsDefinition) { - answer = (RouteConfigurationsDefinition) result; + } else if (result instanceof RouteConfigurationsDefinition routeConfigurationsDefinition) { + answer = routeConfigurationsDefinition; for (RouteConfigurationDefinition config : answer.getRouteConfigurations()) { applyNamespaces(config, namespaces); } @@ -438,13 +434,12 @@ public final class JaxbHelper { // can either be routes or a single route RouteTemplatesDefinition answer; - if (result instanceof RouteTemplateDefinition) { - RouteTemplateDefinition route = (RouteTemplateDefinition) result; + if (result instanceof RouteTemplateDefinition route) { answer = new RouteTemplatesDefinition(); applyNamespaces(route.getRoute(), namespaces); answer.getRouteTemplates().add(route); - } else if (result instanceof RouteTemplatesDefinition) { - answer = (RouteTemplatesDefinition) result; + } else if (result instanceof RouteTemplatesDefinition routeTemplatesDefinition) { + answer = routeTemplatesDefinition; for (RouteTemplateDefinition route : answer.getRouteTemplates()) { applyNamespaces(route.getRoute(), namespaces); } @@ -495,8 +490,8 @@ public final class JaxbHelper { if (result instanceof TemplatedRouteDefinition templatedRoute) { answer = new TemplatedRoutesDefinition(); answer.getTemplatedRoutes().add(templatedRoute); - } else if (result instanceof TemplatedRoutesDefinition) { - answer = (TemplatedRoutesDefinition) result; + } else if (result instanceof TemplatedRoutesDefinition templatedRoutesDefinition) { + answer = templatedRoutesDefinition; } else { // ignore not supported type return null; @@ -540,8 +535,8 @@ public final class JaxbHelper { if (result instanceof RestDefinition rest) { answer = new RestsDefinition(); answer.getRests().add(rest); - } else if (result instanceof RestsDefinition) { - answer = (RestsDefinition) result; + } else if (result instanceof RestsDefinition restsDefinition) { + answer = restsDefinition; } else { // ignore not supported type return null; @@ -565,8 +560,8 @@ public final class JaxbHelper { throw new IOException("Cannot unmarshal to rest configuration using JAXB from input stream: " + inputStream); } - if (result instanceof RestConfigurationDefinition) { - return (RestConfigurationDefinition) result; + if (result instanceof RestConfigurationDefinition restConfigurationDefinition) { + return restConfigurationDefinition; } else { // ignore not supported type return null; @@ -631,15 +626,13 @@ public final class JaxbHelper { } public static void enrichLocations(Node node, Map<String, KeyValueHolder<Integer, String>> locations) { - if (node instanceof Element) { - Element el = (Element) node; - + if (node instanceof Element el) { // from should grab it from parent (route) String id = el.getAttribute("id"); if ("from".equals(el.getNodeName())) { Node parent = el.getParentNode(); - if (parent instanceof Element) { - id = ((Element) parent).getAttribute("id"); + if (parent instanceof Element parentElement) { + id = parentElement.getAttribute("id"); } } var loc = locations.get(id); diff --git a/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java b/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java index a0684c08178..294e81c45f1 100644 --- a/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java +++ b/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java @@ -84,8 +84,8 @@ public class JaxbModelToXMLDumper implements ModelToXMLDumper { // gather all namespaces from the routes or route which is stored on the // expression nodes - if (definition instanceof RouteTemplatesDefinition) { - List<RouteTemplateDefinition> templates = ((RouteTemplatesDefinition) definition).getRouteTemplates(); + if (definition instanceof RouteTemplatesDefinition routeTemplatesDefinition) { + List<RouteTemplateDefinition> templates = routeTemplatesDefinition.getRouteTemplates(); for (RouteTemplateDefinition route : templates) { extractNamespaces(route.getRoute(), namespaces); if (context.isDebugging()) { @@ -93,15 +93,14 @@ public class JaxbModelToXMLDumper implements ModelToXMLDumper { } resolveEndpointDslUris(route.getRoute()); } - } else if (definition instanceof RouteTemplateDefinition) { - RouteTemplateDefinition template = (RouteTemplateDefinition) definition; + } else if (definition instanceof RouteTemplateDefinition template) { extractNamespaces(template.getRoute(), namespaces); if (context.isDebugging()) { extractSourceLocations(template.getRoute(), locations); } resolveEndpointDslUris(template.getRoute()); - } else if (definition instanceof RoutesDefinition) { - List<RouteDefinition> routes = ((RoutesDefinition) definition).getRoutes(); + } else if (definition instanceof RoutesDefinition routesDefinition) { + List<RouteDefinition> routes = routesDefinition.getRoutes(); for (RouteDefinition route : routes) { extractNamespaces(route, namespaces); if (context.isDebugging()) { @@ -109,8 +108,7 @@ public class JaxbModelToXMLDumper implements ModelToXMLDumper { } resolveEndpointDslUris(route); } - } else if (definition instanceof RouteDefinition) { - RouteDefinition route = (RouteDefinition) definition; + } else if (definition instanceof RouteDefinition route) { extractNamespaces(route, namespaces); if (context.isDebugging()) { extractSourceLocations(route, locations); @@ -180,8 +178,8 @@ public class JaxbModelToXMLDumper implements ModelToXMLDumper { Iterator<?> it = null; if (definition instanceof RouteDefinition) { it = ObjectHelper.createIterator(definition); - } else if (definition instanceof RoutesDefinition) { - it = ObjectHelper.createIterator(((RoutesDefinition) definition).getRoutes()); + } else if (definition instanceof RoutesDefinition routesDefinition) { + it = ObjectHelper.createIterator(routesDefinition.getRoutes()); } while (it != null && it.hasNext()) { RouteDefinition routeDefinition = (RouteDefinition) it.next();
