Minor cleanups to avoid compiler warnings.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1938 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/edu/internet2/middleware/shibboleth/idp/IdPResponder.java b/src/edu/internet2/middleware/shibboleth/idp/IdPResponder.java
index 90d5246..f6e1fdb 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/IdPResponder.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/IdPResponder.java
@@ -19,6 +19,7 @@ package edu.internet2.middleware.shibboleth.idp;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Random;
 
 import javax.servlet.RequestDispatcher;
@@ -73,7 +74,7 @@ public class IdPResponder extends HttpServlet {
        private SAMLBinding binding;
 
        private IdPConfig configuration;
-       private HashMap protocolHandlers = new HashMap();
+       private Map<String, IdPProtocolHandler> protocolHandlers = new HashMap<String, IdPProtocolHandler>();
        private IdPProtocolSupport protocolSupport;
 
        /*

diff --git a/src/edu/internet2/middleware/shibboleth/idp/provider/BaseHandler.java b/src/edu/internet2/middleware/shibboleth/idp/provider/BaseHandler.java
index 96e6e84..e08c996 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/provider/BaseHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/provider/BaseHandler.java
@@ -39,7 +39,7 @@ import edu.internet2.middleware.shibboleth.idp.IdPProtocolHandler;
 public abstract class BaseHandler implements IdPProtocolHandler {
 
        private static Logger log = Logger.getLogger(BaseHandler.class.getName());
-       private HashSet locations = new HashSet();
+       private HashSet<String> locations = new HashSet<String>();
 
        /**
         * Required DOM-based constructor.

diff --git a/src/edu/internet2/middleware/shibboleth/idp/provider/BaseServiceHandler.java b/src/edu/internet2/middleware/shibboleth/idp/provider/BaseServiceHandler.java
index 987dfd2..c6873eb 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/provider/BaseServiceHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/provider/BaseServiceHandler.java
@@ -20,7 +20,6 @@ import java.security.cert.X509Certificate;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.log4j.Logger;
 import org.w3c.dom.Element;
 
 import edu.internet2.middleware.shibboleth.common.ShibbolethConfigurationException;
@@ -39,8 +38,6 @@ public abstract class BaseServiceHandler extends BaseHandler implements IdPProto
                super(config);
        }
 
-       private static Logger log = Logger.getLogger(BaseServiceHandler.class.getName());
-
        protected static X509Certificate getCredentialFromProvider(HttpServletRequest req) {
 
                X509Certificate[] certArray = (X509Certificate[]) req.getAttribute("javax.servlet.request.X509Certificate");

diff --git a/src/edu/internet2/middleware/shibboleth/idp/provider/SAMLv1_1ArtifactQueryHandler.java b/src/edu/internet2/middleware/shibboleth/idp/provider/SAMLv1_1ArtifactQueryHandler.java
index c0f8321..39a4c5f 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/provider/SAMLv1_1ArtifactQueryHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/provider/SAMLv1_1ArtifactQueryHandler.java
@@ -89,7 +89,7 @@ public class SAMLv1_1ArtifactQueryHandler extends BaseServiceHandler implements
                        log.info("Request contains TLS credential: (" + chain[0].getSubjectX500Principal().getName(X500Principal.RFC2253)
                                + ").");
                }
-               ArrayList assertions = new ArrayList();
+               ArrayList<SAMLAssertion> assertions = new ArrayList<SAMLAssertion>();
                Iterator artifacts = samlRequest.getArtifacts();
 
                if (!artifacts.hasNext()) {