This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push:
new 8455ee975a Replace local var declarations with more compact pattern
variables (OpenEJB)
8455ee975a is described below
commit 8455ee975a1d1ec8f2e9bec655ca48e2f51be60e
Author: Martin Wiesner <[email protected]>
AuthorDate: Tue Feb 24 07:44:58 2026 +0100
Replace local var declarations with more compact pattern variables (OpenEJB)
---
.../src/main/java/org/apache/openejb/client/Client.java | 6 ++----
.../org/apache/openejb/client/ClientInjectionProcessor.java | 3 +--
.../main/java/org/apache/openejb/client/ConnectionManager.java | 3 +--
.../main/java/org/apache/openejb/client/EJBMetaDataImpl.java | 3 +--
.../src/main/java/org/apache/openejb/client/EJBResponse.java | 3 +--
.../src/main/java/org/apache/openejb/client/JNDIContext.java | 3 +--
.../org/apache/openejb/client/SingletonEJBObjectHandler.java | 3 +--
.../org/apache/openejb/client/StatelessEJBObjectHandler.java | 3 +--
.../openejb/client/StaticUsernamePasswordCallbackHandler.java | 6 ++----
.../apache/openejb/client/UsernamePasswordCallbackHandler.java | 6 ++----
.../java/org/apache/openejb/server/cxf/rs/ApplicationData.java | 3 +--
.../src/main/java/org/apache/openejb/server/cxf/rs/Logs.java | 3 +--
.../openejb/server/ejbd/BasicClusterableRequestHandler.java | 3 +--
.../main/java/org/apache/openejb/server/hsql/HsqlService.java | 10 +++-------
.../org/apache/openejb/server/httpd/OpenEJBAsyncContext.java | 3 +--
.../java/org/apache/openejb/server/httpd/ServletListener.java | 3 +--
.../main/java/org/apache/openejb/server/ServiceManager.java | 3 +--
17 files changed, 22 insertions(+), 45 deletions(-)
diff --git
a/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java
b/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java
index 5d198bfdc0..b201ba77f1 100644
--- a/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java
+++ b/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java
@@ -336,10 +336,8 @@ public class Client {
}
if (retryConditions.size() > 0) {
- if (res instanceof EJBResponse) {
- final EJBResponse ejbResponse = (EJBResponse) res;
- if (ejbResponse.getResult() instanceof ThrowableArtifact) {
- final ThrowableArtifact artifact = (ThrowableArtifact)
ejbResponse.getResult();
+ if (res instanceof EJBResponse ejbResponse) {
+ if (ejbResponse.getResult() instanceof ThrowableArtifact
artifact) {
//noinspection ThrowableResultOfMethodCallIgnored
if
(retryConditions.contains(artifact.getThrowable().getClass())) {
diff --git
a/server/openejb-client/src/main/java/org/apache/openejb/client/ClientInjectionProcessor.java
b/server/openejb-client/src/main/java/org/apache/openejb/client/ClientInjectionProcessor.java
index 8928f7a0df..52ad6229b2 100644
---
a/server/openejb-client/src/main/java/org/apache/openejb/client/ClientInjectionProcessor.java
+++
b/server/openejb-client/src/main/java/org/apache/openejb/client/ClientInjectionProcessor.java
@@ -365,11 +365,10 @@ public class ClientInjectionProcessor<T> {
}
private Object convert(final Class type, Object value) {
- if (type == Object.class || !(value instanceof String)) {
+ if (type == Object.class || !(value instanceof String stringValue)) {
return value;
}
- final String stringValue = (String) value;
final PropertyEditor editor = findEditor(type);
if (editor != null) {
editor.setAsText(stringValue);
diff --git
a/server/openejb-client/src/main/java/org/apache/openejb/client/ConnectionManager.java
b/server/openejb-client/src/main/java/org/apache/openejb/client/ConnectionManager.java
index a4c8b95af2..47279cba04 100644
---
a/server/openejb-client/src/main/java/org/apache/openejb/client/ConnectionManager.java
+++
b/server/openejb-client/src/main/java/org/apache/openejb/client/ConnectionManager.java
@@ -69,8 +69,7 @@ public class ConnectionManager {
String name = cluster.getConnectionStrategy();
- if (req instanceof EJBRequest) {
- final EJBRequest ejbRequest = (EJBRequest) req;
+ if (req instanceof EJBRequest ejbRequest) {
final Properties p = ejbRequest.getEjbMetaData().getProperties();
name = p.getProperty("openejb.client.connection.strategy", name);
}
diff --git
a/server/openejb-client/src/main/java/org/apache/openejb/client/EJBMetaDataImpl.java
b/server/openejb-client/src/main/java/org/apache/openejb/client/EJBMetaDataImpl.java
index a8401d2f59..6539922253 100644
---
a/server/openejb-client/src/main/java/org/apache/openejb/client/EJBMetaDataImpl.java
+++
b/server/openejb-client/src/main/java/org/apache/openejb/client/EJBMetaDataImpl.java
@@ -350,8 +350,7 @@ public class EJBMetaDataImpl implements
jakarta.ejb.EJBMetaData, java.io.Externa
public void loadProperties(final Properties properties) {
for (final Map.Entry<Object, Object> entry : properties.entrySet()) {
- if (entry.getKey() instanceof String) {
- final String key = (String) entry.getKey();
+ if (entry.getKey() instanceof String key) {
if (key.startsWith("openejb.client.")) {
this.properties.put(key, entry.getValue());
}
diff --git
a/server/openejb-client/src/main/java/org/apache/openejb/client/EJBResponse.java
b/server/openejb-client/src/main/java/org/apache/openejb/client/EJBResponse.java
index 46959eb7b9..d8ac85fdfb 100644
---
a/server/openejb-client/src/main/java/org/apache/openejb/client/EJBResponse.java
+++
b/server/openejb-client/src/main/java/org/apache/openejb/client/EJBResponse.java
@@ -178,8 +178,7 @@ public class EJBResponse implements ClusterableResponse {
case ResponseCodes.EJB_APP_EXCEPTION:
case ResponseCodes.EJB_ERROR:
case ResponseCodes.EJB_SYS_EXCEPTION:
- if (result instanceof Throwable) {
- final Throwable throwable = (Throwable) result;
+ if (result instanceof Throwable throwable) {
result = new ThrowableArtifact(throwable);
}
break;
diff --git
a/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIContext.java
b/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIContext.java
index 8ff8b4be36..72d08796a0 100644
---
a/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIContext.java
+++
b/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIContext.java
@@ -651,8 +651,7 @@ public class JNDIContext implements InitialContextFactory,
Context {
@Override
public NamingEnumeration<Binding> listBindings(final String name) throws
NamingException {
final Object o = lookup(name);
- if (o instanceof Context) {
- final Context context = (Context) o;
+ if (o instanceof Context context) {
final NamingEnumeration<NameClassPair> enumeration =
context.list("");
final List<NameClassPair> bindings = new
ArrayList<NameClassPair>();
diff --git
a/server/openejb-client/src/main/java/org/apache/openejb/client/SingletonEJBObjectHandler.java
b/server/openejb-client/src/main/java/org/apache/openejb/client/SingletonEJBObjectHandler.java
index 879285b674..6d981b83ee 100644
---
a/server/openejb-client/src/main/java/org/apache/openejb/client/SingletonEJBObjectHandler.java
+++
b/server/openejb-client/src/main/java/org/apache/openejb/client/SingletonEJBObjectHandler.java
@@ -59,10 +59,9 @@ public class SingletonEJBObjectHandler extends
EJBObjectHandler {
final Object arg = (args.length == 1) ? args[0] : null;
- if (arg == null || !(arg instanceof EJBObjectProxy)) {
+ if (arg == null || !(arg instanceof EJBObjectProxy proxy2)) {
return Boolean.FALSE;
}
- final EJBObjectProxy proxy2 = (EJBObjectProxy) arg;
final EJBObjectHandler that = proxy2.getEJBObjectHandler();
return this.ejb.deploymentID.equals(that.ejb.deploymentID);
}
diff --git
a/server/openejb-client/src/main/java/org/apache/openejb/client/StatelessEJBObjectHandler.java
b/server/openejb-client/src/main/java/org/apache/openejb/client/StatelessEJBObjectHandler.java
index 08b00c1927..7b0f2c908e 100644
---
a/server/openejb-client/src/main/java/org/apache/openejb/client/StatelessEJBObjectHandler.java
+++
b/server/openejb-client/src/main/java/org/apache/openejb/client/StatelessEJBObjectHandler.java
@@ -59,10 +59,9 @@ public class StatelessEJBObjectHandler extends
EJBObjectHandler {
final Object arg = (args.length == 1) ? args[0] : null;
- if (arg == null || !(arg instanceof EJBObjectProxy)) {
+ if (arg == null || !(arg instanceof EJBObjectProxy proxy2)) {
return Boolean.FALSE;
}
- final EJBObjectProxy proxy2 = (EJBObjectProxy) arg;
final EJBObjectHandler that = proxy2.getEJBObjectHandler();
return this.ejb.deploymentID.equals(that.ejb.deploymentID);
}
diff --git
a/server/openejb-client/src/main/java/org/apache/openejb/client/StaticUsernamePasswordCallbackHandler.java
b/server/openejb-client/src/main/java/org/apache/openejb/client/StaticUsernamePasswordCallbackHandler.java
index c0b8b017e8..4a5e8d0e8c 100644
---
a/server/openejb-client/src/main/java/org/apache/openejb/client/StaticUsernamePasswordCallbackHandler.java
+++
b/server/openejb-client/src/main/java/org/apache/openejb/client/StaticUsernamePasswordCallbackHandler.java
@@ -43,15 +43,13 @@ public class StaticUsernamePasswordCallbackHandler
implements CallbackHandler {
@Override
public void handle(final Callback[] callbacks) throws IOException,
UnsupportedCallbackException {
for (final Callback callback : callbacks) {
- if (callback instanceof PasswordCallback) {
- final PasswordCallback passwordCallback = (PasswordCallback)
callback;
+ if (callback instanceof PasswordCallback passwordCallback) {
if (password == null) {
passwordCallback.setPassword(null);
} else {
passwordCallback.setPassword(password.toCharArray());
}
- } else if (callback instanceof NameCallback) {
- final NameCallback nameCallback = (NameCallback) callback;
+ } else if (callback instanceof NameCallback nameCallback) {
if (username == null) {
nameCallback.setName(null);
} else {
diff --git
a/server/openejb-client/src/main/java/org/apache/openejb/client/UsernamePasswordCallbackHandler.java
b/server/openejb-client/src/main/java/org/apache/openejb/client/UsernamePasswordCallbackHandler.java
index a9d261b307..4eca4692ae 100644
---
a/server/openejb-client/src/main/java/org/apache/openejb/client/UsernamePasswordCallbackHandler.java
+++
b/server/openejb-client/src/main/java/org/apache/openejb/client/UsernamePasswordCallbackHandler.java
@@ -40,15 +40,13 @@ public class UsernamePasswordCallbackHandler implements
CallbackHandler {
@Override
public void handle(final Callback[] callbacks) throws IOException,
UnsupportedCallbackException {
for (final Callback callback : callbacks) {
- if (callback instanceof PasswordCallback) {
- final PasswordCallback passwordCallback = (PasswordCallback)
callback;
+ if (callback instanceof PasswordCallback passwordCallback) {
if (password == null) {
passwordCallback.setPassword(null);
} else {
passwordCallback.setPassword(password.toCharArray());
}
- } else if (callback instanceof NameCallback) {
- final NameCallback nameCallback = (NameCallback) callback;
+ } else if (callback instanceof NameCallback nameCallback) {
if (username == null) {
nameCallback.setName(null);
} else {
diff --git
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/ApplicationData.java
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/ApplicationData.java
index 3619ec9a1f..4c492e30f6 100644
---
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/ApplicationData.java
+++
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/ApplicationData.java
@@ -36,8 +36,7 @@ public class ApplicationData {
this.path = path;
this.application = application;
- if (application instanceof InternalApplication &&
((InternalApplication) application).getOriginal() != null) {
- final InternalApplication internalApplication =
(InternalApplication) application;
+ if (application instanceof InternalApplication internalApplication &&
((InternalApplication) application).getOriginal() != null) {
this.applicationClass =
internalApplication.getOriginal().getClass();
} else {
this.applicationClass = application.getClass();
diff --git
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/Logs.java
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/Logs.java
index 6697cd0b57..7e26df5ab4 100644
---
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/Logs.java
+++
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/Logs.java
@@ -92,8 +92,7 @@ public class Logs {
public static String name(final Type type) {
if (type instanceof Class<?>) {
return ((Class) type).getSimpleName().replace("java.lang.",
"").replace("java.util", "");
- } else if (type instanceof ParameterizedType) {
- final ParameterizedType pt = (ParameterizedType) type;
+ } else if (type instanceof ParameterizedType pt) {
final StringBuilder builder = new StringBuilder();
builder.append(name(pt.getRawType()));
final Type[] args = pt.getActualTypeArguments();
diff --git
a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/BasicClusterableRequestHandler.java
b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/BasicClusterableRequestHandler.java
index c7e9acb9a5..1e68a95e26 100644
---
a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/BasicClusterableRequestHandler.java
+++
b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/BasicClusterableRequestHandler.java
@@ -32,8 +32,7 @@ public class BasicClusterableRequestHandler implements
ClusterableRequestHandler
final Container container = beanContext.getContainer();
- if (container instanceof ClusteredRPCContainer) {
- final ClusteredRPCContainer clusteredContainer =
(ClusteredRPCContainer) container;
+ if (container instanceof ClusteredRPCContainer clusteredContainer) {
final URI[] locations =
clusteredContainer.getLocations(beanContext);
if (null != locations) {
final ServerMetaData server = new ServerMetaData(locations);
diff --git
a/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java
b/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java
index 087f622c6e..639cfefee1 100644
---
a/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java
+++
b/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java
@@ -87,14 +87,11 @@ public class HsqlService implements ServerService,
SelfManaging {
final Properties properties = new Properties();
for (final Map.Entry<Object, Object> entry : p.entrySet()) {
// Sometimes the properties object has non string values
- if (!(entry.getKey() instanceof String))
+ if (!(entry.getKey() instanceof String property))
continue;
- if (!(entry.getValue() instanceof String))
+ if (!(entry.getValue() instanceof String value))
continue;
- final String property = (String) entry.getKey();
- final String value = (String) entry.getValue();
-
if (property.startsWith(sc_key_dbname + ".") ||
property.startsWith(sc_key_database + ".")) {
@@ -121,8 +118,7 @@ public class HsqlService implements ServerService,
SelfManaging {
final Set<String> dbnames = new TreeSet<String>();
for (final Binding binding : Collections.list(bindings)) {
final Object value = binding.getObject();
- if (value instanceof DataSource) {
- final DataSource jdbc = (DataSource) value;
+ if (value instanceof DataSource jdbc) {
Connection connection = null;
String path = null;
try {
diff --git
a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBAsyncContext.java
b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBAsyncContext.java
index 993a7d03f1..cc24fc14b6 100644
---
a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBAsyncContext.java
+++
b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBAsyncContext.java
@@ -205,8 +205,7 @@ public class OpenEJBAsyncContext implements AsyncContext {
String path;
final String pathInfo;
ServletRequest servletRequest = getRequest();
- if (servletRequest instanceof HttpServletRequest) {
- HttpServletRequest sr = (HttpServletRequest) servletRequest;
+ if (servletRequest instanceof HttpServletRequest sr) {
path = sr.getServletPath();
pathInfo = sr.getPathInfo();
} else {
diff --git
a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/ServletListener.java
b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/ServletListener.java
index 44d04f3a95..02149935d5 100644
---
a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/ServletListener.java
+++
b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/ServletListener.java
@@ -29,8 +29,7 @@ public class ServletListener implements HttpListener {
@Override
public void onMessage(final HttpRequest request, final HttpResponse
response) throws Exception {
- if (request instanceof HttpRequestImpl) {
- final HttpRequestImpl req = (HttpRequestImpl) request;
+ if (request instanceof HttpRequestImpl req) {
req.initPathFromContext((!context.startsWith("/") ? "/" : "") +
context);
}
delegate.service(request, response);
diff --git
a/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
b/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
index 51fe708364..c72f8b1f1e 100644
---
a/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
+++
b/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
@@ -171,8 +171,7 @@ public abstract class ServiceManager {
service.init(serviceProperties);
- if (service instanceof DiscoveryAgent) {
- final DiscoveryAgent agent = (DiscoveryAgent) service;
+ if (service instanceof DiscoveryAgent agent) {
registry.addDiscoveryAgent(agent);
}
