summaryrefslogtreecommitdiff
path: root/javax/security
diff options
context:
space:
mode:
Diffstat (limited to 'javax/security')
-rw-r--r--javax/security/auth/Subject.java17
-rw-r--r--javax/security/auth/login/AppConfigurationEntry.java4
-rw-r--r--javax/security/auth/spi/LoginModule.java2
-rw-r--r--javax/security/sasl/Sasl.java10
-rw-r--r--javax/security/sasl/SaslClientFactory.java6
-rw-r--r--javax/security/sasl/SaslServerFactory.java5
6 files changed, 24 insertions, 20 deletions
diff --git a/javax/security/auth/Subject.java b/javax/security/auth/Subject.java
index 1659c6425..038363458 100644
--- a/javax/security/auth/Subject.java
+++ b/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/javax/security/auth/login/AppConfigurationEntry.java b/javax/security/auth/login/AppConfigurationEntry.java
index b455dbb6c..3c8b64d4c 100644
--- a/javax/security/auth/login/AppConfigurationEntry.java
+++ b/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/javax/security/auth/spi/LoginModule.java b/javax/security/auth/spi/LoginModule.java
index 00b33c517..197cd692e 100644
--- a/javax/security/auth/spi/LoginModule.java
+++ b/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
diff --git a/javax/security/sasl/Sasl.java b/javax/security/sasl/Sasl.java
index dbe4cc8c2..52210d971 100644
--- a/javax/security/sasl/Sasl.java
+++ b/javax/security/sasl/Sasl.java
@@ -356,7 +356,8 @@ public class Sasl
public static SaslClient createSaslClient(String[] mechanisms,
String authorizationID,
String protocol,
- String serverName, Map props,
+ String serverName,
+ Map<String, ?> props,
CallbackHandler cbh)
throws SaslException
{
@@ -444,7 +445,7 @@ public class Sasl
* {@link SaslClient} instance.
* @see #createSaslClient(String[],String,String,String,Map,CallbackHandler)
*/
- public static Enumeration getSaslClientFactories()
+ public static Enumeration<SaslClientFactory> getSaslClientFactories()
{
Vector result = new Vector();
HashSet names = new HashSet();
@@ -559,7 +560,8 @@ public class Sasl
*/
public static SaslServer createSaslServer(String mechanism, String protocol,
String serverName,
- Map props, CallbackHandler cbh)
+ Map<String, ?> props,
+ CallbackHandler cbh)
throws SaslException
{
if (mechanism == null)
@@ -636,7 +638,7 @@ public class Sasl
* {@link SaslServer} instance.
* @see #createSaslServer(String,String,String,Map,CallbackHandler)
*/
- public static Enumeration getSaslServerFactories()
+ public static Enumeration<SaslServerFactory> getSaslServerFactories()
{
Vector result = new Vector();
HashSet names = new HashSet();
diff --git a/javax/security/sasl/SaslClientFactory.java b/javax/security/sasl/SaslClientFactory.java
index ae36171c5..be80fd9f1 100644
--- a/javax/security/sasl/SaslClientFactory.java
+++ b/javax/security/sasl/SaslClientFactory.java
@@ -97,8 +97,8 @@ public interface SaslClientFactory
* because of an error.
*/
SaslClient createSaslClient(String[] mechanisms, String authorizationID,
- String protocol, String serverName, Map props,
- CallbackHandler cbh)
+ String protocol, String serverName,
+ Map<String, ?> props, CallbackHandler cbh)
throws SaslException;
/**
@@ -114,5 +114,5 @@ public interface SaslClientFactory
* properties, if present in props, are ignored.
* @return a non-null array containing IANA-registered SASL mechanism names.
*/
- String[] getMechanismNames(Map props);
+ String[] getMechanismNames(Map<String, ?> props);
}
diff --git a/javax/security/sasl/SaslServerFactory.java b/javax/security/sasl/SaslServerFactory.java
index fc43fb636..b51ce3dba 100644
--- a/javax/security/sasl/SaslServerFactory.java
+++ b/javax/security/sasl/SaslServerFactory.java
@@ -95,7 +95,8 @@ public interface SaslServerFactory
* of an error.
*/
SaslServer createSaslServer(String mechanism, String protocol,
- String serverName, Map props, CallbackHandler cbh)
+ String serverName, Map<String, ?> props,
+ CallbackHandler cbh)
throws SaslException;
/**
@@ -111,5 +112,5 @@ public interface SaslServerFactory
* properties, if present in props, are ignored.
* @return a non-null array containing IANA-registered SASL mechanism names.
*/
- String[] getMechanismNames(Map props);
+ String[] getMechanismNames(Map<String, ?> props);
}
View Lorry Controller Status