diff options
Diffstat (limited to 'libjava/classpath/javax/security/auth')
3 files changed, 12 insertions, 11 deletions
diff --git a/libjava/classpath/javax/security/auth/Subject.java b/libjava/classpath/javax/security/auth/Subject.java index 1659c6425fe..03836345862 100644 --- a/libjava/classpath/javax/security/auth/Subject.java +++ b/libjava/classpath/javax/security/auth/Subject.java @@ -91,8 +91,9 @@ public final class Subject implements Serializable readOnly = false; } - public Subject (final boolean readOnly, final Set principals, - final Set pubCred, final Set privCred) + public Subject (final boolean readOnly, + final Set<? extends Principal> principals, + final Set<?> pubCred, final Set<?> privCred) { if (principals == null || pubCred == null || privCred == null) { @@ -265,12 +266,12 @@ public final class Subject implements Serializable privCred.containsAll (that.getPrivateCredentials()); } - public Set getPrincipals() + public Set<Principal> getPrincipals() { return principals; } - public Set getPrincipals(Class clazz) + public <T extends Principal> Set<T> getPrincipals(Class<T> clazz) { HashSet result = new HashSet (principals.size()); for (Iterator it = principals.iterator(); it.hasNext(); ) @@ -284,12 +285,12 @@ public final class Subject implements Serializable return Collections.unmodifiableSet (result); } - public Set getPrivateCredentials() + public Set<Object> getPrivateCredentials() { return privCred; } - public Set getPrivateCredentials (Class clazz) + public <T> Set<T> getPrivateCredentials (Class<T> clazz) { HashSet result = new HashSet (privCred.size()); for (Iterator it = privCred.iterator(); it.hasNext(); ) @@ -303,12 +304,12 @@ public final class Subject implements Serializable return Collections.unmodifiableSet (result); } - public Set getPublicCredentials() + public Set<Object> getPublicCredentials() { return pubCred; } - public Set getPublicCredentials (Class clazz) + public <T> Set<T> getPublicCredentials (Class<T> clazz) { HashSet result = new HashSet (pubCred.size()); for (Iterator it = pubCred.iterator(); it.hasNext(); ) diff --git a/libjava/classpath/javax/security/auth/login/AppConfigurationEntry.java b/libjava/classpath/javax/security/auth/login/AppConfigurationEntry.java index b455dbb6c24..3c8b64d4c99 100644 --- a/libjava/classpath/javax/security/auth/login/AppConfigurationEntry.java +++ b/libjava/classpath/javax/security/auth/login/AppConfigurationEntry.java @@ -56,7 +56,7 @@ public class AppConfigurationEntry public AppConfigurationEntry (final String loginModuleName, final LoginModuleControlFlag controlFlag, - final Map options) + final Map<String, ?> options) { if (loginModuleName == null || loginModuleName.length() == 0) throw new IllegalArgumentException ("module name cannot be null nor empty"); @@ -88,7 +88,7 @@ public class AppConfigurationEntry return loginModuleName; } - public Map getOptions() + public Map<String, ?> getOptions() { return options; } diff --git a/libjava/classpath/javax/security/auth/spi/LoginModule.java b/libjava/classpath/javax/security/auth/spi/LoginModule.java index 00b33c517e4..197cd692e37 100644 --- a/libjava/classpath/javax/security/auth/spi/LoginModule.java +++ b/libjava/classpath/javax/security/auth/spi/LoginModule.java @@ -95,7 +95,7 @@ public interface LoginModule * @param options A mapping of options given to this module. */ void initialize(Subject subject, CallbackHandler handler, - Map sharedState, Map options); + Map<String, ?> sharedState, Map<String, ?> options); /** * Authenticates a subject to the system. This is the primary |
