Clean up use of generics

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<String> getPropertyNames(String pid) {
         Set<String> propertyNames = new HashSet<>();
         if (pid != null) {     
@@ -116,9 +115,9 @@ private Set<String> 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()));
                             }

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);

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);
     }

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);

deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java

@@ -219,7 +219,7 @@ public synchronized void bundleChanged(BundleEvent bundleEvent) {
             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();

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 void stop(BundleContext context) throws Exception {
 
     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);
         }

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

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);
                 }

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<String> tokenList = new ArrayDeque<String>();
+			Deque<String> tokenList = new ArrayDeque<>();
 			StringBuilder messageToken = new StringBuilder();
 			for (byte b : response) {
 				if (b == 0) {

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<Object>() {
+            return AccessController.doPrivilegedWithCombiner(new PrivilegedExceptionAction<>() {
                 @Override
                 public Object run() throws Exception {
                     try {

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++) {

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++) {

services/staticcm/src/main/java/org/apache/karaf/services/staticcm/StaticConfigAdminImpl.java

@@ -44,7 +44,7 @@ public StaticConfigAdminImpl(BundleContext context, List<Configuration> configs)
         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 void removedService(ServiceReference<ManagedService> reference, ManagedSe
         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);

shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/AggregateServiceTracker.java

@@ -46,7 +46,7 @@ public AggregateServiceTracker(BundleContext bundleContext) {
 
     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 void updateState(List<T> services) {
     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);

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;

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,