Replace local var declarations with more compact pattern variables (OpenEJB)

mawiesne · rzo1 · commit 8455ee975a1d · 2026-02-24T08:00:09.000+01:00
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
@@ -336,10 +336,8 @@ protected Response processRequest(final Request req, final Response res, final S
             }
 
             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
@@ -365,11 +365,10 @@ private static boolean isConvertable(final Class type, final Object propertyValu
     }
 
     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
@@ -69,8 +69,7 @@ public static Connection getConnection(final ClusterMetaData cluster, final Serv
 
         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
@@ -350,8 +350,7 @@ public String toString() {
 
     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
@@ -178,8 +178,7 @@ public void writeExternal(final ObjectOutput out) throws IOException {
             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
@@ -651,8 +651,7 @@ public NamingEnumeration<NameClassPair> list(final Name name) throws NamingExcep
     @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
@@ -59,10 +59,9 @@ protected Object isIdentical(final Method method, final Object[] args, final Obj
 
         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
@@ -59,10 +59,9 @@ protected Object isIdentical(final Method method, final Object[] args, final Obj
 
         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
@@ -43,15 +43,13 @@ public static void setPassword(final String password) {
     @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
@@ -40,15 +40,13 @@ public UsernamePasswordCallbackHandler(final String username, final String passw
     @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
@@ -36,8 +36,7 @@ public ApplicationData(final String path, final Application application) {
         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
@@ -92,8 +92,7 @@ public static String toSimpleString(final Method mtd) {
     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
@@ -32,8 +32,7 @@ public void updateServer(final BeanContext beanContext, final ClusterableRequest
 
         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
@@ -87,14 +87,11 @@ public void init(final Properties p) throws Exception {
         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 void init(final Properties p) throws Exception {
                 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
@@ -205,8 +205,7 @@ public void dispatch() {
         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
@@ -29,8 +29,7 @@ public ServletListener(final Servlet instance, final String contextRoot) {
 
     @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
@@ -171,8 +171,7 @@ protected ServerService initServer(final String serviceName, final Properties se
 
                 service.init(serviceProperties);
 
-                if (service instanceof DiscoveryAgent) {
-                    final DiscoveryAgent agent = (DiscoveryAgent) service;
+                if (service instanceof DiscoveryAgent agent) {
                     registry.addDiscoveryAgent(agent);
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -365,11 +365,10 @@ private static boolean isConvertable(final Class type, final Object propertyValu`
`365`	`365`	`}`
`366`	`366`
`367`	`367`	`private Object convert(final Class type, Object value) {`
`368`		`- if (type == Object.class \|\| !(value instanceof String)) {`
	`368`	`+ if (type == Object.class \|\| !(value instanceof String stringValue)) {`
`369`	`369`	`return value;`
`370`	`370`	`}`
`371`	`371`
`372`		`- final String stringValue = (String) value;`
`373`	`372`	`final PropertyEditor editor = findEditor(type);`
`374`	`373`	`if (editor != null) {`
`375`	`374`	`editor.setAsText(stringValue);`
Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,7 @@ public static Connection getConnection(final ClusterMetaData cluster, final Serv`
`69`	`69`
`70`	`70`	`String name = cluster.getConnectionStrategy();`
`71`	`71`
`72`		`- if (req instanceof EJBRequest) {`
`73`		`- final EJBRequest ejbRequest = (EJBRequest) req;`
	`72`	`+ if (req instanceof EJBRequest ejbRequest) {`
`74`	`73`	`final Properties p = ejbRequest.getEjbMetaData().getProperties();`
`75`	`74`	`name = p.getProperty("openejb.client.connection.strategy", name);`
`76`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -350,8 +350,7 @@ public String toString() {`
`350`	`350`
`351`	`351`	`public void loadProperties(final Properties properties) {`
`352`	`352`	`for (final Map.Entry<Object, Object> entry : properties.entrySet()) {`
`353`		`- if (entry.getKey() instanceof String) {`
`354`		`- final String key = (String) entry.getKey();`
	`353`	`+ if (entry.getKey() instanceof String key) {`
`355`	`354`	`if (key.startsWith("openejb.client.")) {`
`356`	`355`	`this.properties.put(key, entry.getValue());`
`357`	`356`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,10 +59,9 @@ protected Object isIdentical(final Method method, final Object[] args, final Obj`
`59`	`59`
`60`	`60`	`final Object arg = (args.length == 1) ? args[0] : null;`
`61`	`61`
`62`		`- if (arg == null \|\| !(arg instanceof EJBObjectProxy)) {`
	`62`	`+ if (arg == null \|\| !(arg instanceof EJBObjectProxy proxy2)) {`
`63`	`63`	`return Boolean.FALSE;`
`64`	`64`	`}`
`65`		`- final EJBObjectProxy proxy2 = (EJBObjectProxy) arg;`
`66`	`65`	`final EJBObjectHandler that = proxy2.getEJBObjectHandler();`
`67`	`66`	`return this.ejb.deploymentID.equals(that.ejb.deploymentID);`
`68`	`67`	`}`