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 2f490b7ae548c26c38c7b85dac81fe14616e422d
Author: Stefan Bischof <stbisc...@bipolis.org>
AuthorDate: Sat Apr 5 08:51:37 2025 +0200
remove not needed class-casts
Signed-off-by: Stefan Bischof <stbisc...@bipolis.org>
---
.../apache/felix/framework/BundleProtectionDomain.java | 2 +-
.../org/apache/felix/framework/BundleRevisionImpl.java | 4 ++--
.../src/main/java/org/apache/felix/framework/Felix.java | 6 +++---
.../org/apache/felix/framework/PackageAdminImpl.java | 3 +--
.../java/org/apache/felix/framework/URLHandlers.java | 2 +-
.../felix/framework/URLHandlersStreamHandlerProxy.java | 2 +-
.../framework/util/manifestparser/ManifestParser.java | 16 ++++++++--------
.../util/manifestparser/ManifestParserTest.java | 2 +-
8 files changed, 18 insertions(+), 19 deletions(-)
diff --git
a/framework/src/main/java/org/apache/felix/framework/BundleProtectionDomain.java
b/framework/src/main/java/org/apache/felix/framework/BundleProtectionDomain.java
index 9d510857a4..79c400adce 100644
---
a/framework/src/main/java/org/apache/felix/framework/BundleProtectionDomain.java
+++
b/framework/src/main/java/org/apache/felix/framework/BundleProtectionDomain.java
@@ -323,7 +323,7 @@ public class BundleProtectionDomain extends ProtectionDomain
if (System.getSecurityManager() != null)
{
- property = (String) AccessController.doPrivileged(new
PrivilegedAction<String>(){
+ property = AccessController.doPrivileged(new
PrivilegedAction<String>(){
@Override
public String run()
{
diff --git
a/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java
b/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java
index d2352d9587..dbec87988e 100644
--- a/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java
@@ -469,7 +469,7 @@ public class BundleRevisionImpl implements BundleRevision,
Resource
{
// TODO: FRAMEWORK - Per the spec, this should fire a FrameworkEvent.INFO
event;
// need to create an "Eventer" class like "Logger" perhaps.
- ((BundleImpl) m_bundle).getFramework().getLogger().log(
+ m_bundle.getFramework().getLogger().log(
getBundle(), Logger.LOG_INFO,
"Class path entry not found: "
+ classPathStrings.get(i));
@@ -706,7 +706,7 @@ public class BundleRevisionImpl implements BundleRevision,
Resource
}
catch (Exception ex)
{
- ((BundleImpl) m_bundle).getFramework().getLogger().log(
+ m_bundle.getFramework().getLogger().log(
Logger.LOG_ERROR, "Error releasing revision: " +
ex.getMessage(), ex);
}
m_content.close();
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 85cce9984e..9d60627650 100644
--- a/framework/src/main/java/org/apache/felix/framework/Felix.java
+++ b/framework/src/main/java/org/apache/felix/framework/Felix.java
@@ -4465,7 +4465,7 @@ public class Felix extends BundleImpl implements Framework
// bundles to be refreshed.
bundles.add(target);
// Add all importing bundles to map.
- populateDependentGraph((BundleImpl) target, bundles);
+ populateDependentGraph(target, bundles);
}
}
}
@@ -4629,7 +4629,7 @@ public class Felix extends BundleImpl implements Framework
// bundles to be refreshed.
bundles.add(target);
// Add all importing bundles to map.
- populateDependentGraph((BundleImpl) target, bundles);
+ populateDependentGraph(target, bundles);
}
}
return bundles;
@@ -4657,7 +4657,7 @@ public class Felix extends BundleImpl implements Framework
// Add each dependent bundle to set.
set.add(b);
// Now recurse into each bundle to get its dependents.
- set = populateDependentGraph((BundleImpl) b, set);
+ set = populateDependentGraph(b, set);
}
}
}
diff --git
a/framework/src/main/java/org/apache/felix/framework/PackageAdminImpl.java
b/framework/src/main/java/org/apache/felix/framework/PackageAdminImpl.java
index 20a340dded..dd97469e56 100644
--- a/framework/src/main/java/org/apache/felix/framework/PackageAdminImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/PackageAdminImpl.java
@@ -109,8 +109,7 @@ public class PackageAdminImpl implements PackageAdmin
public int getBundleType(Bundle bundle)
{
- Map headerMap = ((BundleRevisionImpl)
- bundle.adapt(BundleRevisionImpl.class)).getHeaders();
+ Map headerMap = bundle.adapt(BundleRevisionImpl.class).getHeaders();
if (headerMap.containsKey(Constants.FRAGMENT_HOST))
{
return PackageAdmin.BUNDLE_TYPE_FRAGMENT;
diff --git
a/framework/src/main/java/org/apache/felix/framework/URLHandlers.java
b/framework/src/main/java/org/apache/felix/framework/URLHandlers.java
index af4cb5c8c3..36b9948a48 100644
--- a/framework/src/main/java/org/apache/felix/framework/URLHandlers.java
+++ b/framework/src/main/java/org/apache/felix/framework/URLHandlers.java
@@ -787,7 +787,7 @@ class URLHandlers implements URLStreamHandlerFactory,
ContentHandlerFactory
{
ClassLoader index =
m_secureAction.getClassLoader(targetClassLoader.getClass());
- List frameworks = (List) m_classloaderToFrameworkLists.get(index);
+ List frameworks = m_classloaderToFrameworkLists.get(index);
if ((frameworks == null) && (index ==
URLHANDLERS_CLASS.getClassLoader()))
{
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 4fcc8c5eae..cdc3649dd4 100644
---
a/framework/src/main/java/org/apache/felix/framework/URLHandlersStreamHandlerProxy.java
+++
b/framework/src/main/java/org/apache/felix/framework/URLHandlersStreamHandlerProxy.java
@@ -586,7 +586,7 @@ public class URLHandlersStreamHandlerProxy extends
URLStreamHandler
}
if (service instanceof URLStreamHandlerService)
{
- return (URLStreamHandlerService) service;
+ return service;
}
return m_action.createProxy(
diff --git
a/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
b/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
index 013300b1ea..155fb05c15 100644
---
a/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
+++
b/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
@@ -308,9 +308,9 @@ public class ManifestParser
m_requirements = new ArrayList<BundleRequirement>(
hostReqs.size() + importReqs.size() + rbReqs.size()
+ requireReqs.size() + dynamicReqs.size() + breeReqs.size());
- m_requirements.addAll(hostReqs.stream().map(req ->
BundleRequirementImpl.createFrom((BundleRequirementImpl) req,
cache)).collect(Collectors.toList()));
+ m_requirements.addAll(hostReqs.stream().map(req ->
BundleRequirementImpl.createFrom(req, cache)).collect(Collectors.toList()));
m_requirements.addAll(importReqs.stream().map(req ->
BundleRequirementImpl.createFrom((BundleRequirementImpl) req,
cache)).collect(Collectors.toList()));
- m_requirements.addAll(rbReqs.stream().map(req ->
BundleRequirementImpl.createFrom((BundleRequirementImpl) req,
cache)).collect(Collectors.toList()));
+ m_requirements.addAll(rbReqs.stream().map(req ->
BundleRequirementImpl.createFrom(req, cache)).collect(Collectors.toList()));
m_requirements.addAll(requireReqs.stream().map(req ->
BundleRequirementImpl.createFrom((BundleRequirementImpl) req,
cache)).collect(Collectors.toList()));
m_requirements.addAll(dynamicReqs.stream().map(req ->
BundleRequirementImpl.createFrom((BundleRequirementImpl) req,
cache)).collect(Collectors.toList()));
m_requirements.addAll(breeReqs.stream().map(req ->
BundleRequirementImpl.createFrom((BundleRequirementImpl) req,
cache)).collect(Collectors.toList()));
@@ -319,7 +319,7 @@ public class ManifestParser
// Combine all capabilities.
m_capabilities = new ArrayList<BundleCapability>(
capList.size() + exportCaps.size() + provideCaps.size());
- m_capabilities.addAll(capList.stream().map(cap ->
BundleCapabilityImpl.createFrom((BundleCapabilityImpl) cap,
cache)).collect(Collectors.toList()));
+ m_capabilities.addAll(capList.stream().map(cap ->
BundleCapabilityImpl.createFrom(cap, cache)).collect(Collectors.toList()));
m_capabilities.addAll(exportCaps.stream().map(cap ->
BundleCapabilityImpl.createFrom((BundleCapabilityImpl) cap,
cache)).collect(Collectors.toList()));
m_capabilities.addAll(provideCaps.stream().map(cap ->
BundleCapabilityImpl.createFrom((BundleCapabilityImpl) cap,
cache)).collect(Collectors.toList()));
@@ -1185,7 +1185,7 @@ public class ManifestParser
{
selected = firstSortedClause(clauseList);
}
- return ((NativeLibraryClause) clauseList.get(selected));
+ return (clauseList.get(selected));
}
return null;
@@ -1208,7 +1208,7 @@ public class ManifestParser
for (int i = 0; i < indexList.size(); i++)
{
int index = Integer.parseInt(indexList.get(i).toString());
- String[] osversions = ((NativeLibraryClause)
clauseList.get(index)).getOSVersions();
+ String[] osversions = clauseList.get(index).getOSVersions();
if (osversions != null)
{
selection.add("" + indexList.get(i));
@@ -1236,7 +1236,7 @@ public class ManifestParser
for (int i = 0; i < indexList.size(); i++)
{
int index = Integer.parseInt(indexList.get(i).toString());
- String[] osversions = ((NativeLibraryClause)
clauseList.get(index)).getOSVersions();
+ String[] osversions = clauseList.get(index).getOSVersions();
for (int k = 0; k < osversions.length; k++)
{
VersionRange range = new VersionRange(osversions[k]);
@@ -1272,7 +1272,7 @@ public class ManifestParser
for (int i = 0; i < indexList.size(); i++)
{
int index = Integer.parseInt(indexList.get(i).toString());
- if (((NativeLibraryClause) clauseList.get(index)).getLanguages()
!= null)
+ if (clauseList.get(index).getLanguages() != null)
{
selection.add("" + indexList.get(i));
}
@@ -1485,7 +1485,7 @@ public class ManifestParser
}
// Create a require capability and return it.
- String symName = (String) clauses.get(0).m_paths.get(0);
+ String symName = clauses.get(0).m_paths.get(0);
clauses.get(0).m_attrs.put(BundleRevision.BUNDLE_NAMESPACE,
symName);
clauses.get(0).m_attrs.put(Constants.BUNDLE_VERSION_ATTRIBUTE,
bundleVersion);
return new BundleCapabilityImpl(
diff --git
a/framework/src/test/java/org/apache/felix/framework/util/manifestparser/ManifestParserTest.java
b/framework/src/test/java/org/apache/felix/framework/util/manifestparser/ManifestParserTest.java
index a9b9d2719d..30fc502cd8 100644
---
a/framework/src/test/java/org/apache/felix/framework/util/manifestparser/ManifestParserTest.java
+++
b/framework/src/test/java/org/apache/felix/framework/util/manifestparser/ManifestParserTest.java
@@ -187,7 +187,7 @@ class ManifestParserTest
BundleRequirement ir = findRequirement(nativeBundleReq,
NativeNamespace.NATIVE_NAMESPACE);
- String filterStr =
(String)ir.getDirectives().get(NativeNamespace.REQUIREMENT_FILTER_DIRECTIVE);
+ String filterStr =
ir.getDirectives().get(NativeNamespace.REQUIREMENT_FILTER_DIRECTIVE);
Filter actualFilter = FrameworkUtil.createFilter(filterStr);
