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 2015/10/22 11:04:30 UTC
svn commit: r1709962 - in /webservices/wss4j/trunk:
bindings/src/main/java/org/apache/wss4j/binding/wss10/
bindings/src/main/java/org/apache/wss4j/binding/wss11/
bindings/src/main/java/org/apache/wss4j/binding/wssc13/
bindings/src/main/java/org/apache/...
Author: coheigea
Date: Thu Oct 22 09:04:30 2015
New Revision: 1709962
URL: http://svn.apache.org/viewvc?rev=1709962&view=rev
Log:
Some cleanup
Modified:
webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/ObjectFactory.java
webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss11/ObjectFactory.java
webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wssc13/ObjectFactory.java
webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wssc200502/ObjectFactory.java
webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wsu10/ObjectFactory.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/ThreadLocalSecurityProvider.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/saml/OpenSAMLBootstrap.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ActionBean.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AdviceBean.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AttributeBean.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AttributeStatementBean.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AudienceRestrictionBean.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthDecisionStatementBean.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthenticationStatementBean.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ConditionsBean.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/DelegateBean.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/KeyInfoBean.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/NameIDBean.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ProxyRestrictionBean.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/SubjectBean.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/SubjectConfirmationDataBean.java
Modified: webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/ObjectFactory.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/ObjectFactory.java?rev=1709962&r1=1709961&r2=1709962&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/ObjectFactory.java (original)
+++ webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/ObjectFactory.java Thu Oct 22 09:04:30 2015
@@ -49,16 +49,17 @@ import javax.xml.namespace.QName;
@XmlRegistry
public class ObjectFactory {
- private final static QName _Nonce_QNAME = new QName("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", "Nonce");
- private final static QName _Reference_QNAME = new QName("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", "Reference");
- private final static QName _BinarySecurityToken_QNAME = new QName("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", "BinarySecurityToken");
- private final static QName _UsernameToken_QNAME = new QName("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", "UsernameToken");
- private final static QName _KeyIdentifier_QNAME = new QName("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", "KeyIdentifier");
- private final static QName _Embedded_QNAME = new QName("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", "Embedded");
- private final static QName _Security_QNAME = new QName("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", "Security");
- private final static QName _SecurityTokenReference_QNAME = new QName("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", "SecurityTokenReference");
- private final static QName _Password_QNAME = new QName("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", "Password");
- private final static QName _TransformationParameters_QNAME = new QName("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", "TransformationParameters");
+ private static final String WSSE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";
+ private static final QName _Nonce_QNAME = new QName(WSSE_NS, "Nonce");
+ private static final QName _Reference_QNAME = new QName(WSSE_NS, "Reference");
+ private static final QName _BinarySecurityToken_QNAME = new QName(WSSE_NS, "BinarySecurityToken");
+ private static final QName _UsernameToken_QNAME = new QName(WSSE_NS, "UsernameToken");
+ private static final QName _KeyIdentifier_QNAME = new QName(WSSE_NS, "KeyIdentifier");
+ private static final QName _Embedded_QNAME = new QName(WSSE_NS, "Embedded");
+ private static final QName _Security_QNAME = new QName(WSSE_NS, "Security");
+ private static final QName _SecurityTokenReference_QNAME = new QName(WSSE_NS, "SecurityTokenReference");
+ private static final QName _Password_QNAME = new QName(WSSE_NS, "Password");
+ private static final QName _TransformationParameters_QNAME = new QName(WSSE_NS, "TransformationParameters");
/**
* Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.wss4j.binding.wss10
@@ -159,7 +160,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link EncodedString }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", name = "Nonce")
+ @XmlElementDecl(namespace = WSSE_NS, name = "Nonce")
public JAXBElement<EncodedString> createNonce(EncodedString value) {
return new JAXBElement<EncodedString>(_Nonce_QNAME, EncodedString.class, null, value);
}
@@ -168,7 +169,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", name = "Reference")
+ @XmlElementDecl(namespace = WSSE_NS, name = "Reference")
public JAXBElement<ReferenceType> createReference(ReferenceType value) {
return new JAXBElement<ReferenceType>(_Reference_QNAME, ReferenceType.class, null, value);
}
@@ -177,7 +178,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link BinarySecurityTokenType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", name = "BinarySecurityToken")
+ @XmlElementDecl(namespace = WSSE_NS, name = "BinarySecurityToken")
public JAXBElement<BinarySecurityTokenType> createBinarySecurityToken(BinarySecurityTokenType value) {
return new JAXBElement<BinarySecurityTokenType>(_BinarySecurityToken_QNAME, BinarySecurityTokenType.class, null, value);
}
@@ -186,7 +187,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link UsernameTokenType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", name = "UsernameToken")
+ @XmlElementDecl(namespace = WSSE_NS, name = "UsernameToken")
public JAXBElement<UsernameTokenType> createUsernameToken(UsernameTokenType value) {
return new JAXBElement<UsernameTokenType>(_UsernameToken_QNAME, UsernameTokenType.class, null, value);
}
@@ -195,7 +196,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link KeyIdentifierType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", name = "KeyIdentifier")
+ @XmlElementDecl(namespace = WSSE_NS, name = "KeyIdentifier")
public JAXBElement<KeyIdentifierType> createKeyIdentifier(KeyIdentifierType value) {
return new JAXBElement<KeyIdentifierType>(_KeyIdentifier_QNAME, KeyIdentifierType.class, null, value);
}
@@ -204,7 +205,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link EmbeddedType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", name = "Embedded")
+ @XmlElementDecl(namespace = WSSE_NS, name = "Embedded")
public JAXBElement<EmbeddedType> createEmbedded(EmbeddedType value) {
return new JAXBElement<EmbeddedType>(_Embedded_QNAME, EmbeddedType.class, null, value);
}
@@ -213,7 +214,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link SecurityHeaderType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", name = "Security")
+ @XmlElementDecl(namespace = WSSE_NS, name = "Security")
public JAXBElement<SecurityHeaderType> createSecurity(SecurityHeaderType value) {
return new JAXBElement<SecurityHeaderType>(_Security_QNAME, SecurityHeaderType.class, null, value);
}
@@ -222,7 +223,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link SecurityTokenReferenceType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", name = "SecurityTokenReference")
+ @XmlElementDecl(namespace = WSSE_NS, name = "SecurityTokenReference")
public JAXBElement<SecurityTokenReferenceType> createSecurityTokenReference(SecurityTokenReferenceType value) {
return new JAXBElement<SecurityTokenReferenceType>(_SecurityTokenReference_QNAME, SecurityTokenReferenceType.class, null, value);
}
@@ -231,7 +232,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link PasswordString }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", name = "Password")
+ @XmlElementDecl(namespace = WSSE_NS, name = "Password")
public JAXBElement<PasswordString> createPassword(PasswordString value) {
return new JAXBElement<PasswordString>(_Password_QNAME, PasswordString.class, null, value);
}
@@ -240,7 +241,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link TransformationParametersType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", name = "TransformationParameters")
+ @XmlElementDecl(namespace = WSSE_NS, name = "TransformationParameters")
public JAXBElement<TransformationParametersType> createTransformationParameters(TransformationParametersType value) {
return new JAXBElement<TransformationParametersType>(_TransformationParameters_QNAME, TransformationParametersType.class, null, value);
}
Modified: webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss11/ObjectFactory.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss11/ObjectFactory.java?rev=1709962&r1=1709961&r2=1709962&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss11/ObjectFactory.java (original)
+++ webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss11/ObjectFactory.java Thu Oct 22 09:04:30 2015
@@ -49,10 +49,11 @@ import javax.xml.namespace.QName;
@XmlRegistry
public class ObjectFactory {
- private final static QName _EncryptedHeader_QNAME = new QName("http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd", "EncryptedHeader");
- private final static QName _SignatureConfirmation_QNAME = new QName("http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd", "SignatureConfirmation");
- private final static QName _Salt_QNAME = new QName("http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd", "Salt");
- private final static QName _Iteration_QNAME = new QName("http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd", "Iteration");
+ private static final String WSSE11_NS = "http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd";
+ private static final QName _EncryptedHeader_QNAME = new QName(WSSE11_NS, "EncryptedHeader");
+ private static final QName _SignatureConfirmation_QNAME = new QName(WSSE11_NS, "SignatureConfirmation");
+ private static final QName _Salt_QNAME = new QName(WSSE11_NS, "Salt");
+ private static final QName _Iteration_QNAME = new QName(WSSE11_NS, "Iteration");
/**
* Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.wss4j.binding.wss11
@@ -81,7 +82,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link EncryptedHeaderType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd", name = "EncryptedHeader")
+ @XmlElementDecl(namespace = WSSE11_NS, name = "EncryptedHeader")
public JAXBElement<EncryptedHeaderType> createEncryptedHeader(EncryptedHeaderType value) {
return new JAXBElement<EncryptedHeaderType>(_EncryptedHeader_QNAME, EncryptedHeaderType.class, null, value);
}
@@ -90,7 +91,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link SignatureConfirmationType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd", name = "SignatureConfirmation")
+ @XmlElementDecl(namespace = WSSE11_NS, name = "SignatureConfirmation")
public JAXBElement<SignatureConfirmationType> createSignatureConfirmation(SignatureConfirmationType value) {
return new JAXBElement<SignatureConfirmationType>(_SignatureConfirmation_QNAME, SignatureConfirmationType.class, null, value);
}
@@ -99,7 +100,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd", name = "Salt")
+ @XmlElementDecl(namespace = WSSE11_NS, name = "Salt")
public JAXBElement<byte[]> createSalt(byte[] value) {
return new JAXBElement<byte[]>(_Salt_QNAME, byte[].class, null, ((byte[]) value));
}
@@ -108,7 +109,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link Long }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd", name = "Iteration")
+ @XmlElementDecl(namespace = WSSE11_NS, name = "Iteration")
public JAXBElement<Long> createIteration(Long value) {
return new JAXBElement<Long>(_Iteration_QNAME, Long.class, null, value);
}
Modified: webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wssc13/ObjectFactory.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wssc13/ObjectFactory.java?rev=1709962&r1=1709961&r2=1709962&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wssc13/ObjectFactory.java (original)
+++ webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wssc13/ObjectFactory.java Thu Oct 22 09:04:30 2015
@@ -49,13 +49,14 @@ import javax.xml.namespace.QName;
@XmlRegistry
public class ObjectFactory {
- private final static QName _Identifier_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-secureconversation/200512", "Identifier");
- private final static QName _SecurityContextToken_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-secureconversation/200512", "SecurityContextToken");
- private final static QName _Instance_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-secureconversation/200512", "Instance");
- private final static QName _DerivedKeyToken_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-secureconversation/200512", "DerivedKeyToken");
- private final static QName _Name_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-secureconversation/200512", "Name");
- private final static QName _Label_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-secureconversation/200512", "Label");
- private final static QName _Nonce_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-secureconversation/200512", "Nonce");
+ private static final String WSSC13_NS = "http://docs.oasis-open.org/ws-sx/ws-secureconversation/200512";
+ private static final QName _Identifier_QNAME = new QName(WSSC13_NS, "Identifier");
+ private static final QName _SecurityContextToken_QNAME = new QName(WSSC13_NS, "SecurityContextToken");
+ private static final QName _Instance_QNAME = new QName(WSSC13_NS, "Instance");
+ private static final QName _DerivedKeyToken_QNAME = new QName(WSSC13_NS, "DerivedKeyToken");
+ private static final QName _Name_QNAME = new QName(WSSC13_NS, "Name");
+ private static final QName _Label_QNAME = new QName(WSSC13_NS, "Label");
+ private static final QName _Nonce_QNAME = new QName(WSSC13_NS, "Nonce");
/**
* Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.wss4j.binding.wssc13
@@ -92,7 +93,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-secureconversation/200512", name = "Identifier")
+ @XmlElementDecl(namespace = WSSC13_NS, name = "Identifier")
public JAXBElement<String> createIdentifier(String value) {
return new JAXBElement<String>(_Identifier_QNAME, String.class, null, value);
}
@@ -101,7 +102,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link SecurityContextTokenType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-secureconversation/200512", name = "SecurityContextToken")
+ @XmlElementDecl(namespace = WSSC13_NS, name = "SecurityContextToken")
public JAXBElement<SecurityContextTokenType> createSecurityContextToken(SecurityContextTokenType value) {
return new JAXBElement<SecurityContextTokenType>(_SecurityContextToken_QNAME, SecurityContextTokenType.class, null, value);
}
@@ -110,7 +111,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-secureconversation/200512", name = "Instance")
+ @XmlElementDecl(namespace = WSSC13_NS, name = "Instance")
public JAXBElement<String> createInstance(String value) {
return new JAXBElement<String>(_Instance_QNAME, String.class, null, value);
}
@@ -119,7 +120,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link DerivedKeyTokenType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-secureconversation/200512", name = "DerivedKeyToken")
+ @XmlElementDecl(namespace = WSSC13_NS, name = "DerivedKeyToken")
public JAXBElement<DerivedKeyTokenType> createDerivedKeyToken(DerivedKeyTokenType value) {
return new JAXBElement<DerivedKeyTokenType>(_DerivedKeyToken_QNAME, DerivedKeyTokenType.class, null, value);
}
@@ -128,7 +129,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-secureconversation/200512", name = "Name")
+ @XmlElementDecl(namespace = WSSC13_NS, name = "Name")
public JAXBElement<String> createName(String value) {
return new JAXBElement<String>(_Name_QNAME, String.class, null, value);
}
@@ -137,7 +138,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-secureconversation/200512", name = "Label")
+ @XmlElementDecl(namespace = WSSC13_NS, name = "Label")
public JAXBElement<String> createLabel(String value) {
return new JAXBElement<String>(_Label_QNAME, String.class, null, value);
}
@@ -146,7 +147,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-secureconversation/200512", name = "Nonce")
+ @XmlElementDecl(namespace = WSSC13_NS, name = "Nonce")
public JAXBElement<byte[]> createNonce(byte[] value) {
return new JAXBElement<byte[]>(_Nonce_QNAME, byte[].class, null, ((byte[]) value));
}
Modified: webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wssc200502/ObjectFactory.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wssc200502/ObjectFactory.java?rev=1709962&r1=1709961&r2=1709962&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wssc200502/ObjectFactory.java (original)
+++ webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wssc200502/ObjectFactory.java Thu Oct 22 09:04:30 2015
@@ -49,13 +49,14 @@ import javax.xml.namespace.QName;
@XmlRegistry
public class ObjectFactory {
- private final static QName _Nonce_QNAME = new QName("http://schemas.xmlsoap.org/ws/2005/02/sc", "Nonce");
- private final static QName _Label_QNAME = new QName("http://schemas.xmlsoap.org/ws/2005/02/sc", "Label");
- private final static QName _DerivedKeyToken_QNAME = new QName("http://schemas.xmlsoap.org/ws/2005/02/sc", "DerivedKeyToken");
- private final static QName _Name_QNAME = new QName("http://schemas.xmlsoap.org/ws/2005/02/sc", "Name");
- private final static QName _Identifier_QNAME = new QName("http://schemas.xmlsoap.org/ws/2005/02/sc", "Identifier");
- private final static QName _SecurityContextToken_QNAME = new QName("http://schemas.xmlsoap.org/ws/2005/02/sc", "SecurityContextToken");
- private final static QName _Instance_QNAME = new QName("http://schemas.xmlsoap.org/ws/2005/02/sc", "Instance");
+ private static final String WSSC_NS = "http://schemas.xmlsoap.org/ws/2005/02/sc";
+ private static final QName _Nonce_QNAME = new QName(WSSC_NS, "Nonce");
+ private static final QName _Label_QNAME = new QName(WSSC_NS, "Label");
+ private static final QName _DerivedKeyToken_QNAME = new QName(WSSC_NS, "DerivedKeyToken");
+ private static final QName _Name_QNAME = new QName(WSSC_NS, "Name");
+ private static final QName _Identifier_QNAME = new QName(WSSC_NS, "Identifier");
+ private static final QName _SecurityContextToken_QNAME = new QName(WSSC_NS, "SecurityContextToken");
+ private static final QName _Instance_QNAME = new QName(WSSC_NS, "Instance");
/**
* Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.wss4j.binding.wssc200502
@@ -92,7 +93,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.xmlsoap.org/ws/2005/02/sc", name = "Nonce")
+ @XmlElementDecl(namespace = WSSC_NS, name = "Nonce")
public JAXBElement<byte[]> createNonce(byte[] value) {
return new JAXBElement<byte[]>(_Nonce_QNAME, byte[].class, null, ((byte[]) value));
}
@@ -101,7 +102,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.xmlsoap.org/ws/2005/02/sc", name = "Label")
+ @XmlElementDecl(namespace = WSSC_NS, name = "Label")
public JAXBElement<String> createLabel(String value) {
return new JAXBElement<String>(_Label_QNAME, String.class, null, value);
}
@@ -110,7 +111,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link DerivedKeyTokenType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.xmlsoap.org/ws/2005/02/sc", name = "DerivedKeyToken")
+ @XmlElementDecl(namespace = WSSC_NS, name = "DerivedKeyToken")
public JAXBElement<DerivedKeyTokenType> createDerivedKeyToken(DerivedKeyTokenType value) {
return new JAXBElement<DerivedKeyTokenType>(_DerivedKeyToken_QNAME, DerivedKeyTokenType.class, null, value);
}
@@ -119,7 +120,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.xmlsoap.org/ws/2005/02/sc", name = "Name")
+ @XmlElementDecl(namespace = WSSC_NS, name = "Name")
public JAXBElement<String> createName(String value) {
return new JAXBElement<String>(_Name_QNAME, String.class, null, value);
}
@@ -128,7 +129,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.xmlsoap.org/ws/2005/02/sc", name = "Identifier")
+ @XmlElementDecl(namespace = WSSC_NS, name = "Identifier")
public JAXBElement<String> createIdentifier(String value) {
return new JAXBElement<String>(_Identifier_QNAME, String.class, null, value);
}
@@ -137,7 +138,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link SecurityContextTokenType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.xmlsoap.org/ws/2005/02/sc", name = "SecurityContextToken")
+ @XmlElementDecl(namespace = WSSC_NS, name = "SecurityContextToken")
public JAXBElement<SecurityContextTokenType> createSecurityContextToken(SecurityContextTokenType value) {
return new JAXBElement<SecurityContextTokenType>(_SecurityContextToken_QNAME, SecurityContextTokenType.class, null, value);
}
@@ -146,7 +147,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://schemas.xmlsoap.org/ws/2005/02/sc", name = "Instance")
+ @XmlElementDecl(namespace = WSSC_NS, name = "Instance")
public JAXBElement<String> createInstance(String value) {
return new JAXBElement<String>(_Instance_QNAME, String.class, null, value);
}
Modified: webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wsu10/ObjectFactory.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wsu10/ObjectFactory.java?rev=1709962&r1=1709961&r2=1709962&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wsu10/ObjectFactory.java (original)
+++ webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wsu10/ObjectFactory.java Thu Oct 22 09:04:30 2015
@@ -49,9 +49,10 @@ import javax.xml.namespace.QName;
@XmlRegistry
public class ObjectFactory {
- private final static QName _Expires_QNAME = new QName("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd", "Expires");
- private final static QName _Created_QNAME = new QName("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd", "Created");
- private final static QName _Timestamp_QNAME = new QName("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd", "Timestamp");
+ private static final String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
+ private static final QName _Expires_QNAME = new QName(WSU_NS, "Expires");
+ private static final QName _Created_QNAME = new QName(WSU_NS, "Created");
+ private static final QName _Timestamp_QNAME = new QName(WSU_NS, "Timestamp");
/**
* Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.wss4j.binding.wsu10
@@ -88,7 +89,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link AttributedDateTime }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd", name = "Expires")
+ @XmlElementDecl(namespace = WSU_NS, name = "Expires")
public JAXBElement<AttributedDateTime> createExpires(AttributedDateTime value) {
return new JAXBElement<AttributedDateTime>(_Expires_QNAME, AttributedDateTime.class, null, value);
}
@@ -97,7 +98,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link AttributedDateTime }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd", name = "Created")
+ @XmlElementDecl(namespace = WSU_NS, name = "Created")
public JAXBElement<AttributedDateTime> createCreated(AttributedDateTime value) {
return new JAXBElement<AttributedDateTime>(_Created_QNAME, AttributedDateTime.class, null, value);
}
@@ -106,7 +107,7 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link TimestampType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd", name = "Timestamp")
+ @XmlElementDecl(namespace = WSU_NS, name = "Timestamp")
public JAXBElement<TimestampType> createTimestamp(TimestampType value) {
return new JAXBElement<TimestampType>(_Timestamp_QNAME, TimestampType.class, null, value);
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/ThreadLocalSecurityProvider.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/ThreadLocalSecurityProvider.java?rev=1709962&r1=1709961&r2=1709962&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/ThreadLocalSecurityProvider.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/ThreadLocalSecurityProvider.java Thu Oct 22 09:04:30 2015
@@ -26,16 +26,14 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Enumeration;
import java.util.Map;
-import java.util.NoSuchElementException;
import java.util.Set;
-public class ThreadLocalSecurityProvider extends Provider {
+public final class ThreadLocalSecurityProvider extends Provider {
private static final long serialVersionUID = 3556396671069994931L;
private static final String NAME = "TLSP";
private static final ThreadLocal<Provider> provider = new ThreadLocal<Provider>();
private static boolean installed = false;
- private static final EmptyEnumeration<Object> emptyEnumeration = new EmptyEnumeration<Object>();
public static synchronized void install() {
Security.insertProviderAt(new ThreadLocalSecurityProvider(),
@@ -148,7 +146,7 @@ public class ThreadLocalSecurityProvider
if (p != null) {
return p.keys();
} else {
- return emptyEnumeration;
+ return Collections.emptyEnumeration();
}
}
@@ -157,7 +155,7 @@ public class ThreadLocalSecurityProvider
if (p != null) {
return p.elements();
} else {
- return emptyEnumeration;
+ return Collections.emptyEnumeration();
}
}
@@ -188,17 +186,4 @@ public class ThreadLocalSecurityProvider
}
}
- private static class EmptyEnumeration<T> implements Enumeration<T> {
-
- @Override
- public boolean hasMoreElements() {
- return false;
- }
-
- @Override
- public T nextElement() {
- throw new NoSuchElementException();
- }
-
- }
}
\ No newline at end of file
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=1709962&r1=1709961&r2=1709962&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 Thu Oct 22 09:04:30 2015
@@ -55,9 +55,10 @@ public final class DerivedKeyUtils {
System.arraycopy(labelBytes, 0, seed, 0, labelBytes.length);
System.arraycopy(nonce, 0, seed, labelBytes.length, nonce.length);
- if (length <= 0) {
- length = 32;
+ long keyLength = length;
+ if (keyLength <= 0) {
+ keyLength = 32L;
}
- return algo.createKey(secret, seed, offset, length);
+ return algo.createKey(secret, seed, offset, keyLength);
}
}
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=1709962&r1=1709961&r2=1709962&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 Thu Oct 22 09:04:30 2015
@@ -89,16 +89,17 @@ public class P_SHA1 implements Derivatio
SecretKeySpec key = new SecretKeySpec(secret, "HMACSHA1");
mac.init(key);
- while (required > 0) {
+ int bytesRequired = required;
+ while (bytesRequired > 0) {
mac.update(a);
a = mac.doFinal();
mac.update(a);
mac.update(seed);
tmp = mac.doFinal();
- tocpy = Math.min(required, tmp.length);
+ tocpy = Math.min(bytesRequired, tmp.length);
System.arraycopy(tmp, 0, out, offset, tocpy);
offset += tocpy;
- required -= tocpy;
+ bytesRequired -= tocpy;
}
return out;
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java?rev=1709962&r1=1709961&r2=1709962&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java Thu Oct 22 09:04:30 2015
@@ -67,6 +67,10 @@ public class OpenSAMLBootstrap {
"/saml2-xacml2-profile.xml",
};
+ private OpenSAMLBootstrap() {
+ // complete
+ }
+
/**
* Initializes the OpenSAML library, loading default configurations.
*
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ActionBean.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ActionBean.java?rev=1709962&r1=1709961&r2=1709962&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ActionBean.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ActionBean.java Thu Oct 22 09:04:30 2015
@@ -93,8 +93,12 @@ public class ActionBean {
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof ActionBean)) return false;
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof ActionBean)) {
+ return false;
+ }
ActionBean that = (ActionBean) o;
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AdviceBean.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AdviceBean.java?rev=1709962&r1=1709961&r2=1709962&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AdviceBean.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AdviceBean.java Thu Oct 22 09:04:30 2015
@@ -48,8 +48,12 @@ public class AdviceBean {
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof AdviceBean)) return false;
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof AdviceBean)) {
+ return false;
+ }
AdviceBean that = (AdviceBean) o;
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AttributeBean.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AttributeBean.java?rev=1709962&r1=1709961&r2=1709962&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AttributeBean.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AttributeBean.java Thu Oct 22 09:04:30 2015
@@ -132,8 +132,12 @@ public class AttributeBean {
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof AttributeBean)) return false;
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof AttributeBean)) {
+ return false;
+ }
AttributeBean that = (AttributeBean) o;
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AttributeStatementBean.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AttributeStatementBean.java?rev=1709962&r1=1709961&r2=1709962&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AttributeStatementBean.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AttributeStatementBean.java Thu Oct 22 09:04:30 2015
@@ -87,8 +87,12 @@ public class AttributeStatementBean {
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof AttributeStatementBean)) return false;
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof AttributeStatementBean)) {
+ return false;
+ }
AttributeStatementBean that = (AttributeStatementBean) o;
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AudienceRestrictionBean.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AudienceRestrictionBean.java?rev=1709962&r1=1709961&r2=1709962&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AudienceRestrictionBean.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AudienceRestrictionBean.java Thu Oct 22 09:04:30 2015
@@ -74,8 +74,12 @@ public class AudienceRestrictionBean {
*/
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof AudienceRestrictionBean)) return false;
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof AudienceRestrictionBean)) {
+ return false;
+ }
AudienceRestrictionBean that = (AudienceRestrictionBean) o;
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthDecisionStatementBean.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthDecisionStatementBean.java?rev=1709962&r1=1709961&r2=1709962&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthDecisionStatementBean.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthDecisionStatementBean.java Thu Oct 22 09:04:30 2015
@@ -179,8 +179,12 @@ public class AuthDecisionStatementBean {
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof AuthDecisionStatementBean)) return false;
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof AuthDecisionStatementBean)) {
+ return false;
+ }
AuthDecisionStatementBean that = (AuthDecisionStatementBean) o;
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthenticationStatementBean.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthenticationStatementBean.java?rev=1709962&r1=1709961&r2=1709962&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthenticationStatementBean.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthenticationStatementBean.java Thu Oct 22 09:04:30 2015
@@ -162,8 +162,12 @@ public class AuthenticationStatementBean
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof AuthenticationStatementBean)) return false;
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof AuthenticationStatementBean)) {
+ return false;
+ }
AuthenticationStatementBean that = (AuthenticationStatementBean) o;
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ConditionsBean.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ConditionsBean.java?rev=1709962&r1=1709961&r2=1709962&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ConditionsBean.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ConditionsBean.java Thu Oct 22 09:04:30 2015
@@ -198,8 +198,12 @@ public class ConditionsBean {
*/
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof ConditionsBean)) return false;
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof ConditionsBean)) {
+ return false;
+ }
ConditionsBean that = (ConditionsBean) o;
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/DelegateBean.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/DelegateBean.java?rev=1709962&r1=1709961&r2=1709962&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/DelegateBean.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/DelegateBean.java Thu Oct 22 09:04:30 2015
@@ -65,8 +65,12 @@ public class DelegateBean {
*/
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof DelegateBean)) return false;
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof DelegateBean)) {
+ return false;
+ }
DelegateBean that = (DelegateBean) o;
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/KeyInfoBean.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/KeyInfoBean.java?rev=1709962&r1=1709961&r2=1709962&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/KeyInfoBean.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/KeyInfoBean.java Thu Oct 22 09:04:30 2015
@@ -134,8 +134,12 @@ public class KeyInfoBean {
*/
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof KeyInfoBean)) return false;
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof KeyInfoBean)) {
+ return false;
+ }
KeyInfoBean that = (KeyInfoBean) o;
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/NameIDBean.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/NameIDBean.java?rev=1709962&r1=1709961&r2=1709962&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/NameIDBean.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/NameIDBean.java Thu Oct 22 09:04:30 2015
@@ -81,8 +81,12 @@ public class NameIDBean {
*/
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof NameIDBean)) return false;
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof NameIDBean)) {
+ return false;
+ }
NameIDBean that = (NameIDBean) o;
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ProxyRestrictionBean.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ProxyRestrictionBean.java?rev=1709962&r1=1709961&r2=1709962&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ProxyRestrictionBean.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ProxyRestrictionBean.java Thu Oct 22 09:04:30 2015
@@ -76,8 +76,12 @@ public class ProxyRestrictionBean {
*/
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof ProxyRestrictionBean)) return false;
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof ProxyRestrictionBean)) {
+ return false;
+ }
ProxyRestrictionBean that = (ProxyRestrictionBean) o;
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/SubjectBean.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/SubjectBean.java?rev=1709962&r1=1709961&r2=1709962&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/SubjectBean.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/SubjectBean.java Thu Oct 22 09:04:30 2015
@@ -191,8 +191,12 @@ public class SubjectBean {
*/
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof SubjectBean)) return false;
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof SubjectBean)) {
+ return false;
+ }
SubjectBean that = (SubjectBean) o;
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/SubjectConfirmationDataBean.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/SubjectConfirmationDataBean.java?rev=1709962&r1=1709961&r2=1709962&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/SubjectConfirmationDataBean.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/SubjectConfirmationDataBean.java Thu Oct 22 09:04:30 2015
@@ -126,8 +126,12 @@ public class SubjectConfirmationDataBean
*/
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof SubjectConfirmationDataBean)) return false;
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof SubjectConfirmationDataBean)) {
+ return false;
+ }
SubjectConfirmationDataBean that = (SubjectConfirmationDataBean) o;