You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2013/08/02 12:37:46 UTC
svn commit: r1509610 - in /webservices/wss4j/trunk:
ws-security-common/src/main/java/org/apache/wss4j/common/cache/
ws-security-common/src/main/java/org/apache/wss4j/common/crypto/
ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/ ws...
Author: coheigea
Date: Fri Aug 2 10:37:45 2013
New Revision: 1509610
URL: http://svn.apache.org/r1509610
Log:
Some PMD fixes
Modified:
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/cache/MemoryReplayCache.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/DERDecoder.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/X509NameTokenizer.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/AlgoFactory.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/DerivedKeyUtils.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/P_SHA1.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ext/WSSecurityException.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/principal/WSUsernameTokenPrincipalImpl.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/DateUtil.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/NSStack.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/RFC2253Parser.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/WSTimeSource.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/XMLUtils.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSDocInfo.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecBase.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDerivedKeyBase.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/BinarySecurity.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SecurityContextToken.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SecurityTokenReference.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Timestamp.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/UsernameToken.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransform.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/XmlSchemaDateFormat.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SignatureTrustValidator.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/TimestampValidator.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/UsernameTokenValidator.java
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/cache/MemoryReplayCache.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/cache/MemoryReplayCache.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/cache/MemoryReplayCache.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/cache/MemoryReplayCache.java Fri Aug 2 10:37:45 2013
@@ -66,7 +66,7 @@ public class MemoryReplayCache implement
Date expires = new Date();
long currentTime = expires.getTime();
- expires.setTime(currentTime + (ttl * 1000L));
+ expires.setTime(currentTime + ttl * 1000L);
synchronized (cache) {
List<String> list = cache.get(expires);
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java Fri Aug 2 10:37:45 2013
@@ -245,7 +245,7 @@ public class CertificateStore extends Cr
WSSecurityException.ErrorCode.FAILURE, "certpath",
e.getMessage(), e
);
- } catch (java.security.NoSuchAlgorithmException e) {
+ } catch (NoSuchAlgorithmException e) {
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILURE, "certpath",
e.getMessage(), e
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/DERDecoder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/DERDecoder.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/DERDecoder.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/DERDecoder.java Fri Aug 2 10:37:45 2013
@@ -140,7 +140,7 @@ public class DERDecoder {
"Invalid DER format"
);
}
- return (arr[pos] == val);
+ return arr[pos] == val;
}
/**
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java Fri Aug 2 10:37:45 2013
@@ -393,7 +393,7 @@ public class Merlin extends CryptoBase {
ks = KeyStore.getInstance(type, provider);
}
- ks.load(input, (storepass == null || storepass.length() == 0)
+ ks.load(input, storepass == null || storepass.length() == 0
? new char[0] : storepass.toCharArray());
} catch (IOException e) {
if (DO_DEBUG) {
@@ -904,18 +904,18 @@ public class Merlin extends CryptoBase {
validator = CertPathValidator.getInstance("PKIX", provider);
}
validator.validate(path, param);
- } catch (java.security.NoSuchProviderException e) {
+ } catch (NoSuchProviderException e) {
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILURE, "certpath",
e
);
- } catch (java.security.NoSuchAlgorithmException e) {
+ } catch (NoSuchAlgorithmException e) {
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILURE,
"certpath", new Object[] { e.getMessage() },
e
);
- } catch (java.security.cert.CertificateException e) {
+ } catch (CertificateException e) {
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILURE, "certpath",
e
@@ -930,7 +930,7 @@ public class Merlin extends CryptoBase {
WSSecurityException.ErrorCode.FAILED_AUTHENTICATION, "certpath",
e
);
- } catch (java.security.KeyStoreException e) {
+ } catch (KeyStoreException e) {
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILURE, "certpath",
e
@@ -1005,7 +1005,7 @@ public class Merlin extends CryptoBase {
certs = getCertificates(issuerName, serialNumber, truststore);
}
- if ((certs == null || certs.length == 0)) {
+ if (certs == null || certs.length == 0) {
return null;
}
@@ -1089,7 +1089,7 @@ public class Merlin extends CryptoBase {
certs = getCertificates(thumbprint, truststore, sha);
}
- if ((certs == null || certs.length == 0)) {
+ if (certs == null || certs.length == 0) {
return null;
}
@@ -1169,7 +1169,7 @@ public class Merlin extends CryptoBase {
certs = getCertificates(skiBytes, truststore);
}
- if ((certs == null || certs.length == 0)) {
+ if (certs == null || certs.length == 0) {
return null;
}
@@ -1256,7 +1256,7 @@ public class Merlin extends CryptoBase {
certs = getCertificates(subject, truststore);
}
- if ((certs == null || certs.length == 0)) {
+ if (certs == null || certs.length == 0) {
return null;
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/X509NameTokenizer.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/X509NameTokenizer.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/X509NameTokenizer.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/X509NameTokenizer.java Fri Aug 2 10:37:45 2013
@@ -41,7 +41,7 @@ public class X509NameTokenizer {
int k;
for (int j = 0; (k = normalizedDN.indexOf(',', j)) >= 0; j = k + 1) {
l += countQuotes(normalizedDN, j, k);
- if ((k > 0) && (normalizedDN.charAt(k - 1) != '\\') && (l % 2) == 0) {
+ if (k > 0 && normalizedDN.charAt(k - 1) != '\\' && (l % 2) == 0) {
tokens.add(normalizedDN.substring(i, k).trim());
i = k + 1;
l = 0;
@@ -53,7 +53,7 @@ public class X509NameTokenizer {
}
public boolean hasMoreTokens() {
- return (index < tokens.size());
+ return index < tokens.size();
}
public String nextToken() {
@@ -92,10 +92,10 @@ public class X509NameTokenizer {
private static String trim(String str) {
String trimed = str.trim();
int i = str.indexOf(trimed) + trimed.length();
- if ((str.length() > i)
+ if (str.length() > i
&& trimed.endsWith("\\")
&& !trimed.endsWith("\\\\")
- && (str.charAt(i) == ' ')) {
+ && str.charAt(i) == ' ') {
trimed = trimed + " ";
}
return trimed;
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/AlgoFactory.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/AlgoFactory.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/AlgoFactory.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/AlgoFactory.java Fri Aug 2 10:37:45 2013
@@ -35,8 +35,8 @@ public final class AlgoFactory {
*/
public static DerivationAlgorithm getInstance(String algorithm) throws
ConversationException {
- if ((ConversationConstants.DerivationAlgorithm.P_SHA_1_2005_12).equals(algorithm)
- || (ConversationConstants.DerivationAlgorithm.P_SHA_1).equals(algorithm)) {
+ if (ConversationConstants.DerivationAlgorithm.P_SHA_1_2005_12.equals(algorithm)
+ || ConversationConstants.DerivationAlgorithm.P_SHA_1.equals(algorithm)) {
return new P_SHA1();
} else {
throw new ConversationException("No such algorithm");
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/DerivedKeyUtils.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/DerivedKeyUtils.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/DerivedKeyUtils.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/DerivedKeyUtils.java Fri Aug 2 10:37:45 2013
@@ -35,8 +35,8 @@ public class DerivedKeyUtils {
DerivationAlgorithm algo = AlgoFactory.getInstance(algorithm);
byte[] labelBytes;
if (label == null || label.length() == 0) {
- labelBytes = (ConversationConstants.DEFAULT_LABEL
- + ConversationConstants.DEFAULT_LABEL).getBytes("UTF-8");
+ String defaultLabel = ConversationConstants.DEFAULT_LABEL + ConversationConstants.DEFAULT_LABEL;
+ labelBytes = defaultLabel.getBytes("UTF-8");
} else {
labelBytes = label.getBytes("UTF-8");
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/P_SHA1.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/P_SHA1.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/P_SHA1.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/P_SHA1.java Fri Aug 2 10:37:45 2013
@@ -53,7 +53,7 @@ public class P_SHA1 implements Derivatio
try {
Mac mac = Mac.getInstance("HmacSHA1");
- byte[] tempBytes = P_hash(secret, seed, mac, (offset + (int) length));
+ byte[] tempBytes = P_hash(secret, seed, mac, offset + (int) length);
byte[] key = new byte[(int) length];
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ext/WSSecurityException.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ext/WSSecurityException.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ext/WSSecurityException.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ext/WSSecurityException.java Fri Aug 2 10:37:45 2013
@@ -176,7 +176,7 @@ public class WSSecurityException extends
*
* @return the fault code QName of this exception
*/
- public javax.xml.namespace.QName getFaultCode() {
+ public QName getFaultCode() {
return this.errorCode.getQName();
}
}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/principal/WSUsernameTokenPrincipalImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/principal/WSUsernameTokenPrincipalImpl.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/principal/WSUsernameTokenPrincipalImpl.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/principal/WSUsernameTokenPrincipalImpl.java Fri Aug 2 10:37:45 2013
@@ -145,7 +145,7 @@ public class WSUsernameTokenPrincipalImp
* @return a string representation of this <code>WSUsernameTokenPrincipalImpl</code>.
*/
public String toString() {
- return ("WSUsernameTokenPrincipalImpl: " + name);
+ return "WSUsernameTokenPrincipalImpl: " + name;
}
/**
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java Fri Aug 2 10:37:45 2013
@@ -43,6 +43,7 @@ import org.opensaml.saml1.core.Attribute
import org.opensaml.saml1.core.AuthenticationStatement;
import org.opensaml.saml1.core.AuthorizationDecisionStatement;
import org.opensaml.saml1.core.ConfirmationMethod;
+import org.opensaml.saml1.core.Statement;
import org.opensaml.saml1.core.Subject;
import org.opensaml.saml1.core.SubjectConfirmation;
import org.opensaml.saml1.core.SubjectStatement;
@@ -330,19 +331,17 @@ public class SamlAssertionWrapper {
return subject.getNameID().getValue();
}
} else if (saml1 != null) {
- org.opensaml.saml1.core.Subject samlSubject = null;
- for (org.opensaml.saml1.core.Statement stmt : saml1.getStatements()) {
- if (stmt instanceof org.opensaml.saml1.core.AttributeStatement) {
- org.opensaml.saml1.core.AttributeStatement attrStmt =
- (org.opensaml.saml1.core.AttributeStatement) stmt;
+ Subject samlSubject = null;
+ for (Statement stmt : saml1.getStatements()) {
+ if (stmt instanceof AttributeStatement) {
+ AttributeStatement attrStmt = (AttributeStatement) stmt;
samlSubject = attrStmt.getSubject();
- } else if (stmt instanceof org.opensaml.saml1.core.AuthenticationStatement) {
- org.opensaml.saml1.core.AuthenticationStatement authStmt =
- (org.opensaml.saml1.core.AuthenticationStatement) stmt;
+ } else if (stmt instanceof AuthenticationStatement) {
+ AuthenticationStatement authStmt = (AuthenticationStatement) stmt;
samlSubject = authStmt.getSubject();
} else {
- org.opensaml.saml1.core.AuthorizationDecisionStatement authzStmt =
- (org.opensaml.saml1.core.AuthorizationDecisionStatement)stmt;
+ AuthorizationDecisionStatement authzStmt =
+ (AuthorizationDecisionStatement)stmt;
samlSubject = authzStmt.getSubject();
}
if (samlSubject != null) {
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/DateUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/DateUtil.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/DateUtil.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/DateUtil.java Fri Aug 2 10:37:45 2013
@@ -45,7 +45,7 @@ public final class DateUtil {
Date validCreation = new Date();
long currentTime = validCreation.getTime();
if (futureTimeToLive > 0) {
- validCreation.setTime(currentTime + ((long)futureTimeToLive * 1000L));
+ validCreation.setTime(currentTime + (long)futureTimeToLive * 1000L);
}
// Check to see if the created time is in the future
if (createdDate.after(validCreation)) {
@@ -56,7 +56,7 @@ public final class DateUtil {
}
// Calculate the time that is allowed for the message to travel
- currentTime -= ((long)timeToLive * 1000L);
+ currentTime -= (long)timeToLive * 1000L;
validCreation.setTime(currentTime);
// Validate the time it took the message to travel
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/NSStack.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/NSStack.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/NSStack.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/NSStack.java Fri Aug 2 10:37:45 2013
@@ -198,7 +198,7 @@ public class NSStack {
* find one because "pre" is actually mapped to "otherNamespace"
*/
public String getPrefix(String namespaceURI, boolean noDefault) {
- if ((namespaceURI == null) || (namespaceURI.equals(""))) {
+ if (namespaceURI == null || namespaceURI.equals("")) {
return null;
}
int hash = namespaceURI.hashCode();
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/RFC2253Parser.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/RFC2253Parser.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/RFC2253Parser.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/RFC2253Parser.java Fri Aug 2 10:37:45 2013
@@ -68,7 +68,7 @@ public class RFC2253Parser {
*/
public static String normalize(String dn, boolean toXml) {
//if empty string
- if ((dn == null) || dn.equals("")) {
+ if (dn == null || dn.equals("")) {
return "";
}
@@ -83,7 +83,7 @@ public class RFC2253Parser {
for (int j = 0; (k = DN.indexOf(',', j)) >= 0; j = k + 1) {
l += countQuotes(DN, j, k);
- if ((k > 0) && (DN.charAt(k - 1) != '\\') && (l % 2) == 0) {
+ if (k > 0 && DN.charAt(k - 1) != '\\' && (l % 2) == 0) {
sb.append(parseRDN(DN.substring(i, k).trim(), toXml)).append(",");
i = k + 1;
@@ -116,7 +116,7 @@ public class RFC2253Parser {
for (int j = 0; (k = str.indexOf('+', j)) >= 0; j = k + 1) {
l += countQuotes(str, j, k);
- if ((k > 0) && (str.charAt(k - 1) != '\\') && (l % 2) == 0) {
+ if (k > 0 && str.charAt(k - 1) != '\\' && (l % 2) == 0) {
sb.append(parseATAV(trim(str.substring(i, k)), toXml)).append("+");
i = k + 1;
@@ -140,7 +140,7 @@ public class RFC2253Parser {
static String parseATAV(String str, boolean toXml) throws IOException {
int i = str.indexOf('=');
- if ((i == -1) || ((i > 0) && (str.charAt(i - 1) == '\\'))) {
+ if (i == -1 || i > 0 && str.charAt(i - 1) == '\\') {
return str;
}
String attrType = normalizeAT(str.substring(0, i));
@@ -194,8 +194,8 @@ public class RFC2253Parser {
c = (char) i;
//the following char is defined at 4.Relationship with RFC1779 and LDAPv2 inrfc2253
- if ((c == ',') || (c == '=') || (c == '+') || (c == '<')
- || (c == '>') || (c == '#') || (c == ';')) {
+ if (c == ',' || c == '=' || c == '+' || c == '<'
+ || c == '>' || c == '#' || c == ';') {
sb.append('\\');
}
@@ -273,10 +273,10 @@ public class RFC2253Parser {
char c2 = (char) sr.read();
//65 (A) 97 (a)
- if ((((c1 >= 48) && (c1 <= 57)) || ((c1 >= 65) && (c1 <= 70)) || ((c1 >= 97) && (c1 <= 102)))
- && (((c2 >= 48) && (c2 <= 57))
- || ((c2 >= 65) && (c2 <= 70))
- || ((c2 >= 97) && (c2 <= 102)))) {
+ if ((c1 >= 48 && c1 <= 57 || c1 >= 65 && c1 <= 70 || c1 >= 97 && c1 <= 102)
+ && (c2 >= 48 && c2 <= 57
+ || c2 >= 65 && c2 <= 70
+ || c2 >= 97 && c2 <= 102)) {
char ch = (char) Byte.parseByte("" + c1 + c2, 16);
sb.append(ch);
@@ -413,7 +413,7 @@ public class RFC2253Parser {
for (int j = 0; (k = str.indexOf(symbol, j)) >= 0; j = k + 1) {
l += countQuotes(str, j, k);
- if ((k > 0) && (str.charAt(k - 1) != '\\') && (l % 2) == 0) {
+ if (k > 0 && str.charAt(k - 1) != '\\' && (l % 2) == 0) {
sb.append(trim(str.substring(i, k))).append(replace);
i = k + 1;
@@ -459,8 +459,8 @@ public class RFC2253Parser {
String trimed = str.trim();
int i = str.indexOf(trimed) + trimed.length();
- if ((str.length() > i) && trimed.endsWith("\\")
- && !trimed.endsWith("\\\\") && (str.charAt(i) == ' ')) {
+ if (str.length() > i && trimed.endsWith("\\")
+ && !trimed.endsWith("\\\\") && str.charAt(i) == ' ') {
trimed = trimed + " ";
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/WSTimeSource.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/WSTimeSource.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/WSTimeSource.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/WSTimeSource.java Fri Aug 2 10:37:45 2013
@@ -32,6 +32,6 @@ public interface WSTimeSource {
* Get the current date time
* @return the current date/time as a date object
*/
- public Date now();
+ Date now();
}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/XMLUtils.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/XMLUtils.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/XMLUtils.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/XMLUtils.java Fri Aug 2 10:37:45 2013
@@ -68,7 +68,7 @@ public class XMLUtils {
}
public static String getNamespace(String prefix, Node e) {
- while (e != null && (e.getNodeType() == Node.ELEMENT_NODE)) {
+ while (e != null && e.getNodeType() == Node.ELEMENT_NODE) {
Attr attr = null;
if (prefix == null) {
attr = ((Element) e).getAttributeNode("xmlns");
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSDocInfo.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSDocInfo.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSDocInfo.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSDocInfo.java Fri Aug 2 10:37:45 2013
@@ -156,9 +156,9 @@ public class WSDocInfo {
String cId = elem.getAttributeNS(WSConstants.WSU_NS, "Id");
String samlId = elem.getAttributeNS(null, "AssertionID");
String samlId2 = elem.getAttributeNS(null, "ID");
- if ((elem.hasAttributeNS(WSConstants.WSU_NS, "Id") && id.equals(cId))
- || (elem.hasAttribute("AssertionID") && id.equals(samlId))
- || (elem.hasAttribute("ID") && id.equals(samlId2))) {
+ if (elem.hasAttributeNS(WSConstants.WSU_NS, "Id") && id.equals(cId)
+ || elem.hasAttribute("AssertionID") && id.equals(samlId)
+ || elem.hasAttribute("ID") && id.equals(samlId2)) {
return elem;
}
}
@@ -247,7 +247,7 @@ public class WSDocInfo {
if (result != null) {
Integer resultTag = (Integer)result.get(WSSecurityEngineResult.TAG_ACTION);
String cId = (String)result.get(WSSecurityEngineResult.TAG_ID);
- if ((tag.intValue() == resultTag.intValue()) && id.equals(cId)) {
+ if (tag.intValue() == resultTag.intValue() && id.equals(cId)) {
return result;
}
}
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java Fri Aug 2 10:37:45 2013
@@ -106,7 +106,7 @@ public class SignatureAction implements
wsSign.addReferencesToSign(reqData.getSignatureParts(), reqData.getSecHeader());
if (signBST ||
- (reqData.isAppendSignatureAfterTimestamp() && siblingElementToPrepend == null)) {
+ reqData.isAppendSignatureAfterTimestamp() && siblingElementToPrepend == null) {
wsSign.computeSignature(referenceList, false, null);
} else {
wsSign.computeSignature(referenceList, true, siblingElementToPrepend);
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java Fri Aug 2 10:37:45 2013
@@ -93,7 +93,7 @@ public abstract class WSHandler {
boolean enableSigConf = decodeEnableSignatureConfirmation(reqData);
wssConfig.setEnableSignatureConfirmation(
- enableSigConf || ((doAction & WSConstants.SC) != 0)
+ enableSigConf || (doAction & WSConstants.SC) != 0
);
wssConfig.setPasswordsAreEncoded(decodeUseEncodedPasswords(reqData));
@@ -188,7 +188,7 @@ public abstract class WSHandler {
// Timestamp must appear in the security header first for signature creation to work.
List<Integer> actionsToPerform = actions;
if (actions.contains(WSConstants.SIGN) && actions.contains(WSConstants.TS)
- && (actions.indexOf(WSConstants.SIGN) < actions.indexOf(WSConstants.TS))) {
+ && actions.indexOf(WSConstants.SIGN) < actions.indexOf(WSConstants.TS)) {
boolean signTimestamp = false;
for (WSEncryptionPart encP : reqData.getSignatureParts()) {
if (WSConstants.WSU_NS.equals(encP.getNamespace())
@@ -275,7 +275,7 @@ public abstract class WSHandler {
}
boolean enableSigConf = decodeEnableSignatureConfirmation(reqData);
wssConfig.setEnableSignatureConfirmation(
- enableSigConf || ((doAction & WSConstants.SC) != 0)
+ enableSigConf || (doAction & WSConstants.SC) != 0
);
wssConfig.setTimeStampStrict(decodeTimestampStrict(reqData));
String passwordType = decodePasswordType(reqData);
@@ -304,9 +304,9 @@ public abstract class WSHandler {
}
reqData.setWssConfig(wssConfig);
- if (((doAction & WSConstants.SIGN) == WSConstants.SIGN)
- || ((doAction & WSConstants.ST_SIGNED) == WSConstants.ST_SIGNED)
- || ((doAction & WSConstants.ST_UNSIGNED) == WSConstants.ST_UNSIGNED)) {
+ if ((doAction & WSConstants.SIGN) == WSConstants.SIGN
+ || (doAction & WSConstants.ST_SIGNED) == WSConstants.ST_SIGNED
+ || (doAction & WSConstants.ST_UNSIGNED) == WSConstants.ST_UNSIGNED) {
decodeSignatureParameter2(reqData);
}
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecBase.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecBase.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecBase.java Fri Aug 2 10:37:45 2013
@@ -158,7 +158,7 @@ public class WSSecBase {
newAttrNs = WSConstants.ENC_NS;
}
- if ((id == null) || (id.length() == 0)) {
+ if (id == null || id.length() == 0) {
id = wssConfig.getIdAllocator().createId("id-", bodyElement);
String prefix =
WSSecurityUtil.setNamespace(bodyElement, newAttrNs, newAttrPrefix);
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java Fri Aug 2 10:37:45 2013
@@ -185,7 +185,7 @@ public class WSSecDKEncrypt extends WSSe
* @see org.apache.wss4j.dom.message.WSSecDerivedKeyBase#getDerivedKeyLength()
*/
protected int getDerivedKeyLength() throws WSSecurityException{
- return (derivedKeyLength > 0) ? derivedKeyLength :
+ return derivedKeyLength > 0 ? derivedKeyLength :
WSSecurityUtil.getKeyLength(symEncAlgo);
}
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java Fri Aug 2 10:37:45 2013
@@ -312,7 +312,7 @@ public class WSSecDKSign extends WSSecDe
* @see org.apache.wss4j.dom.message.WSSecDerivedKeyBase#getDerivedKeyLength()
*/
protected int getDerivedKeyLength() throws WSSecurityException {
- return (derivedKeyLength > 0) ? derivedKeyLength :
+ return derivedKeyLength > 0 ? derivedKeyLength :
WSSecurityUtil.getKeyLength(sigAlgo);
}
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDerivedKeyBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDerivedKeyBase.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDerivedKeyBase.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDerivedKeyBase.java Fri Aug 2 10:37:45 2013
@@ -194,7 +194,8 @@ public abstract class WSSecDerivedKeyBas
int length = getDerivedKeyLength();
byte[] label;
try {
- label = (clientLabel + serviceLabel).getBytes("UTF-8");
+ String labelText = clientLabel + serviceLabel;
+ label = labelText.getBytes("UTF-8");
} catch (UnsupportedEncodingException e) {
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "empty", e, "UTF-8 encoding is not supported");
}
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java Fri Aug 2 10:37:45 2013
@@ -399,7 +399,7 @@ public class WSSecEncrypt extends WSSecE
encDataRef.add("#" + id);
}
- if (part != (references.size() - 1)) {
+ if (part != references.size() - 1) {
try {
keyInfo = new KeyInfo((Element) keyInfo.getElement().cloneNode(true), null);
} catch (Exception ex) {
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/BinarySecurity.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/BinarySecurity.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/BinarySecurity.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/BinarySecurity.java Fri Aug 2 10:37:45 2013
@@ -217,7 +217,7 @@ public class BinarySecurity {
*/
protected Text getFirstNode() {
Node node = element.getFirstChild();
- return (node != null && Node.TEXT_NODE == node.getNodeType()) ? (Text) node : null;
+ return node != null && Node.TEXT_NODE == node.getNodeType() ? (Text) node : null;
}
/**
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java Fri Aug 2 10:37:45 2013
@@ -420,7 +420,7 @@ public class DerivedKeyToken {
*/
private Text getFirstNode(Element e) {
Node node = e.getFirstChild();
- return (node != null && Node.TEXT_NODE == node.getNodeType()) ? (Text) node : null;
+ return node != null && Node.TEXT_NODE == node.getNodeType() ? (Text) node : null;
}
/**
@@ -525,9 +525,9 @@ public class DerivedKeyToken {
byte[] labelBytes = null;
String label = getLabel();
if (label == null || label.length() == 0) {
- labelBytes =
- (ConversationConstants.DEFAULT_LABEL
- + ConversationConstants.DEFAULT_LABEL).getBytes("UTF-8");
+ String defaultLabel = ConversationConstants.DEFAULT_LABEL
+ + ConversationConstants.DEFAULT_LABEL;
+ labelBytes = defaultLabel.getBytes("UTF-8");
} else {
labelBytes = label.getBytes("UTF-8");
}
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SecurityContextToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SecurityContextToken.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SecurityContextToken.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SecurityContextToken.java Fri Aug 2 10:37:45 2013
@@ -197,7 +197,7 @@ public class SecurityContextToken {
*/
private Text getFirstNode(Element e) {
Node node = e.getFirstChild();
- return (node != null && Node.TEXT_NODE == node.getNodeType()) ? (Text) node : null;
+ return node != null && Node.TEXT_NODE == node.getNodeType() ? (Text) node : null;
}
/**
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SecurityTokenReference.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SecurityTokenReference.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SecurityTokenReference.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SecurityTokenReference.java Fri Aug 2 10:37:45 2013
@@ -401,7 +401,7 @@ public class SecurityTokenReference {
}
try {
byte[] encodedBytes = WSSecurityUtil.generateDigest(encodedCert);
- org.w3c.dom.Text text = doc.createTextNode(Base64.encode(encodedBytes));
+ Text text = doc.createTextNode(Base64.encode(encodedBytes));
createKeyIdentifier(doc, THUMB_URI, text, true);
} catch (WSSecurityException e1) {
throw new WSSecurityException(
@@ -412,7 +412,7 @@ public class SecurityTokenReference {
public void setKeyIdentifierEncKeySHA1(String value) throws WSSecurityException {
Document doc = element.getOwnerDocument();
- org.w3c.dom.Text text = doc.createTextNode(value);
+ Text text = doc.createTextNode(value);
createKeyIdentifier(doc, ENC_KEY_SHA1_URI, text, true);
}
@@ -730,9 +730,9 @@ public class SecurityTokenReference {
if (Node.ELEMENT_NODE == node.getNodeType()) {
String ns = node.getNamespaceURI();
String name = node.getLocalName();
- if ((((namespace != null) && namespace.equals(ns))
- || ((namespace == null) && (ns == null)))
- && (localname.equals(name))
+ if ((namespace != null && namespace.equals(ns)
+ || namespace == null && ns == null)
+ && localname.equals(name)
) {
result++;
}
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Timestamp.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Timestamp.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Timestamp.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Timestamp.java Fri Aug 2 10:37:45 2013
@@ -207,7 +207,7 @@ public class Timestamp {
element.appendChild(elementCreated);
if (ttl != 0) {
expiresDate = timeSource.now();
- expiresDate.setTime(createdDate.getTime() + ((long)ttl * 1000L));
+ expiresDate.setTime(createdDate.getTime() + (long)ttl * 1000L);
Element elementExpires =
doc.createElementNS(
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/UsernameToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/UsernameToken.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/UsernameToken.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/UsernameToken.java Fri Aug 2 10:37:45 2013
@@ -642,7 +642,7 @@ public class UsernameToken {
*/
private Text getFirstNode(Element e) {
Node node = e.getFirstChild();
- return (node != null && Node.TEXT_NODE == node.getNodeType()) ? (Text) node : null;
+ return node != null && Node.TEXT_NODE == node.getNodeType() ? (Text) node : null;
}
/**
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java Fri Aug 2 10:37:45 2013
@@ -178,7 +178,7 @@ public class SignatureProcessor implemen
if (trusted && LOG.isDebugEnabled()) {
LOG.debug("Direct Trust for SAML/BST credential");
}
- if (!trusted && (publicKey != null || certs != null) && (validator != null)) {
+ if (!trusted && (publicKey != null || certs != null) && validator != null) {
Credential credential = new Credential();
credential.setPublicKey(publicKey);
credential.setCertificates(certs);
@@ -294,7 +294,7 @@ public class SignatureProcessor implemen
// Look for a KeyValue object
//
keyValue = getKeyValue(keyInfoElement);
- } catch (javax.xml.crypto.MarshalException ex) {
+ } catch (MarshalException ex) {
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_CHECK, ex);
}
@@ -682,7 +682,7 @@ public class SignatureProcessor implemen
Date rightNow = new Date();
long currentTime = rightNow.getTime();
long expiresTime = expires.getTime();
- replayCache.add(identifier, ((expiresTime - currentTime) / 1000L));
+ replayCache.add(identifier, (expiresTime - currentTime) / 1000L);
} else {
replayCache.add(identifier);
}
@@ -748,10 +748,10 @@ public class SignatureProcessor implemen
bspEnforcer.handleBSPRule(BSPRule.R5423);
}
if (i == (reference.getTransforms().size() - 1)
- && (!(WSConstants.C14N_EXCL_OMIT_COMMENTS.equals(algorithm)
+ && !(WSConstants.C14N_EXCL_OMIT_COMMENTS.equals(algorithm)
|| STRTransform.TRANSFORM_URI.equals(algorithm)
|| WSConstants.SWA_ATTACHMENT_COMPLETE_SIG_TRANS.equals(algorithm)
- || WSConstants.SWA_ATTACHMENT_CONTENT_SIG_TRANS.equals(algorithm)))) {
+ || WSConstants.SWA_ATTACHMENT_CONTENT_SIG_TRANS.equals(algorithm))) {
bspEnforcer.handleBSPRule(BSPRule.R5412);
}
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java Fri Aug 2 10:37:45 2013
@@ -512,7 +512,7 @@ public class WSSecSignatureSAML extends
getWsConfig().getIdAllocator().createId("SIG-", null),
null);
- org.w3c.dom.Element securityHeaderElement = secHeader.getSecurityHeader();
+ Element securityHeaderElement = secHeader.getSecurityHeader();
//
// Prepend the signature element to the security header (after the assertion)
//
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java Fri Aug 2 10:37:45 2013
@@ -127,11 +127,11 @@ public final class STRParserUtil {
if (secRef.containsReference()) {
// Check the ValueType attributes
String valueType = secRef.getReference().getValueType();
- if (((token instanceof X509Security) && !X509Security.X509_V3_TYPE.equals(valueType))
- || ((token instanceof PKIPathSecurity) && !PKIPathSecurity.PKI_TYPE.equals(valueType))
- || ((token instanceof KerberosSecurity)
+ if (token instanceof X509Security && !X509Security.X509_V3_TYPE.equals(valueType)
+ || token instanceof PKIPathSecurity && !PKIPathSecurity.PKI_TYPE.equals(valueType)
+ || token instanceof KerberosSecurity
&& !(valueType == null || "".equals(valueType))
- && !WSConstants.WSS_GSS_KRB_V5_AP_REQ.equals(valueType))) {
+ && !WSConstants.WSS_GSS_KRB_V5_AP_REQ.equals(valueType)) {
bspEnforcer.handleBSPRule(BSPRule.R3058);
}
} else if (secRef.containsKeyIdentifier()) {
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransform.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransform.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransform.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransform.java Fri Aug 2 10:37:45 2013
@@ -200,8 +200,8 @@ public class STRTransform extends Transf
if (dereferencedToken != null) {
String type = dereferencedToken.getAttributeNS(null, "ValueType");
- if ((X509Security.X509_V3_TYPE.equals(type)
- || PKIPathSecurity.getType().equals(type))) {
+ if (X509Security.X509_V3_TYPE.equals(type)
+ || PKIPathSecurity.getType().equals(type)) {
//
// Add the WSSE/WSU namespaces to the element for C14n
//
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java Fri Aug 2 10:37:45 2013
@@ -143,12 +143,12 @@ public final class WSSecurityUtil {
* @return true is the actor arguments are equal
*/
public static boolean isActorEqual(String actor, String hActor) {
- if (((hActor == null) || (hActor.length() == 0))
- && ((actor == null) || (actor.length() == 0))) {
+ if ((hActor == null || hActor.length() == 0)
+ && (actor == null || actor.length() == 0)) {
return true;
}
- if ((hActor != null) && (actor != null) && hActor.equalsIgnoreCase(actor)) {
+ if (hActor != null && actor != null && hActor.equalsIgnoreCase(actor)) {
return true;
}
@@ -403,9 +403,9 @@ public final class WSSecurityUtil {
// start node processing at this point
if (startNode.getNodeType() == Node.ELEMENT_NODE) {
Element se = (Element) startNode;
- if ((se.hasAttribute("ID") && value.equals(se.getAttributeNS(null, "ID")))
- || (se.hasAttribute("AssertionID")
- && value.equals(se.getAttributeNS(null, "AssertionID")))) {
+ if (se.hasAttribute("ID") && value.equals(se.getAttributeNS(null, "ID"))
+ || se.hasAttribute("AssertionID")
+ && value.equals(se.getAttributeNS(null, "AssertionID"))) {
if (foundElement == null) {
foundElement = se; // Continue searching to find duplicates
} else {
@@ -533,7 +533,7 @@ public final class WSSecurityUtil {
* The following methods were copied over from axis.utils.XMLUtils and adapted
*/
public static String getPrefixNS(String uri, Node e) {
- while (e != null && (e.getNodeType() == Element.ELEMENT_NODE)) {
+ while (e != null && e.getNodeType() == Element.ELEMENT_NODE) {
NamedNodeMap attrs = e.getAttributes();
for (int n = 0; n < attrs.getLength(); n++) {
Attr a = (Attr) attrs.item(n);
@@ -548,7 +548,7 @@ public final class WSSecurityUtil {
}
public static String getNamespace(String prefix, Node e) {
- while (e != null && (e.getNodeType() == Node.ELEMENT_NODE)) {
+ while (e != null && e.getNodeType() == Node.ELEMENT_NODE) {
Attr attr = null;
if (prefix == null) {
attr = ((Element) e).getAttributeNodeNS(null, "xmlns");
@@ -819,7 +819,7 @@ public final class WSSecurityUtil {
if (size > 0) {
keySpec =
new SecretKeySpec(
- rawKey, 0, ((rawKey.length > size) ? size : rawKey.length), keyAlgorithm
+ rawKey, 0, rawKey.length > size ? size : rawKey.length, keyAlgorithm
);
} else {
keySpec = new SecretKeySpec(rawKey, keyAlgorithm);
@@ -1254,12 +1254,12 @@ public final class WSSecurityUtil {
final String aln = anode.getLocalName();
final boolean nsmatch =
ans == null
- ? ((bns == null) ? true : false)
- : ((bns == null) ? false : ans.equals(bns));
+ ? bns == null ? true : false
+ : bns == null ? false : ans.equals(bns);
final boolean lnmatch =
aln == null
- ? ((bln == null) ? true : false)
- : ((bln == null) ? false : aln.equals(bln));
+ ? bln == null ? true : false
+ : bln == null ? false : aln.equals(bln);
if (nsmatch && lnmatch) {
found = true;
}
@@ -1323,7 +1323,7 @@ public final class WSSecurityUtil {
return true;
}
attributeNS = elem.getAttributeNS(null, "Id");
- return (!"".equals(attributeNS) && allIDs.contains(attributeNS));
+ return !"".equals(attributeNS) && allIDs.contains(attributeNS);
}
private static Set<String> getSignatureReferenceIDs(Element wsseHeader) throws WSSecurityException {
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/XmlSchemaDateFormat.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/XmlSchemaDateFormat.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/XmlSchemaDateFormat.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/XmlSchemaDateFormat.java Fri Aug 2 10:37:45 2013
@@ -73,7 +73,7 @@ public class XmlSchemaDateFormat extends
int index = 0;
try {
if (src != null) {
- if ((src.charAt(0) == '+') || (src.charAt(0) == '-')) {
+ if (src.charAt(0) == '+' || src.charAt(0) == '-') {
src = src.substring(1);
}
@@ -90,19 +90,19 @@ public class XmlSchemaDateFormat extends
// convert what we have validated so far
synchronized (DATEFORMAT_XSD_ZULU) {
- date = DATEFORMAT_XSD_ZULU.parse((src == null) ? null
- : (src.substring(0, 19) + ".000Z"));
+ date = DATEFORMAT_XSD_ZULU.parse(src == null ? null
+ : src.substring(0, 19) + ".000Z");
}
index = 19;
// parse optional milliseconds
if (src != null) {
- if ((index < src.length()) && (src.charAt(index) == '.')) {
+ if (index < src.length() && src.charAt(index) == '.') {
int milliseconds = 0;
int start = ++index;
- while ((index < src.length())
+ while (index < src.length()
&& Character.isDigit(src.charAt(index))) {
index++;
}
@@ -112,11 +112,10 @@ public class XmlSchemaDateFormat extends
if (decimal.length() == 3) {
milliseconds = Integer.parseInt(decimal);
} else if (decimal.length() < 3) {
- milliseconds = Integer.parseInt((decimal + "000")
- .substring(0, 3));
+ String substring = decimal + "000";
+ milliseconds = Integer.parseInt(substring.substring(0, 3));
} else {
- milliseconds = Integer
- .parseInt(decimal.substring(0, 3));
+ milliseconds = Integer.parseInt(decimal.substring(0, 3));
if (decimal.charAt(3) >= '5') {
++milliseconds;
@@ -128,19 +127,19 @@ public class XmlSchemaDateFormat extends
}
// parse optional timezone
- if (((index + 5) < src.length())
- && ((src.charAt(index) == '+') || (src.charAt(index) == '-'))) {
+ if (index + 5 < src.length()
+ && (src.charAt(index) == '+' || src.charAt(index) == '-')) {
validateCharIsDigit(src, parsePos, index + 1, "EXPECTED_NUMERAL");
validateCharIsDigit(src, parsePos, index + 2, "EXPECTED_NUMERAL");
validateChar(src, parsePos, index + 3, ':', "EXPECTED_COLON_IN_TIMEZONE");
validateCharIsDigit(src, parsePos, index + 4, "EXPECTED_NUMERAL");
validateCharIsDigit(src, parsePos, index + 5, "EXPECTED_NUMERAL");
- final int hours = (((src.charAt(index + 1) - '0') * 10) + src
- .charAt(index + 2)) - '0';
- final int mins = (((src.charAt(index + 4) - '0') * 10) + src
- .charAt(index + 5)) - '0';
- int millisecs = ((hours * 60) + mins) * 60 * 1000;
+ final int hours = (src.charAt(index + 1) - '0') * 10
+ + src.charAt(index + 2) - '0';
+ final int mins = (src.charAt(index + 4) - '0') * 10
+ + src.charAt(index + 5) - '0';
+ int millisecs = (hours * 60 + mins) * 60 * 1000;
// subtract millisecs from current date to obtain GMT
if (src.charAt(index) == '+') {
@@ -151,7 +150,7 @@ public class XmlSchemaDateFormat extends
index += 6;
}
- if ((index < src.length()) && (src.charAt(index) == 'Z')) {
+ if (index < src.length() && src.charAt(index) == 'Z') {
index++;
}
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SignatureTrustValidator.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SignatureTrustValidator.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SignatureTrustValidator.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SignatureTrustValidator.java Fri Aug 2 10:37:45 2013
@@ -149,8 +149,7 @@ public class SignatureTrustValidator imp
*/
protected boolean
matches(
- final java.security.cert.X509Certificate cert,
- final Collection<Pattern> subjectDNPatterns
+ final X509Certificate cert, final Collection<Pattern> subjectDNPatterns
) {
if (subjectDNPatterns.isEmpty()) {
LOG.warn("No Subject DN Certificate Constraints were defined. This could be a security issue");
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/TimestampValidator.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/TimestampValidator.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/TimestampValidator.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/TimestampValidator.java Fri Aug 2 10:37:45 2013
@@ -57,7 +57,7 @@ public class TimestampValidator implemen
Timestamp timeStamp = credential.getTimestamp();
// Validate whether the security semantics have expired
- if ((timeStampStrict && timeStamp.isExpired())
+ if (timeStampStrict && timeStamp.isExpired()
|| !timeStamp.verifyCreated(timeStampTTL, futureTimeToLive)) {
throw new WSSecurityException(
WSSecurityException.ErrorCode.MESSAGE_EXPIRED,
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/UsernameTokenValidator.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/UsernameTokenValidator.java?rev=1509610&r1=1509609&r2=1509610&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/UsernameTokenValidator.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/UsernameTokenValidator.java Fri Aug 2 10:37:45 2013
@@ -97,7 +97,7 @@ public class UsernameTokenValidator impl
if (usernameToken.isHashed()) {
verifyDigestPassword(usernameToken, data);
} else if (WSConstants.PASSWORD_TEXT.equals(pwType)
- || (password != null && (pwType == null || "".equals(pwType.trim())))) {
+ || password != null && (pwType == null || "".equals(pwType.trim()))) {
verifyPlaintextPassword(usernameToken, data);
} else if (password != null) {
if (!handleCustomPasswordTypes) {