From 6da6abb5b62fb2925baa10b48a9ade688cbc8ab9 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 3 May 2026 23:10:47 +0200 Subject: [PATCH] Clean up use of generics Add generic type arguments, fixing raw type warnings. Signed-off-by: Robert Varga --- .../completers/ConfigurationPropertyCompleter.java | 5 ++--- .../org/apache/karaf/config/command/EditCommandTest.java | 1 - .../apache/karaf/config/core/impl/ConfigMBeanImpl.java | 1 - .../karaf/deployer/blueprint/BlueprintTransformer.java | 2 +- .../deployer/features/FeatureDeploymentListener.java | 2 +- .../org/apache/karaf/diagnostic/internal/Activator.java | 8 ++++---- .../karaf/jaas/modules/jdbc/JdbcLoginModuleTest.java | 1 - .../org/apache/karaf/management/MBeanServerFactory.java | 2 +- .../java/org/apache/karaf/management/PlainSaslServer.java | 2 +- .../karaf/management/internal/MBeanInvocationHandler.java | 2 +- .../java/org/apache/karaf/obr/command/FindCommand.java | 4 ++-- .../java/org/apache/karaf/obr/command/InfoCommand.java | 4 ++-- .../karaf/services/staticcm/StaticConfigAdminImpl.java | 4 ++-- .../shell/impl/action/osgi/AggregateServiceTracker.java | 4 ++-- .../org/apache/karaf/shell/support/ShellUtilTest.java | 2 +- .../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 4eb62a09bd2..b0c4a496cb1 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 @@ private static String getPid(Session session, CommandLine commandLine) { * @param pid * @return */ - @SuppressWarnings("rawtypes") private Set getPropertyNames(String pid) { Set propertyNames = new HashSet<>(); if (pid != null) { @@ -116,9 +115,9 @@ private Set getPropertyNames(String pid) { 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 24542bb3cb5..f7adc137695 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 void testExecuteOnExistingPid() throws Exception { 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 81e1fed4c93..c8644f2611f 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 @@ private Configuration getConfiguration(String pid) throws IOException { 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 69d7688ba95..a06b79b1ad8 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 static void transform(URL url, OutputStream os) throws Exception { 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 2d743792b5f..44d4e444eca 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 synchronized void bundleChanged(BundleEvent bundleEvent) { List repsToAdd = new ArrayList<>(); List 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 1789bd4c7d0..7ed04496bc8 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> registrations; private ServiceRegistration featuresProviderRegistration; - private ServiceRegistration mbeanRegistration; + private ServiceRegistration mbeanRegistration; private SingleServiceTracker featuresServiceTracker; private ServiceTracker providersTracker; @@ -81,14 +81,14 @@ public void stop(BundleContext context) throws Exception { private String[] getInterfaceNames(Object object) { List 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 names, Class clazz) { - for (Class cl : clazz.getInterfaces()) { + private void addSuperInterfaces(List 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 b2d9c4447ba..a8ade192ec4 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 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 4d43975f441..eca3f2d7e59 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 MBeanServer getServer() throws Exception { 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 b610e936c2a..00682981964 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 byte[] evaluateResponse(byte[] response) throws SaslException { // parse the response // message = [authzid] UTF8NUL authcid UTF8NUL passwd' - Deque tokenList = new ArrayDeque(); + Deque 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 a779a45902d..6e8855a397e 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 Object invoke(Object proxy, Method method, Object[] args) throws Throwabl try { - return AccessController.doPrivilegedWithCombiner(new PrivilegedExceptionAction() { + 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 f9bd17f5704..74616e805c4 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 @@ private void printResource(PrintStream out, Resource resource) 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 5828f4b20b9..60e8f101342 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 @@ private void printResource(PrintStream out, Resource resource) { 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 59273970708..832617649d9 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 StaticConfigAdminImpl(BundleContext context, List configs) Objects.requireNonNull(configs, "configs"); this.context = context; this.configurations = configs; - ServiceTracker serviceTracker = new ServiceTracker(context, ManagedService.class, null) { + ServiceTracker serviceTracker = new ServiceTracker<>(context, ManagedService.class, null) { @Override public ManagedService addingService(ServiceReference reference) { ManagedService service = context.getService(reference); @@ -79,7 +79,7 @@ public void removedService(ServiceReference reference, ManagedSe serviceTracker.open(); ServiceTracker factoryTracker - = new ServiceTracker(context, ManagedServiceFactory.class, null) { + = new ServiceTracker<>(context, ManagedServiceFactory.class, null) { @Override public ManagedServiceFactory addingService(ServiceReference 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 22bf9c32dfe..f40be0348aa 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 AggregateServiceTracker(BundleContext bundleContext) { public void trackList(final Class service, String filter) { if (multiTrackers.get(service) == null) { - MultiServiceTracker tracker = new MultiServiceTracker(bundleContext, service, filter) { + MultiServiceTracker tracker = new MultiServiceTracker<>(bundleContext, service, filter) { @Override public void updateState(List services) { updateStateMulti(service, services); @@ -59,7 +59,7 @@ public void updateState(List services) { public void trackSingle(final Class service, boolean optional, String filter) { this.optional.merge(service, optional, Boolean::logicalAnd); if (singleTrackers.get(service) == null) { - SingleServiceTracker tracker = new SingleServiceTracker(bundleContext, service, filter) { + SingleServiceTracker 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 963747d5a54..44fac7be539 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 data = new AbstractList() { + List 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 0023522ed4b..67fa7f43a15 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,