You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/06/08 13:35:14 UTC
svn commit: r1684162 - in /tomcat/trunk/java/javax/security/auth/message:
MessageInfo.java config/AuthConfigFactory.java config/ClientAuthConfig.java
config/ServerAuthConfig.java module/ClientAuthModule.java
module/ServerAuthModule.java
Author: markt
Date: Mon Jun 8 11:35:14 2015
New Revision: 1684162
URL: http://svn.apache.org/r1684162
Log:
Fix the generics issues we can fix and suppress the issues in the API since we can't fix those.
Suppress at the method level so we spot generics issues in any new methods we add (assuming there is a JASPIC.next and we contribute to it in some way)
Modified:
tomcat/trunk/java/javax/security/auth/message/MessageInfo.java
tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
tomcat/trunk/java/javax/security/auth/message/config/ClientAuthConfig.java
tomcat/trunk/java/javax/security/auth/message/config/ServerAuthConfig.java
tomcat/trunk/java/javax/security/auth/message/module/ClientAuthModule.java
tomcat/trunk/java/javax/security/auth/message/module/ServerAuthModule.java
Modified: tomcat/trunk/java/javax/security/auth/message/MessageInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/MessageInfo.java?rev=1684162&r1=1684161&r2=1684162&view=diff
==============================================================================
--- tomcat/trunk/java/javax/security/auth/message/MessageInfo.java (original)
+++ tomcat/trunk/java/javax/security/auth/message/MessageInfo.java Mon Jun 8 11:35:14 2015
@@ -23,6 +23,7 @@ import java.util.Map;
*/
public interface MessageInfo {
+ @SuppressWarnings("rawtypes") // JASPIC API uses raw types
Map getMap();
Object getRequestMessage();
Modified: tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java?rev=1684162&r1=1684161&r2=1684162&view=diff
==============================================================================
--- tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java (original)
+++ tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java Mon Jun 8 11:35:14 2015
@@ -33,10 +33,10 @@ public abstract class AuthConfigFactory
private static ClassLoader contextClassLoader;
static {
- contextClassLoader = (ClassLoader) java.security.AccessController
- .doPrivileged(new java.security.PrivilegedAction() {
+ contextClassLoader = java.security.AccessController
+ .doPrivileged(new java.security.PrivilegedAction<ClassLoader>() {
@Override
- public Object run() {
+ public ClassLoader run() {
return Thread.currentThread().getContextClassLoader();
}
});
@@ -48,10 +48,10 @@ public abstract class AuthConfigFactory
sm.checkPermission(new AuthPermission("getAuthConfigFactory"));
}
if (factory == null) {
- String className = (String) java.security.AccessController
- .doPrivileged(new java.security.PrivilegedAction() {
+ String className = java.security.AccessController
+ .doPrivileged(new java.security.PrivilegedAction<String>() {
@Override
- public Object run() {
+ public String run() {
return java.security.Security.getProperty(DEFAULT_FACTORY_SECURITY_PROPERTY);
}
});
@@ -60,14 +60,14 @@ public abstract class AuthConfigFactory
}
try {
final String finalClassName = className;
- factory = (AuthConfigFactory) java.security.AccessController
- .doPrivileged(new java.security.PrivilegedExceptionAction() {
+ factory = java.security.AccessController
+ .doPrivileged(new java.security.PrivilegedExceptionAction<AuthConfigFactory>() {
@Override
- public Object run() throws ClassNotFoundException, InstantiationException,
+ public AuthConfigFactory run() throws ClassNotFoundException, InstantiationException,
IllegalAccessException {
// TODO Review this
- Class clazz = Class.forName(finalClassName, true, contextClassLoader);
- return clazz.newInstance();
+ Class<?> clazz = Class.forName(finalClassName, true, contextClassLoader);
+ return (AuthConfigFactory) clazz.newInstance();
}
});
} catch (PrivilegedActionException e) {
@@ -107,6 +107,7 @@ public abstract class AuthConfigFactory
public abstract String registerConfigProvider(AuthConfigProvider provider, String layer, String appContext, String description);
+ @SuppressWarnings("rawtypes") // JASPIC API uses raw types
public abstract String registerConfigProvider(String className, Map properties, String layer, String appContext, String description);
public abstract boolean removeRegistration(String registrationID);
Modified: tomcat/trunk/java/javax/security/auth/message/config/ClientAuthConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/config/ClientAuthConfig.java?rev=1684162&r1=1684161&r2=1684162&view=diff
==============================================================================
--- tomcat/trunk/java/javax/security/auth/message/config/ClientAuthConfig.java (original)
+++ tomcat/trunk/java/javax/security/auth/message/config/ClientAuthConfig.java Mon Jun 8 11:35:14 2015
@@ -27,5 +27,6 @@ import javax.security.auth.message.AuthE
*/
public interface ClientAuthConfig extends AuthConfig {
+ @SuppressWarnings("rawtypes") // JASPIC API uses raw types
ClientAuthContext getAuthContext(String authContextID, Subject clientSubject, Map properties) throws AuthException;
}
Modified: tomcat/trunk/java/javax/security/auth/message/config/ServerAuthConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/config/ServerAuthConfig.java?rev=1684162&r1=1684161&r2=1684162&view=diff
==============================================================================
--- tomcat/trunk/java/javax/security/auth/message/config/ServerAuthConfig.java (original)
+++ tomcat/trunk/java/javax/security/auth/message/config/ServerAuthConfig.java Mon Jun 8 11:35:14 2015
@@ -26,5 +26,6 @@ import javax.security.auth.message.AuthE
*/
public interface ServerAuthConfig extends AuthConfig {
+ @SuppressWarnings("rawtypes") // JASPIC API uses raw types
ServerAuthContext getAuthContext(String authContextID, Subject serviceSubject, Map properties) throws AuthException;
}
Modified: tomcat/trunk/java/javax/security/auth/message/module/ClientAuthModule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/module/ClientAuthModule.java?rev=1684162&r1=1684161&r2=1684162&view=diff
==============================================================================
--- tomcat/trunk/java/javax/security/auth/message/module/ClientAuthModule.java (original)
+++ tomcat/trunk/java/javax/security/auth/message/module/ClientAuthModule.java Mon Jun 8 11:35:14 2015
@@ -29,7 +29,9 @@ import javax.security.auth.message.Messa
*/
public interface ClientAuthModule extends ClientAuth {
+ @SuppressWarnings("rawtypes") // JASPIC API uses raw types
Class[] getSupportedMessageTypes();
+ @SuppressWarnings("rawtypes") // JASPIC API uses raw types
void initialize(MessagePolicy requestPolicy, MessagePolicy responsePolicy, CallbackHandler handler, Map options) throws AuthException;
}
Modified: tomcat/trunk/java/javax/security/auth/message/module/ServerAuthModule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/module/ServerAuthModule.java?rev=1684162&r1=1684161&r2=1684162&view=diff
==============================================================================
--- tomcat/trunk/java/javax/security/auth/message/module/ServerAuthModule.java (original)
+++ tomcat/trunk/java/javax/security/auth/message/module/ServerAuthModule.java Mon Jun 8 11:35:14 2015
@@ -28,7 +28,9 @@ import javax.security.auth.message.Serve
*/
public interface ServerAuthModule extends ServerAuth {
+ @SuppressWarnings("rawtypes") // JASPIC API uses raw types
Class[] getSupportedMessageTypes();
+ @SuppressWarnings("rawtypes") // JASPIC API uses raw types
void initialize(MessagePolicy requestPolicy, MessagePolicy responsePolicy, CallbackHandler handler, Map options) throws AuthException;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org