This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch tomee-10.x in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 16cc09608549b23d818cef4581c784e24770fd7a Author: Martin Wiesner <[email protected]> AuthorDate: Mon Feb 23 21:19:57 2026 +0100 Replace local var declarations with more compact pattern variables (cherry picked from commit 67756da75a30186c89d9548179952379f582c542) --- .../main/java/org/apache/tomee/catalina/ServerListener.java | 3 +-- .../main/java/org/apache/tomee/catalina/TomEEWebappLoader.java | 3 +-- .../java/org/apache/tomee/catalina/TomcatJavaJndiBinder.java | 3 +-- .../src/main/java/org/apache/tomee/catalina/TomcatLoader.java | 10 ++++------ .../java/org/apache/tomee/catalina/security/UncheckedItem.java | 3 +-- .../src/main/java/org/apache/tomee/common/EnumFactory.java | 4 +--- .../src/main/java/org/apache/tomee/common/LookupFactory.java | 4 +--- .../src/main/java/org/apache/tomee/common/WsFactory.java | 4 +--- .../src/main/java/org/apache/tomee/loader/filter/Filters.java | 6 ++---- .../java/org/apache/tomee/security/TomEESecurityContext.java | 3 +-- .../security/identitystore/TomEEDefaultIdentityStore.java | 3 +-- .../tomee/security/identitystore/TomEELDAPIdentityStore.java | 3 +-- 12 files changed, 16 insertions(+), 33 deletions(-) diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java index f836de3b5b..f373f74d42 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java @@ -58,12 +58,11 @@ public class ServerListener implements LifecycleListener { if (listenerInstalled.get() || !Lifecycle.AFTER_INIT_EVENT.equals(event.getType())) { return; } - if (!(event.getSource() instanceof StandardServer)) { + if (!(event.getSource() instanceof StandardServer server)) { return; } try { - final StandardServer server = (StandardServer) event.getSource(); TomcatHelper.setServer(server); diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java index e52d62e5f1..2c7058a4e4 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java @@ -51,8 +51,7 @@ public class TomEEWebappLoader extends WebappLoader { } final ClassLoader classloader = super.getClassLoader(); - if (classloader instanceof TomEEWebappClassLoader) { - final TomEEWebappClassLoader tomEEWebappClassLoader = (TomEEWebappClassLoader) classloader; + if (classloader instanceof TomEEWebappClassLoader tomEEWebappClassLoader) { tomEEWebappClassLoader.restarting(); try { super.backgroundProcess(); diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJavaJndiBinder.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJavaJndiBinder.java index b26dc36f0b..a2b58356ed 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJavaJndiBinder.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJavaJndiBinder.java @@ -25,8 +25,7 @@ public class TomcatJavaJndiBinder implements LifecycleListener { @Override public void lifecycleEvent(final LifecycleEvent event) { final Object source = event.getSource(); - if (source instanceof StandardContext) { - final StandardContext context = (StandardContext) source; + if (source instanceof StandardContext context) { if (Lifecycle.CONFIGURE_START_EVENT.equals(event.getType())) { TomcatJndiBuilder.mergeJava(context); } diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java index 21624788a4..5cada0da05 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java @@ -400,14 +400,12 @@ public class TomcatLoader implements Loader { private void processRunningApplications(final TomcatWebAppBuilder tomcatWebAppBuilder, final StandardServer standardServer) { for (final org.apache.catalina.Service service : standardServer.findServices()) { if (service.getContainer() instanceof Engine) { - final Engine engine = (Engine) service.getContainer(); + final Engine engine = service.getContainer(); for (final Container engineChild : engine.findChildren()) { - if (engineChild instanceof Host) { - final Host host = (Host) engineChild; + if (engineChild instanceof Host host) { for (final Container hostChild : host.findChildren()) { - if (hostChild instanceof StandardContext) { - final StandardContext standardContext = (StandardContext) hostChild; - final int state = TomcatHelper.getContextState(standardContext); + if (hostChild instanceof StandardContext standardContext) { + final int state = TomcatHelper.getContextState(standardContext); if (state == 0) { // context only initialized tomcatWebAppBuilder.init(standardContext); diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/security/UncheckedItem.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/security/UncheckedItem.java index fb82bda1b5..b0a228ca2d 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/security/UncheckedItem.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/security/UncheckedItem.java @@ -34,8 +34,7 @@ class UncheckedItem { } public boolean equals(Object o) { - if (o instanceof UncheckedItem) { - UncheckedItem item = (UncheckedItem) o; + if (o instanceof UncheckedItem item) { return item.transportType == transportType && item.name.equals(this.name); } return false; diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/common/EnumFactory.java b/tomee/tomee-common/src/main/java/org/apache/tomee/common/EnumFactory.java index a70ab3289b..749fbb3a9e 100644 --- a/tomee/tomee-common/src/main/java/org/apache/tomee/common/EnumFactory.java +++ b/tomee/tomee-common/src/main/java/org/apache/tomee/common/EnumFactory.java @@ -31,12 +31,10 @@ public class EnumFactory implements ObjectFactory { @Override public Object getObjectInstance(final Object object, final Name name, final Context context, final Hashtable environment) throws Exception { - if (!(object instanceof Reference)) { + if (!(object instanceof Reference reference)) { return null; } - final Reference reference = ((Reference) object); - final String typeName = reference.getClassName(); final ClassLoader loader = Thread.currentThread().getContextClassLoader(); diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/common/LookupFactory.java b/tomee/tomee-common/src/main/java/org/apache/tomee/common/LookupFactory.java index f1ca5ee663..62819df7ff 100644 --- a/tomee/tomee-common/src/main/java/org/apache/tomee/common/LookupFactory.java +++ b/tomee/tomee-common/src/main/java/org/apache/tomee/common/LookupFactory.java @@ -32,12 +32,10 @@ public class LookupFactory implements ObjectFactory { @Override public Object getObjectInstance(final Object object, final Name name, final Context context, final Hashtable environment) throws Exception { - if (!(object instanceof Reference)) { + if (!(object instanceof Reference reference)) { return null; } - final Reference reference = ((Reference) object); - final String jndiName = NamingUtil.getProperty(reference, NamingUtil.JNDI_NAME); if (jndiName == null) { diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/common/WsFactory.java b/tomee/tomee-common/src/main/java/org/apache/tomee/common/WsFactory.java index 14a2b9fdbb..5690c065a4 100644 --- a/tomee/tomee-common/src/main/java/org/apache/tomee/common/WsFactory.java +++ b/tomee/tomee-common/src/main/java/org/apache/tomee/common/WsFactory.java @@ -41,12 +41,10 @@ public class WsFactory extends AbstractObjectFactory { @Override public Object getObjectInstance(final Object object, final Name name, final Context context, final Hashtable environment) throws Exception { // ignore non resource-refs - if (!(object instanceof ResourceRef)) { + if (!(object instanceof ResourceRef ref)) { return null; } - final Reference ref = (Reference) object; - final Object value; if (NamingUtil.getProperty(ref, NamingUtil.JNDI_NAME) != null) { // lookup the value in JNDI diff --git a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/Filters.java b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/Filters.java index a9b9cd2dc3..702407702c 100644 --- a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/Filters.java +++ b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/Filters.java @@ -130,8 +130,7 @@ public class Filters { * @return */ public static Filter invert(final Filter filter) { - if (filter instanceof NegativeFilter) { - final NegativeFilter negativeFilter = (NegativeFilter) filter; + if (filter instanceof NegativeFilter negativeFilter) { return negativeFilter.getFilter(); } @@ -140,8 +139,7 @@ public class Filters { private static void unwrap(final List<Filter> filters, final Set<Filter> unwrapped) { for (final Filter filter : filters) { - if (filter instanceof FilterList) { - final FilterList filterList = (FilterList) filter; + if (filter instanceof FilterList filterList) { unwrap(filterList.getFilters(), unwrapped); } else { unwrapped.add(filter); diff --git a/tomee/tomee-security/src/main/java/org/apache/tomee/security/TomEESecurityContext.java b/tomee/tomee-security/src/main/java/org/apache/tomee/security/TomEESecurityContext.java index ab71b5814b..5b6816d913 100644 --- a/tomee/tomee-security/src/main/java/org/apache/tomee/security/TomEESecurityContext.java +++ b/tomee/tomee-security/src/main/java/org/apache/tomee/security/TomEESecurityContext.java @@ -132,8 +132,7 @@ public class TomEESecurityContext implements SecurityContext { public static void registerContainerAboutLogin(final Principal principal, final Set<String> groups) { final SecurityService securityService = SystemInstance.get().getComponent(SecurityService.class); - if (securityService instanceof TomcatSecurityService) { - final TomcatSecurityService tomcatSecurityService = (TomcatSecurityService) securityService; + if (securityService instanceof TomcatSecurityService tomcatSecurityService) { final Request request = OpenEJBSecurityListener.requests.get(); final GenericPrincipal genericPrincipal = new GenericPrincipal( diff --git a/tomee/tomee-security/src/main/java/org/apache/tomee/security/identitystore/TomEEDefaultIdentityStore.java b/tomee/tomee-security/src/main/java/org/apache/tomee/security/identitystore/TomEEDefaultIdentityStore.java index 9716e22a88..599ef03902 100644 --- a/tomee/tomee-security/src/main/java/org/apache/tomee/security/identitystore/TomEEDefaultIdentityStore.java +++ b/tomee/tomee-security/src/main/java/org/apache/tomee/security/identitystore/TomEEDefaultIdentityStore.java @@ -59,11 +59,10 @@ public class TomEEDefaultIdentityStore implements IdentityStore { @Override public CredentialValidationResult validate(final Credential credential) { - if (!(credential instanceof UsernamePasswordCredential)) { + if (!(credential instanceof UsernamePasswordCredential usernamePasswordCredential)) { return CredentialValidationResult.NOT_VALIDATED_RESULT; } - final UsernamePasswordCredential usernamePasswordCredential = (UsernamePasswordCredential) credential; final User user = getUser(usernamePasswordCredential.getCaller()); if (user == null) { diff --git a/tomee/tomee-security/src/main/java/org/apache/tomee/security/identitystore/TomEELDAPIdentityStore.java b/tomee/tomee-security/src/main/java/org/apache/tomee/security/identitystore/TomEELDAPIdentityStore.java index c0e2317073..2c169db53d 100644 --- a/tomee/tomee-security/src/main/java/org/apache/tomee/security/identitystore/TomEELDAPIdentityStore.java +++ b/tomee/tomee-security/src/main/java/org/apache/tomee/security/identitystore/TomEELDAPIdentityStore.java @@ -75,10 +75,9 @@ public class TomEELDAPIdentityStore implements IdentityStore { @Override public CredentialValidationResult validate(final Credential credential) { - if (!(credential instanceof UsernamePasswordCredential)) { + if (!(credential instanceof UsernamePasswordCredential usernamePasswordCredential)) { return CredentialValidationResult.NOT_VALIDATED_RESULT; } - final UsernamePasswordCredential usernamePasswordCredential = (UsernamePasswordCredential) credential; LdapContext ldapContext = null; try {
