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 2017/02/17 11:39:24 UTC
svn commit: r1783375 - in /webservices/wss4j/trunk:
ws-security-common/src/main/java/org/apache/wss4j/common/crypto/
ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/
ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/ ws-security-...
Author: coheigea
Date: Fri Feb 17 11:39:24 2017
New Revision: 1783375
URL: http://svn.apache.org/viewvc?rev=1783375&view=rev
Log:
Some whitespace fixes
Modified:
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Crypto.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentContentSignatureTransform.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SignatureTrustValidator.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/DecryptInputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/transformer/AttachmentContentSignatureTransform.java
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Crypto.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Crypto.java?rev=1783375&r1=1783374&r2=1783375&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Crypto.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Crypto.java Fri Feb 17 11:39:24 2017
@@ -214,7 +214,7 @@ public interface Crypto {
*/
void verifyTrust(
X509Certificate[] certs, boolean enableRevocation,
- Collection<Pattern> subjectCertConstraints,Collection<Pattern> issuerCertConstraints
+ Collection<Pattern> subjectCertConstraints, Collection<Pattern> issuerCertConstraints
) throws WSSecurityException;
/**
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=1783375&r1=1783374&r2=1783375&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 Feb 17 11:39:24 2017
@@ -317,7 +317,7 @@ public class Merlin extends CryptoBase {
if (DO_DEBUG) {
LOG.debug(e.getMessage(), e);
}
- throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE,e, "ioError00");
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, e, "ioError00");
}
}
try {
@@ -340,7 +340,7 @@ public class Merlin extends CryptoBase {
if (DO_DEBUG) {
LOG.debug(e.getMessage(), e);
}
- throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE,e, "ioError00");
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, e, "ioError00");
}
if (DO_DEBUG) {
LOG.debug(
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentContentSignatureTransform.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentContentSignatureTransform.java?rev=1783375&r1=1783374&r2=1783375&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentContentSignatureTransform.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentContentSignatureTransform.java Fri Feb 17 11:39:24 2017
@@ -183,7 +183,7 @@ public class AttachmentContentSignatureT
|| mimeType.matches("(?i)(application|image)/.*\\+xml.*"))) {
/* 5.4.2:
* Content of an XML Content-Type MUST be XML canonicalized using
- * Exclusive XML Canonicalization without comments,as specified by
+ * Exclusive XML Canonicalization without comments, as specified by
* the URI http://www.w3.org/2001/10/xml-exc-c14n# [Excl-Canon].
* The reason for requiring Exclusive Canonicalization is that many
* implementations will support Exclusive Canonicalization for other
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=1783375&r1=1783374&r2=1783375&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 Feb 17 11:39:24 2017
@@ -106,7 +106,7 @@ public class SignatureTrustValidator imp
//
Collection<Pattern> subjectCertConstraints = data.getSubjectCertConstraints();
Collection<Pattern> issuerCertConstraints = data.getIssuerDNPatterns();
- crypto.verifyTrust(certificates, enableRevocation, subjectCertConstraints,issuerCertConstraints);
+ crypto.verifyTrust(certificates, enableRevocation, subjectCertConstraints, issuerCertConstraints);
if (LOG.isDebugEnabled()) {
String subjectString = certificates[0].getSubjectX500Principal().getName();
LOG.debug(
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java?rev=1783375&r1=1783374&r2=1783375&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java Fri Feb 17 11:39:24 2017
@@ -265,7 +265,7 @@ public class SecurityTokenReferenceTest
BSPEnforcer bspEnforcer = new BSPEnforcer();
// Process the STR
try {
- new SecurityTokenReference(strElement,bspEnforcer);
+ new SecurityTokenReference(strElement, bspEnforcer);
fail("Failure expected on an Embedded Child with a SecurityTokenReference child");
} catch (WSSecurityException ex) {
assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.INVALID_SECURITY);
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/DecryptInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/DecryptInputProcessor.java?rev=1783375&r1=1783374&r2=1783375&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/DecryptInputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/DecryptInputProcessor.java Fri Feb 17 11:39:24 2017
@@ -250,7 +250,7 @@ public class DecryptInputProcessor exten
Map<String, ReferenceType> references = getReferences();
List<ReferenceType> processedReferences = getProcessedReferences();
if (references != null) {
- Iterator<Map.Entry<String,ReferenceType>> iterator = references.entrySet().iterator();
+ Iterator<Map.Entry<String, ReferenceType>> iterator = references.entrySet().iterator();
while (iterator.hasNext()) {
Map.Entry<String, ReferenceType> next = iterator.next();
final ReferenceType referenceType = next.getValue();
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/transformer/AttachmentContentSignatureTransform.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/transformer/AttachmentContentSignatureTransform.java?rev=1783375&r1=1783374&r2=1783375&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/transformer/AttachmentContentSignatureTransform.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/transformer/AttachmentContentSignatureTransform.java Fri Feb 17 11:39:24 2017
@@ -81,7 +81,7 @@ public class AttachmentContentSignatureT
|| mimeType.matches("(?i)(application|image)/.*\\+xml.*"))) {
/* 5.4.2:
* Content of an XML Content-Type MUST be XML canonicalized using
- * Exclusive XML Canonicalization without comments,as specified by
+ * Exclusive XML Canonicalization without comments, as specified by
* the URI http://www.w3.org/2001/10/xml-exc-c14n# [Excl-Canon].
* The reason for requiring Exclusive Canonicalization is that many
* implementations will support Exclusive Canonicalization for other