SWS-918 Fix compiler warnings
The project contains various easy to fix compiler warnings like unused
imports, raw types and no longer needed @SuppressWarnings("unchecked").
This change removes:
* unused imports
* raw types
* no longer needed @SuppressWarnings("unchecked")
Issue: SWS-918
https://jira.spring.io/browse/SWS-918
This commit is contained in:
@@ -38,7 +38,6 @@ public abstract class SpringSecurityUtils {
|
||||
* @throws DisabledException if the account is disabled
|
||||
* @throws LockedException if the account is locked
|
||||
*/
|
||||
@SuppressWarnings("deprecation")
|
||||
public static void checkUserValidity(UserDetails user)
|
||||
throws AccountExpiredException, CredentialsExpiredException, DisabledException, LockedException {
|
||||
if (!user.isAccountNonLocked()) {
|
||||
|
||||
@@ -597,7 +597,6 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("unchecked")
|
||||
protected void validateMessage(SoapMessage soapMessage, MessageContext messageContext)
|
||||
throws WsSecurityValidationException {
|
||||
if (logger.isDebugEnabled()) {
|
||||
|
||||
@@ -17,10 +17,8 @@
|
||||
package org.springframework.ws.soap.security.support;
|
||||
|
||||
import javax.net.ssl.KeyManager;
|
||||
import javax.net.ssl.TrustManager;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import org.junit.Test;
|
||||
|
||||
|
||||
@@ -19,7 +19,6 @@ package org.springframework.ws.soap.security.support;
|
||||
import javax.net.ssl.TrustManager;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import org.junit.Test;
|
||||
|
||||
|
||||
@@ -18,6 +18,8 @@ package org.springframework.ws.soap.security.xwss.callback.jaas;
|
||||
|
||||
import java.security.Principal;
|
||||
import java.util.Iterator;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.security.auth.Subject;
|
||||
import javax.security.auth.callback.CallbackHandler;
|
||||
import javax.security.auth.login.LoginException;
|
||||
@@ -48,8 +50,8 @@ public class CertificateLoginModule implements LoginModule {
|
||||
@Override
|
||||
public void initialize(Subject subject,
|
||||
CallbackHandler callbackHandler,
|
||||
java.util.Map sharedState,
|
||||
java.util.Map options) {
|
||||
Map<String,?> sharedState,
|
||||
Map<String,?> options) {
|
||||
this.subject = subject;
|
||||
}
|
||||
|
||||
@@ -73,8 +75,8 @@ public class CertificateLoginModule implements LoginModule {
|
||||
}
|
||||
|
||||
private String getName(Subject subject) {
|
||||
for (Iterator iterator = subject.getPrincipals().iterator(); iterator.hasNext();) {
|
||||
Principal principal = (Principal) iterator.next();
|
||||
for (Iterator<Principal> iterator = subject.getPrincipals().iterator(); iterator.hasNext();) {
|
||||
Principal principal = iterator.next();
|
||||
if (principal instanceof X500Principal) {
|
||||
return principal.getName();
|
||||
}
|
||||
|
||||
@@ -20,6 +20,8 @@ import java.security.Principal;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.security.auth.Subject;
|
||||
import javax.security.auth.callback.Callback;
|
||||
import javax.security.auth.callback.CallbackHandler;
|
||||
@@ -69,8 +71,8 @@ public class PlainTextLoginModule implements LoginModule {
|
||||
@Override
|
||||
public void initialize(Subject subject,
|
||||
CallbackHandler callbackHandler,
|
||||
java.util.Map sharedState,
|
||||
java.util.Map options) {
|
||||
Map<String,?> sharedState,
|
||||
Map<String,?> options) {
|
||||
this.subject = subject;
|
||||
this.callbackHandler = callbackHandler;
|
||||
}
|
||||
@@ -126,9 +128,9 @@ public class PlainTextLoginModule implements LoginModule {
|
||||
public boolean logout() {
|
||||
principals.clear();
|
||||
|
||||
Iterator iterator = subject.getPrincipals(SimplePrincipal.class).iterator();
|
||||
Iterator<SimplePrincipal> iterator = subject.getPrincipals(SimplePrincipal.class).iterator();
|
||||
while (iterator.hasNext()) {
|
||||
SimplePrincipal principal = (SimplePrincipal) iterator.next();
|
||||
SimplePrincipal principal = iterator.next();
|
||||
subject.getPrincipals().remove(principal);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user