Bumped up compile warnings

Bumped up the compiler warning to errors.
2014-04-24 14:13:23 +02:00
parent ded1efd456
commit 12a10a34f1
125 changed files with 444 additions and 354 deletions
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/WsSecurityException.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/WsSecurityException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 the original author or authors.
+ * Copyright 2005-2014 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ import org.springframework.ws.WebServiceException;
 * @author Arjen Poutsma
 * @since 1.0.0
 */
+@SuppressWarnings("serial")
 public abstract class WsSecurityException extends WebServiceException {

    public WsSecurityException(String msg) {
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/WsSecurityFaultException.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/WsSecurityFaultException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 the original author or authors.
+ * Copyright 2005-2014 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@ import javax.xml.namespace.QName;
 * @author Arjen Poutsma
 * @since 1.0.1
 */
+@SuppressWarnings("serial")
 public abstract class WsSecurityFaultException extends WsSecurityException {

    private QName faultCode;
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/WsSecuritySecurementException.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/WsSecuritySecurementException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 the original author or authors.
+ * Copyright 2005-2014 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ package org.springframework.ws.soap.security;
 * @author Arjen Poutsma
 * @since 1.0.0
 */
+@SuppressWarnings("serial")
 public abstract class WsSecuritySecurementException extends WsSecurityException {

    public WsSecuritySecurementException(String msg) {
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/WsSecurityValidationException.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/WsSecurityValidationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 the original author or authors.
+ * Copyright 2005-2014 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ package org.springframework.ws.soap.security;
 * @author Arjen Poutsma
 * @since 1.0.0
 */
+@SuppressWarnings("serial")
 public abstract class WsSecurityValidationException extends WsSecurityException {

    public WsSecurityValidationException(String msg) {
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/SpringSecurityUtils.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/SpringSecurityUtils.java
@@ -1,10 +1,11 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/*
+ * Copyright 2005-2014 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,11 +16,11 @@

 package org.springframework.ws.soap.security.support;

-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.authentication.LockedException;
-import org.springframework.security.authentication.DisabledException;
 import org.springframework.security.authentication.AccountExpiredException;
 import org.springframework.security.authentication.CredentialsExpiredException;
+import org.springframework.security.authentication.DisabledException;
+import org.springframework.security.authentication.LockedException;
+import org.springframework.security.core.userdetails.UserDetails;

 /**
 * Generic utility methods for Spring Security
@@ -37,6 +38,7 @@ 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()) {
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityFaultException.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityFaultException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 the original author or authors.
+ * Copyright 2005-2014 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@ import org.springframework.ws.soap.security.WsSecurityFaultException;
 * @author Arjen Poutsma
 * @since 1.5.0
 */
+@SuppressWarnings("serial")
 public class Wss4jSecurityFaultException extends WsSecurityFaultException {

    public Wss4jSecurityFaultException(QName faultCode, String faultString, String faultActor) {
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecuritySecurementException.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecuritySecurementException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 the original author or authors.
+ * Copyright 2005-2014 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ import org.springframework.ws.soap.security.WsSecuritySecurementException;
 * @author Arjen Poutsma
 * @since 1.5.0
 */
+@SuppressWarnings("serial")
 public class Wss4jSecuritySecurementException extends WsSecuritySecurementException {

    public Wss4jSecuritySecurementException(String msg) {
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityValidationException.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityValidationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 the original author or authors.
+ * Copyright 2005-2014 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ import org.springframework.ws.soap.security.WsSecurityValidationException;
 * @author Arjen Poutsma
 * @since 1.5.0
 */
+@SuppressWarnings("serial")
 public class Wss4jSecurityValidationException extends WsSecurityValidationException {

    public Wss4jSecurityValidationException(String msg) {
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/X509AuthenticationProvider.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/X509AuthenticationProvider.java
@@ -126,7 +126,7 @@ public class X509AuthenticationProvider implements AuthenticationProvider, Initi
    }

    @Override
-    public boolean supports(Class authentication) {
+    public boolean supports(Class<?> authentication) {
        return X509AuthenticationToken.class.isAssignableFrom(authentication);
    }
 }
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/EhCacheBasedX509UserCache.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/EhCacheBasedX509UserCache.java
@@ -77,7 +77,7 @@ public class EhCacheBasedX509UserCache implements X509UserCache, InitializingBea
        if (element == null) {
            return null;
        } else {
-            return (UserDetails) element.getValue();
+            return (UserDetails) element.getObjectValue();
        }
    }

--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityFaultException.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityFaultException.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2005-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.ws.soap.security.xwss;

 import javax.xml.namespace.QName;
@@ -10,6 +26,7 @@ import org.springframework.ws.soap.security.WsSecurityFaultException;
 * @author Arjen Poutsma
 * @since 1.0.1
 */
+@SuppressWarnings("serial")
 public class XwsSecurityFaultException extends WsSecurityFaultException {

    public XwsSecurityFaultException(QName faultCode, String faultString, String faultActor) {
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecuritySecurementException.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecuritySecurementException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 the original author or authors.
+ * Copyright 2005-2014 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@ import org.springframework.ws.soap.security.WsSecuritySecurementException;
 * @author Arjen Poutsma
 * @since 1.0.0
 */
+@SuppressWarnings("serial")
 public class XwsSecuritySecurementException extends WsSecuritySecurementException {

    public XwsSecuritySecurementException(String msg) {
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityValidationException.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityValidationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 the original author or authors.
+ * Copyright 2005-2014 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@ import org.springframework.ws.soap.security.WsSecurityValidationException;
 * @author Arjen Poutsma
 * @since 1.0.0
 */
+@SuppressWarnings("serial")
 public class XwsSecurityValidationException extends WsSecurityValidationException {

    public XwsSecurityValidationException(String msg) {
--- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorEncryptionTestCase.java
+++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorEncryptionTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2005-2014 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,16 +18,15 @@ package org.springframework.ws.soap.security.wss4j;

 import java.util.Properties;

+import org.junit.Test;
+import org.w3c.dom.Document;
+
 import org.springframework.ws.context.DefaultMessageContext;
 import org.springframework.ws.context.MessageContext;
 import org.springframework.ws.soap.SoapMessage;
 import org.springframework.ws.soap.security.wss4j.callback.KeyStoreCallbackHandler;
 import org.springframework.ws.soap.security.wss4j.support.CryptoFactoryBean;

-import org.apache.ws.security.components.crypto.Crypto;
-import org.junit.Test;
-import org.w3c.dom.Document;
-
 public abstract class Wss4jMessageInterceptorEncryptionTestCase extends Wss4jTestCase {

    protected Wss4jSecurityInterceptor interceptor;
@@ -54,9 +53,9 @@ public abstract class Wss4jMessageInterceptorEncryptionTestCase extends Wss4jTes
        cryptoFactoryBeanConfig.setProperty("org.apache.ws.security.crypto.merlin.file", "private.jks");
        cryptoFactoryBean.setConfiguration(cryptoFactoryBeanConfig);
        cryptoFactoryBean.afterPropertiesSet();
-        interceptor.setValidationDecryptionCrypto((Crypto) cryptoFactoryBean
+        interceptor.setValidationDecryptionCrypto(cryptoFactoryBean
                .getObject());
-        interceptor.setSecurementEncryptionCrypto((Crypto) cryptoFactoryBean
+        interceptor.setSecurementEncryptionCrypto(cryptoFactoryBean
                .getObject());

        interceptor.afterPropertiesSet();
--- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorX509TestCase.java
+++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorX509TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2010 the original author or authors.
+ * Copyright 2005-2014 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,16 +16,15 @@

 package org.springframework.ws.soap.security.wss4j;

+import org.apache.ws.security.components.crypto.Merlin;
+import org.junit.Test;
+import org.w3c.dom.Document;
+
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.ws.context.MessageContext;
 import org.springframework.ws.soap.SoapMessage;
 import org.springframework.ws.soap.security.wss4j.support.CryptoFactoryBean;

-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.Merlin;
-import org.junit.Test;
-import org.w3c.dom.Document;
-
 public abstract class Wss4jMessageInterceptorX509TestCase extends Wss4jTestCase {

    protected Wss4jSecurityInterceptor interceptor;
@@ -42,9 +41,9 @@ public abstract class Wss4jMessageInterceptorX509TestCase extends Wss4jTestCase
        cryptoFactoryBean.setKeyStoreLocation(new ClassPathResource("private.jks"));

        cryptoFactoryBean.afterPropertiesSet();
-        interceptor.setSecurementSignatureCrypto((Crypto) cryptoFactoryBean
+        interceptor.setSecurementSignatureCrypto(cryptoFactoryBean
                .getObject());
-        interceptor.setValidationSignatureCrypto((Crypto) cryptoFactoryBean
+        interceptor.setValidationSignatureCrypto(cryptoFactoryBean
                .getObject());
        interceptor.afterPropertiesSet();

--- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/PlainTextLoginModule.java
+++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/PlainTextLoginModule.java
@@ -16,6 +16,7 @@

 package org.springframework.ws.soap.security.xwss.callback.jaas;

+import java.security.Principal;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -35,7 +36,7 @@ public class PlainTextLoginModule implements LoginModule {

    private boolean success;

-    private List principals = new ArrayList();
+    private List<Principal> principals = new ArrayList<Principal>();

    @Override
    public boolean abort() {