jdk-sandbox: comparison jdk/src/share/classes/sun/security/krb5/Config.java

equal deleted inserted replaced

-:3c7eda3ab2f5
+:0bb1999251f8
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.List;
 import sun.net.dns.ResolverConfiguration;
 import sun.security.krb5.internal.crypto.EType;
-import sun.security.krb5.internal.ktab.*;
 import sun.security.krb5.internal.Krb5;
 /**
 * This class maintains key-value pairs of Kerberos configurable constants
 * from configuration file or from user specified system properties.
 * @param k the key string.
 * @param t stanzaTable or sub hashtable within it.
 * @return the value found in config file, returns null if no value
 * matched with the key is found.
 */
-private String getDefault(String k, Hashtable t) {
+private String getDefault(String k, Hashtable<String, Object> t) {
 String result = null;
 String key;
 if (stanzaTable != null) {
-for (Enumeration e = t.keys(); e.hasMoreElements(); ) {
+for (Enumeration<String> e = t.keys(); e.hasMoreElements(); ) {
-key = (String)e.nextElement();
+key = e.nextElement();
 Object ob = t.get(key);
 if (ob instanceof Hashtable) {
-result = getDefault(k, (Hashtable)ob);
+@SuppressWarnings("unchecked") // Checked with an instanceof check
+Hashtable<String, Object> table =
+(Hashtable<String, Object>)ob;
+result = getDefault(k, table);
 if (result != null) {
 return result;
 }
 } else if (key.equalsIgnoreCase(k)) {
 if (ob instanceof String) {
 * <br>This method is quicker by using the section name as the search key.
 * @param name the name.
 * @param section the name of the section.
 * @return the default value, null is returned if it cannot be found.
 */
+// stanzaTable leads to a lot of unchecked casts since its value type is
+// STANZATABLE = String | Hashtable<String, STANZATABLE>
+@SuppressWarnings("unchecked")
 public String getDefault(String name, String section) {
 String stanzaName;
 String result = null;
-Hashtable subTable;
+Hashtable<String, Object> subTable;
 if (stanzaTable != null) {
-for (Enumeration e = stanzaTable.keys(); e.hasMoreElements(); ) {
+for (Enumeration<String> e = stanzaTable.keys();
-stanzaName = (String)e.nextElement();
+e.hasMoreElements(); ) {
-subTable = (Hashtable)stanzaTable.get(stanzaName);
+stanzaName = e.nextElement();
+subTable = (Hashtable<String, Object>)
+stanzaTable.get(stanzaName);
 if (stanzaName.equalsIgnoreCase(section)) {
 if (subTable.containsKey(name)) {
 return (String)(subTable.get(name));
 }
 } else if (subTable.containsKey(section)) {
 Object ob = subTable.get(section);
 if (ob instanceof Hashtable) {
-Hashtable temp = (Hashtable)ob;
+Hashtable<String, Object> temp =
+(Hashtable<String, Object>)ob;
 if (temp.containsKey(name)) {
 Object object = temp.get(name);
 if (object instanceof Vector) {
 result = "";
 int length = ((Vector)object).size();
 }
 /**
 * Compares the key with the known keys to see if it exists.
 */
-private boolean exists(String key, Vector v) {
+private boolean exists(String key, Vector<String> v) {
 boolean exists = false;
 for (int i = 0; i < v.size(); i++) {
-if (((String)(v.elementAt(i))).equals(key)) {
+if (v.elementAt(i).equals(key)) {
 exists = true;
 }
 }
 return exists;
 }
 */
 public void listTable() {
 listTable(stanzaTable);
 }
-private void listTable(Hashtable table) {
+// stanzaTable leads to a lot of unchecked casts since its value type is
-Vector v = new Vector();
+// STANZATABLE = String | Hashtable<String, STANZATABLE>
+@SuppressWarnings("unchecked")
+private void listTable(Hashtable<String, Object> table) {
+Vector<String> v = new Vector<String>();
 String key;
 if (stanzaTable != null) {
-for (Enumeration e = table.keys(); e.hasMoreElements(); ) {
+for (Enumeration<String> e = table.keys(); e.hasMoreElements(); ) {
-key = (String)e.nextElement();
+key = e.nextElement();
 Object object = table.get(key);
 if (table == stanzaTable) {
 System.out.println("[" + key + "]");
 }
 if (object instanceof Hashtable) {
 if (table != stanzaTable)
 System.out.println("\t" + key + " = {");
-listTable((Hashtable)object);
+listTable((Hashtable<String, Object>)object);
 if (table != stanzaTable)
 System.out.println("\t}");
 } else if (object instanceof String) {
 System.out.println("\t" + key + " = " +
 (String)table.get(key));
 } else if (object instanceof Vector) {
-v = (Vector)object;
+v = (Vector<String>)object;
 for (int i = 0; i < v.size(); i++) {
-System.out.println("\t" + key + " = " +
+System.out.println("\t" + key + " = " + v.elementAt(i));
-(String)v.elementAt(i));
 }
 }
 }
 } else {
 System.out.println("Configuration file not found.");
 if ((type != -1) &&
 (EType.isSupported(type))) {
 ls.add(type);
 }
 }
-if (ls.size() == 0) {
+if (ls.isEmpty()) {
 if (DEBUG) {
 System.out.println(
 "no supported default etypes for " + enctypes);
 }
 return null;
 if (obj instanceof String) {
 sb.append(prefix);
 sb.append(obj);
 sb.append('\n');
 } else if (obj instanceof Hashtable) {
-Hashtable tab = (Hashtable)obj;
+Hashtable<?, ?> tab = (Hashtable<?, ?>)obj;
 for (Object o: tab.keySet()) {
 sb.append(prefix);
 sb.append(o);
 sb.append(" = {\n");
 toStringIndented(prefix + "    ", tab.get(o), sb);
 sb.append(prefix + "}\n");
 }
 } else if (obj instanceof Vector) {
-Vector v = (Vector)obj;
+Vector<?> v = (Vector<?>)obj;
 for (Object o: v.toArray()) {
 toStringIndented(prefix + "    ", o, sb);
 }
 }
 }

changeset 10336	0bb1999251f8
parent 9499	f3115698a012
child 12047	320a714614e9