This is an automated email from the ASF dual-hosted git repository.
holgerfriedrich pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new d2a569fc3a Clean up use of generics (#2647)
d2a569fc3a is described below
commit d2a569fc3a1db1e776b3090eb2a12fdd3176ec4a
Author: Robert Varga <[email protected]>
AuthorDate: Sat Aug 22 19:05:03 2026 +0200
Clean up use of generics (#2647)
Add generic type arguments, fixing raw type warnings.
Signed-off-by: Robert Varga <[email protected]>
---
.../config/command/completers/ConfigurationPropertyCompleter.java | 5 ++---
.../java/org/apache/karaf/config/command/EditCommandTest.java | 1 -
.../java/org/apache/karaf/config/core/impl/ConfigMBeanImpl.java | 1 -
.../org/apache/karaf/deployer/blueprint/BlueprintTransformer.java | 2 +-
.../apache/karaf/deployer/features/FeatureDeploymentListener.java | 2 +-
.../main/java/org/apache/karaf/diagnostic/internal/Activator.java | 8 ++++----
.../org/apache/karaf/jaas/modules/jdbc/JdbcLoginModuleTest.java | 1 -
.../main/java/org/apache/karaf/management/MBeanServerFactory.java | 2 +-
.../main/java/org/apache/karaf/management/PlainSaslServer.java | 2 +-
.../apache/karaf/management/internal/MBeanInvocationHandler.java | 2 +-
obr/src/main/java/org/apache/karaf/obr/command/FindCommand.java | 4 ++--
obr/src/main/java/org/apache/karaf/obr/command/InfoCommand.java | 4 ++--
.../org/apache/karaf/services/staticcm/StaticConfigAdminImpl.java | 4 ++--
.../karaf/shell/impl/action/osgi/AggregateServiceTracker.java | 4 ++--
.../test/java/org/apache/karaf/shell/support/ShellUtilTest.java | 2 +-
.../src/main/java/org/apache/karaf/shell/ssh/ShellCommand.java | 2 +-
16 files changed, 21 insertions(+), 25 deletions(-)
diff --git
a/config/command/src/main/java/org/apache/karaf/config/command/completers/ConfigurationPropertyCompleter.java
b/config/command/src/main/java/org/apache/karaf/config/command/completers/ConfigurationPropertyCompleter.java
index 4eb62a09bd..b0c4a496cb 100644
---
a/config/command/src/main/java/org/apache/karaf/config/command/completers/ConfigurationPropertyCompleter.java
+++
b/config/command/src/main/java/org/apache/karaf/config/command/completers/ConfigurationPropertyCompleter.java
@@ -106,7 +106,6 @@ public class ConfigurationPropertyCompleter implements
Completer {
* @param pid
* @return
*/
- @SuppressWarnings("rawtypes")
private Set<String> getPropertyNames(String pid) {
Set<String> propertyNames = new HashSet<>();
if (pid != null) {
@@ -116,9 +115,9 @@ public class ConfigurationPropertyCompleter implements
Completer {
if (configs != null && configs.length > 0) {
Configuration configuration = configs[0];
if (configuration != null) {
- Dictionary properties =
configuration.getProcessedProperties(null);
+ Dictionary<?, ?> properties =
configuration.getProcessedProperties(null);
if (properties != null) {
- Enumeration keys = properties.keys();
+ Enumeration<?> keys = properties.keys();
while (keys.hasMoreElements()) {
propertyNames.add(String.valueOf(keys.nextElement()));
}
diff --git
a/config/command/src/test/java/org/apache/karaf/config/command/EditCommandTest.java
b/config/command/src/test/java/org/apache/karaf/config/command/EditCommandTest.java
index 24542bb3cb..f7adc13769 100644
---
a/config/command/src/test/java/org/apache/karaf/config/command/EditCommandTest.java
+++
b/config/command/src/test/java/org/apache/karaf/config/command/EditCommandTest.java
@@ -72,7 +72,6 @@ public class EditCommandTest extends TestCase {
props,
session.get(ConfigCommandSupport.PROPERTY_CONFIG_PROPS));
}
- @SuppressWarnings("rawtypes")
public void testExecuteOnNewPid() throws Exception {
Configuration config = createMock(Configuration.class);
expect(admin.getConfiguration(PID, null)).andReturn(config);
diff --git
a/config/core/src/main/java/org/apache/karaf/config/core/impl/ConfigMBeanImpl.java
b/config/core/src/main/java/org/apache/karaf/config/core/impl/ConfigMBeanImpl.java
index 81e1fed4c9..c8644f2611 100644
---
a/config/core/src/main/java/org/apache/karaf/config/core/impl/ConfigMBeanImpl.java
+++
b/config/core/src/main/java/org/apache/karaf/config/core/impl/ConfigMBeanImpl.java
@@ -54,7 +54,6 @@ public class ConfigMBeanImpl extends StandardMBean implements
ConfigMBean {
return configuration;
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
private TypedProperties getConfigProperties(String pid) throws
IOException, InvalidSyntaxException {
return configRepo.getConfig(pid);
}
diff --git
a/deployer/blueprint/src/main/java/org/apache/karaf/deployer/blueprint/BlueprintTransformer.java
b/deployer/blueprint/src/main/java/org/apache/karaf/deployer/blueprint/BlueprintTransformer.java
index 69d7688ba9..a06b79b1ad 100644
---
a/deployer/blueprint/src/main/java/org/apache/karaf/deployer/blueprint/BlueprintTransformer.java
+++
b/deployer/blueprint/src/main/java/org/apache/karaf/deployer/blueprint/BlueprintTransformer.java
@@ -81,7 +81,7 @@ public class BlueprintTransformer {
String text = e.getTextContent();
Properties props = new Properties();
props.load(new ByteArrayInputStream(text.trim().getBytes()));
- Enumeration en = props.propertyNames();
+ Enumeration<?> en = props.propertyNames();
while (en.hasMoreElements()) {
String k = (String) en.nextElement();
String v = props.getProperty(k);
diff --git
a/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
b/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
index 2d743792b5..44d4e444ec 100644
---
a/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
+++
b/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
@@ -219,7 +219,7 @@ public class FeatureDeploymentListener implements
ArtifactUrlTransformer, Bundle
List<URI> repsToAdd = new ArrayList<>();
List<String> reqsToAdd = new ArrayList<>();
if (bundleEvent.getType() == BundleEvent.RESOLVED) {
- Enumeration featuresUrlEnumeration =
bundle.findEntries("/META-INF/" + FEATURE_PATH + "/", "*.xml", false);
+ Enumeration<?> featuresUrlEnumeration =
bundle.findEntries("/META-INF/" + FEATURE_PATH + "/", "*.xml", false);
while (featuresUrlEnumeration != null &&
featuresUrlEnumeration.hasMoreElements()) {
URL url = (URL) featuresUrlEnumeration.nextElement();
URI uri = url.toURI();
diff --git
a/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/internal/Activator.java
b/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/internal/Activator.java
index 1789bd4c7d..7ed04496bc 100644
---
a/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/internal/Activator.java
+++
b/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/internal/Activator.java
@@ -35,7 +35,7 @@ public class Activator implements BundleActivator {
private List<ServiceRegistration<DumpProvider>> registrations;
private ServiceRegistration<DumpProvider> featuresProviderRegistration;
- private ServiceRegistration mbeanRegistration;
+ private ServiceRegistration<?> mbeanRegistration;
private SingleServiceTracker<FeaturesService> featuresServiceTracker;
private ServiceTracker<DumpProvider, DumpProvider> providersTracker;
@@ -81,14 +81,14 @@ public class Activator implements BundleActivator {
private String[] getInterfaceNames(Object object) {
List<String> names = new ArrayList<>();
- for (Class cl = object.getClass(); cl != Object.class; cl =
cl.getSuperclass()) {
+ for (Class<?> cl = object.getClass(); cl != Object.class; cl =
cl.getSuperclass()) {
addSuperInterfaces(names, cl);
}
return names.toArray(new String[names.size()]);
}
- private void addSuperInterfaces(List<String> names, Class clazz) {
- for (Class cl : clazz.getInterfaces()) {
+ private void addSuperInterfaces(List<String> names, Class<?> clazz) {
+ for (Class<?> cl : clazz.getInterfaces()) {
names.add(cl.getName());
addSuperInterfaces(names, cl);
}
diff --git
a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/jdbc/JdbcLoginModuleTest.java
b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/jdbc/JdbcLoginModuleTest.java
index b2d9c4447b..a8ade192ec 100644
---
a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/jdbc/JdbcLoginModuleTest.java
+++
b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/jdbc/JdbcLoginModuleTest.java
@@ -46,7 +46,6 @@ public class JdbcLoginModuleTest {
private JdbcDataSource dataSource;
private Map<String, Object> options;
- @SuppressWarnings("unchecked")
@Before
public void setUp() throws Exception {
// Create datasource
diff --git
a/management/server/src/main/java/org/apache/karaf/management/MBeanServerFactory.java
b/management/server/src/main/java/org/apache/karaf/management/MBeanServerFactory.java
index 4d43975f44..eca3f2d7e5 100644
---
a/management/server/src/main/java/org/apache/karaf/management/MBeanServerFactory.java
+++
b/management/server/src/main/java/org/apache/karaf/management/MBeanServerFactory.java
@@ -80,7 +80,7 @@ public class MBeanServerFactory {
public void init() throws Exception {
if (this.locateExistingServerIfPossible || this.agentId != null) {
try {
- List servers =
javax.management.MBeanServerFactory.findMBeanServer(agentId);
+ List<?> servers =
javax.management.MBeanServerFactory.findMBeanServer(agentId);
if (servers != null && servers.size() > 0) {
this.server = (MBeanServer) servers.get(0);
}
diff --git
a/management/server/src/main/java/org/apache/karaf/management/PlainSaslServer.java
b/management/server/src/main/java/org/apache/karaf/management/PlainSaslServer.java
index b610e936c2..0068298196 100644
---
a/management/server/src/main/java/org/apache/karaf/management/PlainSaslServer.java
+++
b/management/server/src/main/java/org/apache/karaf/management/PlainSaslServer.java
@@ -53,7 +53,7 @@ public class PlainSaslServer implements SaslServer {
// parse the response
// message = [authzid] UTF8NUL authcid UTF8NUL passwd'
- Deque<String> tokenList = new ArrayDeque<String>();
+ Deque<String> tokenList = new ArrayDeque<>();
StringBuilder messageToken = new StringBuilder();
for (byte b : response) {
if (b == 0) {
diff --git
a/management/server/src/main/java/org/apache/karaf/management/internal/MBeanInvocationHandler.java
b/management/server/src/main/java/org/apache/karaf/management/internal/MBeanInvocationHandler.java
index a779a45902..6e8855a397 100644
---
a/management/server/src/main/java/org/apache/karaf/management/internal/MBeanInvocationHandler.java
+++
b/management/server/src/main/java/org/apache/karaf/management/internal/MBeanInvocationHandler.java
@@ -61,7 +61,7 @@ public class MBeanInvocationHandler implements
InvocationHandler {
try {
- return AccessController.doPrivilegedWithCombiner(new
PrivilegedExceptionAction<Object>() {
+ return AccessController.doPrivilegedWithCombiner(new
PrivilegedExceptionAction<>() {
@Override
public Object run() throws Exception {
try {
diff --git a/obr/src/main/java/org/apache/karaf/obr/command/FindCommand.java
b/obr/src/main/java/org/apache/karaf/obr/command/FindCommand.java
index f9bd17f570..74616e805c 100644
--- a/obr/src/main/java/org/apache/karaf/obr/command/FindCommand.java
+++ b/obr/src/main/java/org/apache/karaf/obr/command/FindCommand.java
@@ -66,9 +66,9 @@ public class FindCommand extends ObrCommandSupport {
out.println(name);
printUnderline(out, name .length());
- Map map = resource.getProperties();
+ Map<?, ?> map = resource.getProperties();
for (Object o : map.entrySet()) {
- Map.Entry entry = (Map.Entry) o;
+ Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o;
if (entry.getValue().getClass().isArray()) {
out.println(entry.getKey() + ":");
for (int j = 0; j < Array.getLength(entry.getValue()); j++) {
diff --git a/obr/src/main/java/org/apache/karaf/obr/command/InfoCommand.java
b/obr/src/main/java/org/apache/karaf/obr/command/InfoCommand.java
index 5828f4b20b..60e8f10134 100644
--- a/obr/src/main/java/org/apache/karaf/obr/command/InfoCommand.java
+++ b/obr/src/main/java/org/apache/karaf/obr/command/InfoCommand.java
@@ -68,9 +68,9 @@ public class InfoCommand extends ObrCommandSupport {
out.println(resourceId);
printUnderline(out, resourceId.length());
- Map map = resource.getProperties();
+ Map<?, ?> map = resource.getProperties();
for (Object o : map.entrySet()) {
- Map.Entry entry = (Map.Entry) o;
+ Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o;
if (entry.getValue().getClass().isArray()) {
out.println(entry.getKey() + ":");
for (int j = 0; j < Array.getLength(entry.getValue());
j++) {
diff --git
a/services/staticcm/src/main/java/org/apache/karaf/services/staticcm/StaticConfigAdminImpl.java
b/services/staticcm/src/main/java/org/apache/karaf/services/staticcm/StaticConfigAdminImpl.java
index 5927397070..832617649d 100644
---
a/services/staticcm/src/main/java/org/apache/karaf/services/staticcm/StaticConfigAdminImpl.java
+++
b/services/staticcm/src/main/java/org/apache/karaf/services/staticcm/StaticConfigAdminImpl.java
@@ -44,7 +44,7 @@ public class StaticConfigAdminImpl implements
ConfigurationAdmin {
Objects.requireNonNull(configs, "configs");
this.context = context;
this.configurations = configs;
- ServiceTracker<ManagedService, ManagedService> serviceTracker = new
ServiceTracker<ManagedService, ManagedService>(context, ManagedService.class,
null) {
+ ServiceTracker<ManagedService, ManagedService> serviceTracker = new
ServiceTracker<>(context, ManagedService.class, null) {
@Override
public ManagedService
addingService(ServiceReference<ManagedService> reference) {
ManagedService service = context.getService(reference);
@@ -79,7 +79,7 @@ public class StaticConfigAdminImpl implements
ConfigurationAdmin {
serviceTracker.open();
ServiceTracker<ManagedServiceFactory, ManagedServiceFactory>
factoryTracker
- = new ServiceTracker<ManagedServiceFactory,
ManagedServiceFactory>(context, ManagedServiceFactory.class, null) {
+ = new ServiceTracker<>(context, ManagedServiceFactory.class,
null) {
@Override
public ManagedServiceFactory
addingService(ServiceReference<ManagedServiceFactory> reference) {
ManagedServiceFactory factory = context.getService(reference);
diff --git
a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/AggregateServiceTracker.java
b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/AggregateServiceTracker.java
index 22bf9c32df..f40be0348a 100644
---
a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/AggregateServiceTracker.java
+++
b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/AggregateServiceTracker.java
@@ -46,7 +46,7 @@ public abstract class AggregateServiceTracker {
public <T> void trackList(final Class<T> service, String filter) {
if (multiTrackers.get(service) == null) {
- MultiServiceTracker<T> tracker = new
MultiServiceTracker<T>(bundleContext, service, filter) {
+ MultiServiceTracker<T> tracker = new
MultiServiceTracker<>(bundleContext, service, filter) {
@Override
public void updateState(List<T> services) {
updateStateMulti(service, services);
@@ -59,7 +59,7 @@ public abstract class AggregateServiceTracker {
public <T> void trackSingle(final Class<T> service, boolean optional,
String filter) {
this.optional.merge(service, optional, Boolean::logicalAnd);
if (singleTrackers.get(service) == null) {
- SingleServiceTracker<T> tracker = new
SingleServiceTracker<T>(bundleContext, service, filter) {
+ SingleServiceTracker<T> tracker = new
SingleServiceTracker<>(bundleContext, service, filter) {
@Override
public void updateState(T oldSvc, T newSvc) {
updateStateSingle(service, newSvc);
diff --git
a/shell/core/src/test/java/org/apache/karaf/shell/support/ShellUtilTest.java
b/shell/core/src/test/java/org/apache/karaf/shell/support/ShellUtilTest.java
index 963747d5a5..44fac7be53 100644
--- a/shell/core/src/test/java/org/apache/karaf/shell/support/ShellUtilTest.java
+++ b/shell/core/src/test/java/org/apache/karaf/shell/support/ShellUtilTest.java
@@ -31,7 +31,7 @@ public class ShellUtilTest {
@Test
public void testGetValueStringWithCustomCollection() {
- List<Integer> data = new AbstractList<Integer>() {
+ List<Integer> data = new AbstractList<>() {
int[] values = new int[15];
int size = 0;
diff --git
a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommand.java
b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommand.java
index 0023522ed4..67fa7f43a1 100644
--- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommand.java
+++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommand.java
@@ -51,7 +51,7 @@ public class ShellCommand implements Command {
private static final Logger LOGGER =
LoggerFactory.getLogger(ShellCommand.class);
- private static final Class[] SECURITY_BUGFIX = {
+ private static final Class<?>[] SECURITY_BUGFIX = {
JaasHelper.class,
JaasHelper.OsgiSubjectDomainCombiner.class,
JaasHelper.DelegatingProtectionDomain.class,
