Reduce use of generic classes with omitted type params

Author: mawiesne

container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java

@@ -132,7 +132,7 @@ private void construct() throws OpenEJBException {
             throw new OpenEJBException("Error while creating bean " + clazz.getName(), e);
         }
 
-        final Map unsetProperties = objectRecipe.getUnsetProperties();
+        final Map<String, Object> unsetProperties = objectRecipe.getUnsetProperties();
         if (unsetProperties.size() > 0) {
             for (final Object property : unsetProperties.keySet()) {
                 logger.warning("Injection: No such property '" + property + "' in class " + clazz.getName());

container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java

@@ -187,7 +187,7 @@ private String first(final List<Interfaces> list) {
 
     private List<Interfaces> filter(final List<Interfaces> list, final String name) {
         final String shortName = name.replaceAll(".*/", "");
-        final List<Interfaces> matches = new ArrayList();
+        final List<Interfaces> matches = new ArrayList<>();
         for (final Interfaces entry : list) {
             if (name.equalsIgnoreCase(entry.getId())) {
                 matches.add(entry);
@@ -199,7 +199,7 @@ private List<Interfaces> filter(final List<Interfaces> list, final String name)
     }
 
     private List<Interfaces> filter(final List<Interfaces> list, final Type type) {
-        final List<Interfaces> matches = new ArrayList();
+        final List<Interfaces> matches = new ArrayList<>();
         for (final Interfaces entry : list) {
             if (type == Type.UNKNOWN || type == entry.type) {
                 matches.add(entry);

container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java

@@ -269,7 +269,7 @@ private static void print(final PrintStream out, final String cr, final ServiceI
             String uri = "new://" + info.service;
             if (info.service.matches("Container|Resource|Connector")) {
                 try {
-                    final Map query = new HashMap();
+                    final Map<String, String> query = new HashMap<>();
                     query.put("type", info.types.get(0));
                     uri += "?" + URISupport.createQueryString(query);
                 } catch (final Exception e) {

container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java

@@ -1089,7 +1089,7 @@ private List<List<String>> parseQueryParamters(final String queryParams) {
             return Collections.emptyList();
         }
 
-        final List bits = Collections.list(new StringTokenizer(queryParams, " \t\n\r\f,", false));
+        final List<Object> bits = Collections.list(new StringTokenizer(queryParams, " \t\n\r\f,", false));
         final List<List<String>> params = new ArrayList<>(bits.size() / 2);
         for (int i = 0; i < bits.size(); i++) {
             final String type = resolveType((String) bits.get(i));
@@ -1166,7 +1166,7 @@ private static enum TokenType {
 
     private List<String> tokenize(final String queryFilter) {
         final LinkedList<String> tokens = new LinkedList<>();
-        final List bits = Collections.list(new StringTokenizer(queryFilter, " \t\n\r\f()&|<>=!~+-/*", true));
+        final List<Object> bits = Collections.list(new StringTokenizer(queryFilter, " \t\n\r\f()&|<>=!~+-/*", true));
 
         boolean inWitespace = false;
         StringBuilder currentSymbol = new StringBuilder();

container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java

@@ -96,9 +96,9 @@ private void resolveServiceRefs(final DeploymentModule module, final JndiConsume
                     final String wsdlFile = serviceRef.getWsdlFile();
                     final Definition definition = getWsdl(module, wsdlFile);
 
-                    final Set serviceQNames = definition.getServices().keySet();
+                    final Set<QName> serviceQNames = definition.getServices().keySet();
                     if (serviceQNames.size() == 1) {
-                        final QName serviceQName = (QName) serviceQNames.iterator().next();
+                        final QName serviceQName = serviceQNames.iterator().next();
                         serviceRef.setServiceQname(serviceQName);
                     } else if (serviceQNames.isEmpty()) {
                         logger.error("The service-ref " + serviceRef.getName() + " must define service-qname because the wsdl-file " + serviceRef.getWsdlFile() + " does not constain any service definitions ");

container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckIncorrectPropertyNames.java

@@ -26,7 +26,7 @@
 
 public class CheckIncorrectPropertyNames extends ValidationBase {
 
-    Map incorrectAndCorrectPropNames = new HashMap<String, String>();
+    Map<String, String> incorrectAndCorrectPropNames = new HashMap<>();
 
     {
         //incorrect property key : correct property key
@@ -46,7 +46,6 @@ public class CheckIncorrectPropertyNames extends ValidationBase {
         incorrectAndCorrectPropNames.put("java.xml.soap.MetaFactory", "jakarta.xml.soap.MetaFactory");
         incorrectAndCorrectPropNames.put("java.persistence.sharedCache.mode", "jakarta.persistence.sharedCache.mode");
         incorrectAndCorrectPropNames.put("java.persistence.validation.mode", "jakarta.persistence.validation.mode");
-        incorrectAndCorrectPropNames.put("java.persistence.transactionType", "jakarta.persistence.transactionType");
 
         incorrectAndCorrectPropNames.put("javax.naming.applet", "java.naming.applet");
         incorrectAndCorrectPropNames.put("javax.naming.authoritative", "java.naming.authoritative");
@@ -71,8 +70,7 @@ public void validate(final AppModule appModule) {
         this.module = appModule;
         final Properties systemProperties = SystemInstance.get().getProperties();
 
-        for (Object o : incorrectAndCorrectPropNames.entrySet()) {
-            final Map.Entry<String, String> entry = (Map.Entry<String, String>) o;
+        for (Map.Entry<String, String> entry : incorrectAndCorrectPropNames.entrySet()) {
             if (systemProperties.containsKey(entry.getKey())) {
                 warn(appModule.toString(), "incorrect.property.name", entry.getKey(), entry.getValue());
             }

container/openejb-jee/src/main/java/org/apache/openejb/jee/Interceptor.java

@@ -496,7 +496,7 @@ public Map<String, ContextService> getContextServiceMap() {
     @Override
     public Map<String, ManagedExecutor> getManagedExecutorMap() {
         if (managedExecutor == null) {
-            managedExecutor = new KeyedCollection();
+            managedExecutor = new KeyedCollection<>();
         }
         return this.managedExecutor.toMap();
     }

container/openejb-junit/src/main/java/org/apache/openejb/junit/security/TestLoginModule.java

@@ -29,6 +29,7 @@
 import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
+import java.security.Principal;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -45,13 +46,15 @@ public class TestLoginModule implements LoginModule {
 
     private String user;
 
-    private final Set principals = new HashSet();
+    private final Set<Principal> principals = new HashSet<>();
 
+    @Override
     public void initialize(final Subject subject, final CallbackHandler callbackHandler, final Map sharedState, final Map options) {
         this.subject = subject;
         this.callbackHandler = callbackHandler;
     }
 
+    @Override
     public boolean login() throws LoginException {
         final Callback[] callbacks = new Callback[2];
 
@@ -67,7 +70,8 @@ public boolean login() throws LoginException {
 
         return true;
     }
-
+    
+    @Override
     public boolean commit() throws LoginException {
         principals.add(new UserPrincipal(user));
         principals.add(new GroupPrincipal(user));
@@ -78,11 +82,13 @@ public boolean commit() throws LoginException {
         return true;
     }
 
+    @Override
     public boolean abort() throws LoginException {
         user = null;
         return true;
     }
 
+    @Override
     public boolean logout() throws LoginException {
         subject.getPrincipals().removeAll(principals);
         principals.clear();

examples/component-interfaces/src/main/java/org/superbiz/FriendlyPerson.java

@@ -57,10 +57,11 @@ public class FriendlyPerson implements FriendlyPersonLocal, FriendlyPersonRemote
     private String defaultLanguage;
 
     public FriendlyPerson() {
-        greetings = new HashMap();
+        greetings = new HashMap<>();
         languagePreferences = new Properties();
         defaultLanguage = Locale.getDefault().getLanguage();
 
+        addGreeting("de", "Hallo {0}!");
         addGreeting("en", "Hello {0}!");
         addGreeting("es", "Hola {0}!");
         addGreeting("fr", "Bonjour {0}!");

itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestClient.java

@@ -58,8 +58,7 @@ protected final void processFieldInjections() {
 
         finder = new ClassFinder(getClassPath());
         fieldList = finder.findAnnotatedFields(EJB.class);
-        for (final Iterator fields = fieldList.iterator(); fields.hasNext(); ) {
-            final Field field = (Field) fields.next();
+        for (final Field field : fieldList) {
             final EJB ejbAnnotation = field.getAnnotation(EJB.class);
             if ((ejbAnnotation.name() != null) && (ejbAnnotation.name() != "") && (ejbAnnotation.beanInterface() != null)) {
                 try {
@@ -83,8 +82,7 @@ protected final void processSetterInjections() {
 
         finder = new ClassFinder(getClassPath());
         methodList = finder.findAnnotatedMethods(EJB.class);
-        for (final Iterator methods = methodList.iterator(); methods.hasNext(); ) {
-            final Method method = (Method) methods.next();
+        for (final Method method : methodList) {
             final EJB ejbAnnotation = method.getAnnotation(EJB.class);
             if ((ejbAnnotation.name() != null) && (ejbAnnotation.name() != "") && (ejbAnnotation.beanInterface() != null)) {
                 try {