From d5c6e6c69e678a79f9e8cd312e6007ad88026a36 Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Mon, 6 Feb 2012 15:44:34 -0600
Subject: Added generics (part 4).

This patch brings down the warnings from 3427 to 2917.

Ticket #2
---
 .../common/src/com/netscape/cms/authentication/CMCAuth.java  |  3 +--
 .../com/netscape/cms/authentication/HashAuthentication.java  | 12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'pki/base/common/src/com/netscape/cms/authentication')

diff --git a/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java b/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java
index cf57098b6..905efc42a 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java
+++ b/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java
@@ -451,7 +451,6 @@ public class CMCAuth implements IAuthManager, IExtendedPluginInfo,
                                     // }
 
                                     INTEGER temp = revRequest.getSerialNumber();
-                                    int temp2 = temp.intValue();
 
                                     bigIntArray[j] = temp;
                                     authToken.set(TOKEN_CERT_SERIAL, bigIntArray);
@@ -783,7 +782,7 @@ public class CMCAuth implements IAuthManager, IExtendedPluginInfo,
 
             SET dais = cmcFullReq.getDigestAlgorithmIdentifiers();
             int numDig = dais.size();
-            Hashtable digs = new Hashtable();
+            Hashtable<String, byte[]> digs = new Hashtable<String, byte[]>();
 
             //if request key is used for signing, there MUST be only one signerInfo
             //object in the signedData object.
diff --git a/pki/base/common/src/com/netscape/cms/authentication/HashAuthentication.java b/pki/base/common/src/com/netscape/cms/authentication/HashAuthentication.java
index 4aae1f159..57b86157e 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/HashAuthentication.java
+++ b/pki/base/common/src/com/netscape/cms/authentication/HashAuthentication.java
@@ -62,19 +62,19 @@ public class HashAuthentication implements IAuthManager, IExtendedPluginInfo {
     private String mHost;
     private long mLastLogin = 0;
     private MessageDigest mSHADigest = null;
-    private Hashtable mData = null;
+    private Hashtable<String, IAuthToken> mData = null;
     private IConfigStore mConfig;
     private String mName = null;
     private String mImplName = null;
     private ILogger mLogger = CMS.getLogger();
-    private static Vector mExtendedPluginInfo = null;
+    private static Vector<String> mExtendedPluginInfo = null;
     private HashAuthData mHosts = null;
 
     static String[] mConfigParams =
             new String[] {};
 
     static {
-        mExtendedPluginInfo = new Vector();
+        mExtendedPluginInfo = new Vector<String>();
         mExtendedPluginInfo.add(IExtendedPluginInfo.HELP_TEXT +
                 ";Authenticate the username and password provided " +
                 "by the user against an LDAP directory. Works with the " +
@@ -94,7 +94,7 @@ public class HashAuthentication implements IAuthManager, IExtendedPluginInfo {
         mName = name;
         mImplName = implName;
         mConfig = config;
-        mData = new Hashtable();
+        mData = new Hashtable<String, IAuthToken>();
         mHosts = new HashAuthData();
 
         try {
@@ -106,7 +106,7 @@ public class HashAuthentication implements IAuthManager, IExtendedPluginInfo {
     }
 
     public IAuthToken getAuthToken(String key) {
-        return (IAuthToken) mData.remove(key);
+        return mData.remove(key);
     }
 
     public void addAuthToken(String pageID, IAuthToken token) {
@@ -114,7 +114,7 @@ public class HashAuthentication implements IAuthManager, IExtendedPluginInfo {
     }
 
     public void deleteToken(String pageID) {
-        IAuthToken token = (IAuthToken) mData.remove(pageID);
+        mData.remove(pageID);
     }
 
     public HashAuthData getData() {
-- 
cgit