This is an automated email from the ASF dual-hosted git repository.
stbischof pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit d01d02521286cf2c4c7850a4f00e790c94924da2
Author: Stefan Bischof <stbisc...@bipolis.org>
AuthorDate: Sat Apr 5 09:13:26 2025 +0200
[framework] Remove unnecessary array creation for varargs
Signed-off-by: Stefan Bischof <stbisc...@bipolis.org>
---
.../framework/URLHandlersStreamHandlerProxy.java | 32 +++++++++++-----------
.../framework/capabilityset/CapabilitySet.java | 4 +--
.../apache/felix/framework/util/SecureAction.java | 8 +++---
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git
a/framework/src/main/java/org/apache/felix/framework/URLHandlersStreamHandlerProxy.java
b/framework/src/main/java/org/apache/felix/framework/URLHandlersStreamHandlerProxy.java
index cdc3649dd4..80d98e3dcc 100644
---
a/framework/src/main/java/org/apache/felix/framework/URLHandlersStreamHandlerProxy.java
+++
b/framework/src/main/java/org/apache/felix/framework/URLHandlersStreamHandlerProxy.java
@@ -74,15 +74,15 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
SecureAction action = new SecureAction();
EQUALS = reflect(action, "equals",
- new Class[]{URL.class, URL.class});
+ URL.class, URL.class);
GET_DEFAULT_PORT = reflect(action, "getDefaultPort",
(Class[]) null);
- GET_HOST_ADDRESS = reflect(action, "getHostAddress", new
Class[]{URL.class});
- HASH_CODE = reflect(action, "hashCode", new Class[]{URL.class});
- HOSTS_EQUAL = reflect(action, "hostsEqual", new Class[]{URL.class,
URL.class});
- OPEN_CONNECTION = reflect(action, "openConnection", new
Class[]{URL.class});
- SAME_FILE = reflect(action, "sameFile", new Class[]{URL.class,
URL.class});
- TO_EXTERNAL_FORM =reflect(action, "toExternalForm", new
Class[]{URL.class});
+ GET_HOST_ADDRESS = reflect(action, "getHostAddress", URL.class);
+ HASH_CODE = reflect(action, "hashCode", URL.class);
+ HOSTS_EQUAL = reflect(action, "hostsEqual", URL.class, URL.class);
+ OPEN_CONNECTION = reflect(action, "openConnection", URL.class);
+ SAME_FILE = reflect(action, "sameFile", URL.class, URL.class);
+ TO_EXTERNAL_FORM =reflect(action, "toExternalForm", URL.class);
URL_PROXY_CLASS = new Class[]{URL.class, java.net.Proxy.class};
OPEN_CONNECTION_PROXY = reflect(action, "openConnection",
URL_PROXY_CLASS);
@@ -153,7 +153,7 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
}
try
{
- return ((Boolean) EQUALS.invoke(svc, new Object[]{url1,
url2})).booleanValue();
+ return ((Boolean) EQUALS.invoke(svc, url1, url2)).booleanValue();
}
catch (Exception ex)
{
@@ -196,7 +196,7 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
}
try
{
- return (InetAddress) GET_HOST_ADDRESS.invoke(svc, new
Object[]{url});
+ return (InetAddress) GET_HOST_ADDRESS.invoke(svc, url);
}
catch (Exception ex)
{
@@ -218,7 +218,7 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
}
try
{
- return ((Integer) HASH_CODE.invoke(svc, new
Object[]{url})).intValue();
+ return ((Integer) HASH_CODE.invoke(svc, url)).intValue();
}
catch (Exception ex)
{
@@ -240,7 +240,7 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
}
try
{
- return ((Boolean) HOSTS_EQUAL.invoke(svc, new Object[]{url1,
url2})).booleanValue();
+ return ((Boolean) HOSTS_EQUAL.invoke(svc, url1,
url2)).booleanValue();
}
catch (Exception ex)
{
@@ -289,7 +289,7 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
throw new IOException(ex.getMessage());
}
}
- return (URLConnection) OPEN_CONNECTION.invoke(svc, new
Object[]{url});
+ return (URLConnection) OPEN_CONNECTION.invoke(svc, url);
}
catch (IOException ex)
{
@@ -324,7 +324,7 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
try
{
m_action.setAccesssible(method);
- return (URLConnection) method.invoke(svc, new Object[]{url,
proxy});
+ return (URLConnection) method.invoke(svc, url, proxy);
}
catch (Exception e)
{
@@ -337,7 +337,7 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
}
try
{
- return (URLConnection) OPEN_CONNECTION_PROXY.invoke(svc, new
Object[]{url, proxy});
+ return (URLConnection) OPEN_CONNECTION_PROXY.invoke(svc, url,
proxy);
}
catch (Exception ex)
{
@@ -437,7 +437,7 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
try
{
return ((Boolean) SAME_FILE.invoke(
- svc, new Object[]{url1, url2})).booleanValue();
+ svc, url1, url2)).booleanValue();
}
catch (Exception ex)
{
@@ -479,7 +479,7 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
try
{
String result = (String) TO_EXTERNAL_FORM.invoke(
- svc, new Object[]{url});
+ svc, url);
// mika does return an invalid format if we have a url with the
// protocol only (<proto>://null) - we catch this case now
diff --git
a/framework/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java
b/framework/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java
index e887c3ae42..5a8de58560 100644
---
a/framework/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java
+++
b/framework/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java
@@ -614,7 +614,7 @@ public class CapabilitySet
&& ((valueOfMethod.getModifiers() & Modifier.STATIC) >
0))
{
m_secureAction.setAccesssible(valueOfMethod);
- rhs = valueOfMethod.invoke(null, new Object[] {
rhsString });
+ rhs = valueOfMethod.invoke(null, rhsString);
}
}
catch (Exception ex)
@@ -626,7 +626,7 @@ public class CapabilitySet
{
Constructor ctor =
m_secureAction.getConstructor(lhs.getClass(), STRING_CLASS);
m_secureAction.setAccesssible(ctor);
- rhs = ctor.newInstance(new Object[] { rhsString });
+ rhs = ctor.newInstance(rhsString);
}
}
}
diff --git
a/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
b/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
index 0ca01faef9..0142e80756 100644
--- a/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
+++ b/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
@@ -912,9 +912,9 @@ public class SecureAction
{
Method addURL =
URLClassLoader.class.getDeclaredMethod("addURL",
- new Class[] {URL.class});
+ URL.class);
getAccessor(URLClassLoader.class).accept(new
AccessibleObject[]{addURL});
- addURL.invoke(loader, new Object[]{extension});
+ addURL.invoke(loader, extension);
}
}
@@ -1937,9 +1937,9 @@ public class SecureAction
case ADD_EXTENSION_URL_ACTION:
Method addURL =
URLClassLoader.class.getDeclaredMethod("addURL",
- new Class[] {URL.class});
+ URL.class);
getAccessor(URLClassLoader.class).accept(new
AccessibleObject[]{addURL});
- addURL.invoke(arg2, new Object[]{arg1});
+ addURL.invoke(arg2, arg1);
return null;
case CREATE_TMPFILE_ACTION:
return File.createTempFile((String) arg1, (String) arg2,
(File) arg3);
