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 0da9cadf066986862f5528a85641b11ec8915101
Author: Stefan Bischof <stbisc...@bipolis.org>
AuthorDate: Sat Apr 5 09:52:26 2025 +0200
[fw] use auto-unboxing
Signed-off-by: Stefan Bischof <stbisc...@bipolis.org>
---
.../java/org/apache/felix/framework/Felix.java | 2 +-
.../framework/URLHandlersStreamHandlerProxy.java | 10 ++++----
.../framework/capabilityset/SimpleFilter.java | 4 ++--
.../apache/felix/framework/util/SecureAction.java | 27 ++++++++--------------
4 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/framework/src/main/java/org/apache/felix/framework/Felix.java
b/framework/src/main/java/org/apache/felix/framework/Felix.java
index 0eb23f103e..505b88cc04 100644
--- a/framework/src/main/java/org/apache/felix/framework/Felix.java
+++ b/framework/src/main/java/org/apache/felix/framework/Felix.java
@@ -4095,7 +4095,7 @@ public class Felix extends BundleImpl implements Framework
m_systemBundleClassCache.put(clazz, fromSystemBundle);
}
}
- return fromSystemBundle.booleanValue() ? this : null;
+ return fromSystemBundle ? this : null;
}
return null;
}
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 80d98e3dcc..3ecc2ea2e5 100644
---
a/framework/src/main/java/org/apache/felix/framework/URLHandlersStreamHandlerProxy.java
+++
b/framework/src/main/java/org/apache/felix/framework/URLHandlersStreamHandlerProxy.java
@@ -153,7 +153,7 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
}
try
{
- return ((Boolean) EQUALS.invoke(svc, url1, url2)).booleanValue();
+ return ((Boolean) EQUALS.invoke(svc, url1, url2));
}
catch (Exception ex)
{
@@ -174,7 +174,7 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
}
try
{
- return ((Integer) GET_DEFAULT_PORT.invoke(svc, null)).intValue();
+ return ((Integer) GET_DEFAULT_PORT.invoke(svc, null));
}
catch (Exception ex)
{
@@ -218,7 +218,7 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
}
try
{
- return ((Integer) HASH_CODE.invoke(svc, url)).intValue();
+ return ((Integer) HASH_CODE.invoke(svc, url));
}
catch (Exception ex)
{
@@ -240,7 +240,7 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
}
try
{
- return ((Boolean) HOSTS_EQUAL.invoke(svc, url1,
url2)).booleanValue();
+ return ((Boolean) HOSTS_EQUAL.invoke(svc, url1, url2));
}
catch (Exception ex)
{
@@ -437,7 +437,7 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
try
{
return ((Boolean) SAME_FILE.invoke(
- svc, url1, url2)).booleanValue();
+ svc, url1, url2));
}
catch (Exception ex)
{
diff --git
a/framework/src/main/java/org/apache/felix/framework/capabilityset/SimpleFilter.java
b/framework/src/main/java/org/apache/felix/framework/capabilityset/SimpleFilter.java
index 6d02a52a6b..439b7307a3 100644
---
a/framework/src/main/java/org/apache/felix/framework/capabilityset/SimpleFilter.java
+++
b/framework/src/main/java/org/apache/felix/framework/capabilityset/SimpleFilter.java
@@ -263,11 +263,11 @@ public class SimpleFilter
else if (!stack.isEmpty() && (stack.get(0) instanceof
SimpleFilter))
{
((List) ((SimpleFilter) stack.get(0)).m_value).add(
- SimpleFilter.subfilter(filter, ((Integer)
top).intValue(), idx));
+ SimpleFilter.subfilter(filter, ((Integer) top), idx));
}
else
{
- sf = SimpleFilter.subfilter(filter, ((Integer)
top).intValue(), idx);
+ sf = SimpleFilter.subfilter(filter, ((Integer) top), idx);
}
}
else if (!isEscaped && (filter.charAt(idx) == '\\'))
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 8c05ab81cf..5bfb5357af 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
@@ -361,8 +361,7 @@ public class SecureAction
{
Actions actions = (Actions) m_actions.get();
actions.set(Actions.FILE_EXISTS_ACTION, file);
- return ((Boolean) AccessController.doPrivileged(actions,
m_acc))
- .booleanValue();
+ return ((Boolean) AccessController.doPrivileged(actions,
m_acc));
}
catch (PrivilegedActionException ex)
{
@@ -383,8 +382,7 @@ public class SecureAction
{
Actions actions = (Actions) m_actions.get();
actions.set(Actions.FILE_IS_FILE_ACTION, file);
- return ((Boolean) AccessController.doPrivileged(actions,
m_acc))
- .booleanValue();
+ return ((Boolean) AccessController.doPrivileged(actions,
m_acc));
}
catch (PrivilegedActionException ex)
{
@@ -405,8 +403,7 @@ public class SecureAction
{
Actions actions = (Actions) m_actions.get();
actions.set(Actions.FILE_IS_DIRECTORY_ACTION, file);
- return ((Boolean) AccessController.doPrivileged(actions,
m_acc))
- .booleanValue();
+ return ((Boolean) AccessController.doPrivileged(actions,
m_acc));
}
catch (PrivilegedActionException ex)
{
@@ -427,8 +424,7 @@ public class SecureAction
{
Actions actions = (Actions) m_actions.get();
actions.set(Actions.MAKE_DIRECTORY_ACTION, file);
- return ((Boolean) AccessController.doPrivileged(actions,
m_acc))
- .booleanValue();
+ return ((Boolean) AccessController.doPrivileged(actions,
m_acc));
}
catch (PrivilegedActionException ex)
{
@@ -449,8 +445,7 @@ public class SecureAction
{
Actions actions = (Actions) m_actions.get();
actions.set(Actions.MAKE_DIRECTORIES_ACTION, file);
- return ((Boolean) AccessController.doPrivileged(actions,
m_acc))
- .booleanValue();
+ return ((Boolean) AccessController.doPrivileged(actions,
m_acc));
}
catch (PrivilegedActionException ex)
{
@@ -492,8 +487,7 @@ public class SecureAction
{
Actions actions = (Actions) m_actions.get();
actions.set(Actions.RENAME_FILE_ACTION, oldFile, newFile);
- return ((Boolean) AccessController.doPrivileged(actions,
m_acc))
- .booleanValue();
+ return ((Boolean) AccessController.doPrivileged(actions,
m_acc));
}
catch (PrivilegedActionException ex)
{
@@ -686,8 +680,7 @@ public class SecureAction
{
Actions actions = (Actions) m_actions.get();
actions.set(Actions.DELETE_FILE_ACTION, target);
- return ((Boolean) AccessController.doPrivileged(actions,
m_acc))
- .booleanValue();
+ return ((Boolean) AccessController.doPrivileged(actions,
m_acc));
}
catch (PrivilegedActionException ex)
{
@@ -1943,7 +1936,7 @@ public class SecureAction
return File.createTempFile((String) arg1, (String) arg2,
(File) arg3);
case CREATE_URL_ACTION:
return new URL((String) arg1, (String) arg2,
- ((Integer) arg3).intValue(), (String) arg4,
+ ((Integer) arg3), (String) arg4,
(URLStreamHandler) arg5);
case CREATE_URL_WITH_CONTEXT_ACTION:
return new URL((URL) arg1, (String) arg2,
(URLStreamHandler) arg3);
@@ -2020,7 +2013,7 @@ public class SecureAction
return _swapStaticFieldIfNotClass((Class) arg1,
(Class) arg2, (Class) arg3, (String) arg4);
case SYSTEM_EXIT_ACTION:
- System.exit(((Integer) arg1).intValue());
+ System.exit(((Integer) arg1));
case FLUSH_FIELD_ACTION:
_flush(((Class) arg1), arg2);
return null;
@@ -2045,7 +2038,7 @@ public class SecureAction
case INVOKE_SERVICE_FIND_HOOK:
((org.osgi.framework.hooks.service.FindHook) arg1).find(
(BundleContext) arg2, (String) arg3, (String) arg4,
- ((Boolean) arg5).booleanValue(),
+ ((Boolean) arg5),
(Collection<ServiceReference<?>>) arg6);
return null;
case INVOKE_SERVICE_LISTENER_HOOK_ADDED:
